From: Pieter Noordhuis <pcnoordhuis@gmail.com>
Date: Wed, 25 Aug 2010 07:54:02 +0000 (+0200)
Subject: Merge master and move argument splitting patch to sds.c
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/4b93e5e2676e1dc45de1c118c03042de1ce9f024

Merge master and move argument splitting patch to sds.c
---

4b93e5e2676e1dc45de1c118c03042de1ce9f024
diff --cc src/redis-cli.c
index 43cbc55e,a2a909ba..1bd0798b
--- a/src/redis-cli.c
+++ b/src/redis-cli.c
@@@ -182,12 -186,11 +187,12 @@@ static int cliReadMultiBulkReply(int fd
          printf("(empty list or set)\n");
      }
      while(elements--) {
 -        printf("%d. ", c);
 +        if (config.tty) printf("%d. ", c);
-         if (cliReadReply(fd)) return 1;
+         if (cliReadReply(fd)) retval = 1;
 +        if (elements) printf("%c",config.mb_sep);
          c++;
      }
-     return 0;
+     return retval;
  }
  
  static int cliReadReply(int fd) {
@@@ -458,18 -387,27 +395,30 @@@ static void repl() 
  
      while((line = linenoise("redis> ")) != NULL) {
          if (line[0] != '\0') {
-             argv = splitArguments(line,&argc);
+             argv = sdssplitargs(line,&argc);
              linenoiseHistoryAdd(line);
              if (config.historyfile) linenoiseHistorySave(config.historyfile);
 -            if (argc > 0) {
 +            if (argv == NULL) {
 +                printf("Invalid argument(s)\n");
 +                continue;
 +            } else if (argc > 0) {
                  if (strcasecmp(argv[0],"quit") == 0 ||
                      strcasecmp(argv[0],"exit") == 0)
-                         exit(0);
-                 else
-                     cliSendCommand(argc, argv, 1);
+                 {
+                     exit(0);
+                 } else {
+                     int err;
+ 
+                     if ((err = cliSendCommand(argc, argv, 1)) != 0) {
+                         if (err == ECONNRESET) {
+                             printf("Reconnecting... ");
+                             fflush(stdout);
+                             if (cliConnect(1) == -1) exit(1);
+                             printf("OK\n");
+                             cliSendCommand(argc,argv,1);
+                         }
+                     }
+                 }
              }
              /* Free the argument vector */
              for (j = 0; j < argc; j++)
diff --cc src/sds.c
index 5e67f044,4878f8a6..d7d23c45
--- a/src/sds.c
+++ b/src/sds.c
@@@ -382,3 -382,80 +382,92 @@@ sds sdscatrepr(sds s, char *p, size_t l
      }
      return sdscatlen(s,"\"",1);
  }
+ 
+ /* Split a line into arguments, where every argument can be in the
+  * following programming-language REPL-alike form:
+  *
+  * foo bar "newline are supported\n" and "\xff\x00otherstuff"
+  *
+  * The number of arguments is stored into *argc, and an array
+  * of sds is returned. The caller should sdsfree() all the returned
+  * strings and finally zfree() the array itself.
+  *
+  * Note that sdscatrepr() is able to convert back a string into
+  * a quoted string in the same format sdssplitargs() is able to parse.
+  */
+ sds *sdssplitargs(char *line, int *argc) {
+     char *p = line;
+     char *current = NULL;
+     char **vector = NULL;
+ 
+     *argc = 0;
+     while(1) {
+         /* skip blanks */
+         while(*p && isspace(*p)) p++;
+         if (*p) {
+             /* get a token */
+             int inq=0; /* set to 1 if we are in "quotes" */
 -            int done = 0;
++            int done=0;
+ 
+             if (current == NULL) current = sdsempty();
+             while(!done) {
+                 if (inq) {
+                     if (*p == '\\' && *(p+1)) {
+                         char c;
+ 
+                         p++;
+                         switch(*p) {
+                         case 'n': c = '\n'; break;
+                         case 'r': c = '\r'; break;
+                         case 't': c = '\t'; break;
+                         case 'b': c = '\b'; break;
+                         case 'a': c = '\a'; break;
+                         default: c = *p; break;
+                         }
+                         current = sdscatlen(current,&c,1);
+                     } else if (*p == '"') {
 -                        done = 1;
++                        /* closing quote must be followed by a space */
++                        if (*(p+1) && !isspace(*(p+1))) goto err;
++                        done=1;
++                    } else if (!*p) {
++                        /* unterminated quotes */
++                        goto err;
+                     } else {
+                         current = sdscatlen(current,p,1);
+                     }
+                 } else {
+                     switch(*p) {
+                     case ' ':
+                     case '\n':
+                     case '\r':
+                     case '\t':
+                     case '\0':
+                         done=1;
+                         break;
+                     case '"':
+                         inq=1;
+                         break;
+                     default:
+                         current = sdscatlen(current,p,1);
+                         break;
+                     }
+                 }
+                 if (*p) p++;
+             }
+             /* add the token to the vector */
+             vector = zrealloc(vector,((*argc)+1)*sizeof(char*));
+             vector[*argc] = current;
+             (*argc)++;
+             current = NULL;
+         } else {
+             return vector;
+         }
+     }
++
++err:
++    while(*argc--)
++        sdsfree(vector[*argc]);
++    zfree(vector);
++    if (current) sdsfree(current);
++    return NULL;
+ }