Changes in lib/misc.c [2e3a857:89c11e7]

File:

• lib/misc.c (modified) (2 diffs)

lib/misc.c

@@ -77 +77 @@
         
         return mktime(&tm);
-}
-
-time_t mktime_utc( struct tm *tp )
-{
-        struct tm utc;
-        time_t res, tres;
-        
-        tp->tm_isdst = -1;
-        res = mktime( tp );
-        /* Problem is, mktime() just gave us the GMT timestamp for the
-           given local time... While the given time WAS NOT local. So
-           we should fix this now.
-           
-           Now I could choose between messing with environment variables
-           (kludgy) or using timegm() (not portable)... Or doing the
-           following, which I actually prefer...
-           
-           tzset() may also work but in other places I actually want to
-           use local time.
-           
-           FFFFFFFFFFFFFFFFFFFFFUUUUUUUUUUUUUUUUUUUU!! */
-        gmtime_r( &res, &utc );
-        utc.tm_isdst = -1;
-        if( utc.tm_hour == tp->tm_hour && utc.tm_min == tp->tm_min )
-                /* Sweet! We're in UTC right now... */
-                return res;
-        
-        tres = mktime( &utc );
-        res += res - tres;
-        
-        /* Yes, this is a hack. And it will go wrong around DST changes.
-           BUT this is more likely to be threadsafe than messing with
-           environment variables, and possibly more portable... */
-        
-        return res;
 }
 
@@ -649 +614 @@
         return ret;
 }
+
+char **split_command_parts( char *command )
+{
+        static char *cmd[IRC_MAX_ARGS+1];
+        char *s, q = 0;
+        int k;
+        
+        memset( cmd, 0, sizeof( cmd ) );
+        cmd[0] = command;
+        k = 1;
+        for( s = command; *s && k < IRC_MAX_ARGS; s ++ )
+                if( *s == ' ' && !q )
+                {
+                        *s = 0;
+                        while( *++s == ' ' );
+                        if( *s == '"' || *s == '\'' )
+                        {
+                                q = *s;
+                                s ++;
+                        }
+                        if( *s )
+                        {
+                                cmd[k++] = s;
+                                s --;
+                        }
+                        else
+                        {
+                                break;
+                        }
+                }
+                else if( *s == '\\' && ( ( !q && s[1] ) || ( q && q == s[1] ) ) )
+                {
+                        char *cpy;
+                        
+                        for( cpy = s; *cpy; cpy ++ )
+                                cpy[0] = cpy[1];
+                }
+                else if( *s == q )
+                {
+                        q = *s = 0;
+                }
+        
+        /* Full zero-padding for easier argc checking. */
+        while( k <= IRC_MAX_ARGS )
+                cmd[k++] = NULL;
+        
+        return cmd;
+}