Changeset 269580c for lib

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.

Location:

lib

Files:

• misc.c (modified) (4 diffs)
• misc.h (modified) (1 diff)

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 );