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?hp=-c

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

4b93e5e2676e1dc45de1c118c03042de1ce9f024
diff --combined src/redis-cli.c
index 43cbc55e,a2a909ba..1bd0798b
--- a/src/redis-cli.c
+++ b/src/redis-cli.c
@@@ -36,6 -36,7 +36,7 @@@
  #include <stdlib.h>
  #include <unistd.h>
  #include <ctype.h>
+ #include <errno.h>
  
  #include "anet.h"
  #include "sds.h"
@@@ -55,12 -56,11 +56,12 @@@ static struct config 
      long repeat;
      int dbnum;
      int argn_from_stdin;
 -    int interactive;
      int shutdown;
      int monitor_mode;
      int pubsub_mode;
 -    int raw_output;
 +    int raw_output; /* output mode per command */
 +    int tty; /* flag for default output format */
 +    char mb_sep;
      char *auth;
      char *historyfile;
  } config;
@@@ -68,11 -68,14 +69,14 @@@
  static int cliReadReply(int fd);
  static void usage();
  
- static int cliConnect(void) {
+ /* Connect to the client. If force is not zero the connection is performed
+  * even if there is already a connected socket. */
+ static int cliConnect(int force) {
      char err[ANET_ERR_LEN];
      static int fd = ANET_ERR;
  
-     if (fd == ANET_ERR) {
+     if (fd == ANET_ERR || force) {
+         if (force) close(fd);
          fd = anetTcpConnect(err,config.hostip,config.hostport);
          if (fd == ANET_ERR) {
              fprintf(stderr, "Could not connect to Redis at %s:%d: %s", config.hostip, config.hostport, err);
@@@ -108,7 -111,7 +112,7 @@@ static int cliReadSingleLineReply(int f
  
      if (reply == NULL) return 1;
      if (!quiet)
 -        printf("%s\n", reply);
 +        printf("%s", reply);
      sdsfree(reply);
      return 0;
  }
@@@ -135,7 -138,7 +139,7 @@@ static void printStringRepr(char *s, in
          }
          s++;
      }
 -    printf("\"\n");
 +    printf("\"");
  }
  
  static int cliReadBulkReply(int fd) {
@@@ -153,7 -156,7 +157,7 @@@
      reply = zmalloc(bulklen);
      anetRead(fd,reply,bulklen);
      anetRead(fd,crlf,2);
 -    if (config.raw_output || !isatty(fileno(stdout))) {
 +    if (config.raw_output || !config.tty) {
          if (bulklen && fwrite(reply,bulklen,1,stdout) == 0) {
              zfree(reply);
              return 1;
@@@ -170,6 -173,7 +174,7 @@@
  static int cliReadMultiBulkReply(int fd) {
      sds replylen = cliReadLine(fd);
      int elements, c = 1;
+     int retval = 0;
  
      if (replylen == NULL) return 1;
      elements = atoi(replylen);
@@@ -182,30 -186,37 +187,38 @@@
          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) {
      char type;
+     int nread;
  
-     if (anetRead(fd,&type,1) <= 0) {
+     if ((nread = anetRead(fd,&type,1)) <= 0) {
          if (config.shutdown) return 0;
-         exit(1);
+         if (config.interactive &&
+             (nread == 0 || (nread == -1 && errno == ECONNRESET)))
+         {
+             return ECONNRESET;
+         } else {
+             printf("I/O error while reading from socket: %s",strerror(errno));
+             exit(1);
+         }
      }
      switch(type) {
      case '-':
 -        printf("(error) ");
 +        if (config.tty) printf("(error) ");
          cliReadSingleLineReply(fd,0);
          return 1;
      case '+':
          return cliReadSingleLineReply(fd,0);
      case ':':
 -        printf("(integer) ");
 +        if (config.tty) printf("(integer) ");
          return cliReadSingleLineReply(fd,0);
      case '$':
          return cliReadBulkReply(fd);
@@@ -247,7 -258,7 +260,7 @@@ static int cliSendCommand(int argc, cha
      if (!strcasecmp(command,"monitor")) config.monitor_mode = 1;
      if (!strcasecmp(command,"subscribe") ||
          !strcasecmp(command,"psubscribe")) config.pubsub_mode = 1;
-     if ((fd = cliConnect()) == -1) return 1;
+     if ((fd = cliConnect(0)) == -1) return 1;
  
      /* Select db number */
      retval = selectDb(fd);
@@@ -275,7 -286,7 +288,7 @@@
              printf("Reading messages... (press Ctrl-c to quit)\n");
              while (1) {
                  cliReadReply(fd);
 -                printf("\n");
 +                printf("\n\n");
              }
          }
  
@@@ -283,9 -294,6 +296,9 @@@
          if (retval) {
              return retval;
          }
 +        if (!config.raw_output && config.tty) {
 +            printf("\n");
 +        }
      }
      return 0;
  }
@@@ -319,10 -327,7 +332,10 @@@ static int parseOptions(int argc, char 
              config.auth = argv[i+1];
              i++;
          } else if (!strcmp(argv[i],"-i")) {
 -            config.interactive = 1;
 +            fprintf(stderr,
 +"Starting interactive mode using -i is deprecated. Interactive mode is started\n"
 +"by default when redis-cli is executed without a command to execute.\n"
 +            );
          } else if (!strcmp(argv[i],"-c")) {
              config.argn_from_stdin = 1;
          } else if (!strcmp(argv[i],"-v")) {
@@@ -374,102 -379,35 +387,38 @@@ static char **convertToSds(int count, c
    return sds;
  }
  
- static char **splitArguments(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;
- 
-             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 == '"') {
-                         /* 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;
- }
- 
  #define LINE_BUFLEN 4096
  static void repl() {
      int argc, j;
-     char *line, **argv;
+     char *line;
+     sds *argv;
  
      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++)
@@@ -492,13 -430,12 +441,13 @@@ int main(int argc, char **argv) 
      config.dbnum = 0;
      config.argn_from_stdin = 0;
      config.shutdown = 0;
 -    config.interactive = 0;
      config.monitor_mode = 0;
      config.pubsub_mode = 0;
      config.raw_output = 0;
      config.auth = NULL;
      config.historyfile = NULL;
 +    config.tty = isatty(fileno(stdout)) || (getenv("FAKETTY") != NULL);
 +    config.mb_sep = '\n';
  
      if (getenv("HOME") != NULL) {
          config.historyfile = malloc(256);
@@@ -518,8 -455,8 +467,8 @@@
          cliSendCommand(2, convertToSds(2, authargv), 1);
      }
  
 -    if (argc == 0) config.interactive = 1;
 -    if (config.interactive) repl();
 +    /* Start interactive mode when no command is provided */
 +    if (argc == 0) repl();
  
      argvcopy = convertToSds(argc+1, argv);
      if (config.argn_from_stdin) {
diff --combined 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;
+ }