Changeset 269580c

Timestamp:

2014-07-24T03:51:07Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

59e66ff

Parents:

1783ab6

Message:

Add limit param to split_command_parts(), fix twitter quotes bug

Only took me a few months to write. I even added a test case.

Files:

• irc_commands.c (modified) (1 diff)
• lib/misc.c (modified) (4 diffs)
• lib/misc.h (modified) (1 diff)
• protocols/twitter/twitter.c (modified) (2 diffs)
• root_commands.c (modified) (1 diff)
• tests/check_util.c (modified) (2 diffs)

irc_commands.c

@@ -365 +365 @@
                                 cmd[2][strlen(cmd[2])-1] = '\0';
                         
-                        ctcp = split_command_parts( cmd[2] + 1 );
+                        ctcp = split_command_parts( cmd[2] + 1, 0 );
                         iu->f->ctcp( iu, ctcp );
                 }

lib/misc.c

@@ -682 +682 @@
    white\ space in 'various ways'. Returns a NULL-terminated static
    char** so watch out with nested use! Definitely not thread-safe. */
-char **split_command_parts( char *command )
+char **split_command_parts( char *command, int limit )
 {
         static char *cmd[IRC_MAX_ARGS+1];
@@ -692 +692 @@
         k = 1;
         for( s = command; *s && k < IRC_MAX_ARGS; s ++ )
+        {
                 if( *s == ' ' && !q )
                 {
                         *s = 0;
                         while( *++s == ' ' );
-                        if( *s == '"' || *s == '\'' )
+                        if( k != limit && (*s == '"' || *s == '\'') )
                         {
                                 q = *s;
@@ -704 +705 @@
                         {
                                 cmd[k++] = s;
+                                if (limit && k > limit) {
+                                        break;
+                                }
                                 s --;
                         }
@@ -722 +726 @@
                         q = *s = 0;
                 }
+        }
         
         /* Full zero-padding for easier argc checking. */

lib/misc.h

@@ -67 +67 @@
 G_MODULE_EXPORT gboolean ssl_sockerr_again( void *ssl );
 G_MODULE_EXPORT int md5_verify_password( char *password, char *hash );
-G_MODULE_EXPORT char **split_command_parts( char *command );
+G_MODULE_EXPORT char **split_command_parts( char *command, int limit );
 G_MODULE_EXPORT char *get_rfc822_header( const char *text, const char *header, int len );
 

protocols/twitter/twitter.c

@@ -602 +602 @@
 
         cmds = g_strdup(message);
-        cmd = split_command_parts(cmds);
+        cmd = split_command_parts(cmds, 2);
 
         if (cmd[0] == NULL) {
@@ -662 +662 @@
                         goto eof;
                 }
-                message = new = g_strdup_printf("@%s %s", bu->handle, message + (cmd[2] - cmd[0]));
+                message = new = g_strdup_printf("@%s %s", bu->handle, cmd[2]);
                 in_reply_to = id;
                 allow_post = TRUE;

root_commands.c

@@ -32 +32 @@
 void root_command_string( irc_t *irc, char *command )
 {
-        root_command( irc, split_command_parts( command ) );
+        root_command( irc, split_command_parts( command, 0 ) );
 }
 

tests/check_util.c

@@ -167 +167 @@
         http_encode( s );
         fail_unless( strcmp( s, "ee%C3%ABee%21%21..." ) == 0 );
+END_TEST
+
+struct {
+        int limit;
+        char *command;
+        char *expected[IRC_MAX_ARGS+1];
+} split_tests[] = {
+        {
+                0, "account add etc \"user name with spaces\" 'pass\\ word'",
+                {"account", "add", "etc", "user name with spaces", "pass\\ word", NULL},
+        },
+        {
+                0, "channel set group Close\\ friends",
+                {"channel", "set", "group", "Close friends", NULL},
+        },
+        {
+                2, "reply wilmer \"testing in C is a PITA\", you said.",
+                {"reply", "wilmer", "\"testing in C is a PITA\", you said.", NULL},
+        },
+        {
+                4, "one space  two  spaces  limit  limit",
+                {"one", "space", "two", "spaces", "limit  limit", NULL},
+        },
+        {
+                0, NULL,
+                {NULL}
+        },
+};
+
+START_TEST(test_split_command_parts)
+        int i;
+        for (i = 0; split_tests[i].command; i++) {
+                char *cmd = g_strdup(split_tests[i].command);
+                char **split = split_command_parts(cmd, split_tests[i].limit);
+                char **expected = split_tests[i].expected;
+
+                int j;
+                for (j = 0; split[j] && expected[j]; j++) {
+                        fail_unless (strcmp(split[j], expected[j]) == 0,
+                                "(%d) split_command_parts broken: split(\"%s\")[%d] -> %s (expected: %s)",
+                                i, split_tests[i].command, j, split[j], expected[j]);
+                }
+                g_free(cmd);
+        }
 END_TEST
 
@@ -183 +227 @@
         tcase_add_test (tc_core, test_word_wrap);
         tcase_add_test (tc_core, test_http_encode);
+        tcase_add_test (tc_core, test_split_command_parts);
         return s;
 }