X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/bc86d88e058d46bc65eeb1505f12f652792fe5d0..ea2c08e92200dd4c746f2b4b04da611a34e49dcf:/redis-cli.c?ds=sidebyside

diff --git a/redis-cli.c b/redis-cli.c
index 2db8f2f7..279bf10c 100644
--- a/redis-cli.c
+++ b/redis-cli.c
@@ -34,6 +34,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <ctype.h>
 
 #include "anet.h"
 #include "sds.h"
@@ -53,6 +54,10 @@ static struct config {
     long repeat;
     int dbnum;
     int interactive;
+    int shutdown;
+    int monitor_mode;
+    int pubsub_mode;
+    int raw_output;
     char *auth;
 } config;
 
@@ -62,102 +67,117 @@ struct redisCommand {
     int flags;
 };
 
+#define CMDFLAG_NONE 0
+#define CMDFLAG_RAWOUTPUT 1
+
 static struct redisCommand cmdTable[] = {
-    {"auth",2,REDIS_CMD_INLINE},
-    {"get",2,REDIS_CMD_INLINE},
-    {"set",3,REDIS_CMD_BULK},
-    {"setnx",3,REDIS_CMD_BULK},
-    {"append",3,REDIS_CMD_BULK},
-    {"substr",4,REDIS_CMD_INLINE},
-    {"del",-2,REDIS_CMD_INLINE},
-    {"exists",2,REDIS_CMD_INLINE},
-    {"incr",2,REDIS_CMD_INLINE},
-    {"decr",2,REDIS_CMD_INLINE},
-    {"rpush",3,REDIS_CMD_BULK},
-    {"lpush",3,REDIS_CMD_BULK},
-    {"rpop",2,REDIS_CMD_INLINE},
-    {"lpop",2,REDIS_CMD_INLINE},
-    {"brpop",-3,REDIS_CMD_INLINE},
-    {"blpop",-3,REDIS_CMD_INLINE},
-    {"llen",2,REDIS_CMD_INLINE},
-    {"lindex",3,REDIS_CMD_INLINE},
-    {"lset",4,REDIS_CMD_BULK},
-    {"lrange",4,REDIS_CMD_INLINE},
-    {"ltrim",4,REDIS_CMD_INLINE},
-    {"lrem",4,REDIS_CMD_BULK},
-    {"rpoplpush",3,REDIS_CMD_BULK},
-    {"sadd",3,REDIS_CMD_BULK},
-    {"srem",3,REDIS_CMD_BULK},
-    {"smove",4,REDIS_CMD_BULK},
-    {"sismember",3,REDIS_CMD_BULK},
-    {"scard",2,REDIS_CMD_INLINE},
-    {"spop",2,REDIS_CMD_INLINE},
-    {"srandmember",2,REDIS_CMD_INLINE},
-    {"sinter",-2,REDIS_CMD_INLINE},
-    {"sinterstore",-3,REDIS_CMD_INLINE},
-    {"sunion",-2,REDIS_CMD_INLINE},
-    {"sunionstore",-3,REDIS_CMD_INLINE},
-    {"sdiff",-2,REDIS_CMD_INLINE},
-    {"sdiffstore",-3,REDIS_CMD_INLINE},
-    {"smembers",2,REDIS_CMD_INLINE},
-    {"zadd",4,REDIS_CMD_BULK},
-    {"zincrby",4,REDIS_CMD_BULK},
-    {"zrem",3,REDIS_CMD_BULK},
-    {"zremrangebyscore",4,REDIS_CMD_INLINE},
-    {"zmerge",-3,REDIS_CMD_INLINE},
-    {"zmergeweighed",-4,REDIS_CMD_INLINE},
-    {"zrange",-4,REDIS_CMD_INLINE},
-    {"zrank",3,REDIS_CMD_BULK},
-    {"zrevrank",3,REDIS_CMD_BULK},
-    {"zrangebyscore",-4,REDIS_CMD_INLINE},
-    {"zcount",4,REDIS_CMD_INLINE},
-    {"zrevrange",-4,REDIS_CMD_INLINE},
-    {"zcard",2,REDIS_CMD_INLINE},
-    {"zscore",3,REDIS_CMD_BULK},
-    {"incrby",3,REDIS_CMD_INLINE},
-    {"decrby",3,REDIS_CMD_INLINE},
-    {"getset",3,REDIS_CMD_BULK},
-    {"randomkey",1,REDIS_CMD_INLINE},
-    {"select",2,REDIS_CMD_INLINE},
-    {"move",3,REDIS_CMD_INLINE},
-    {"rename",3,REDIS_CMD_INLINE},
-    {"renamenx",3,REDIS_CMD_INLINE},
-    {"keys",2,REDIS_CMD_INLINE},
-    {"dbsize",1,REDIS_CMD_INLINE},
-    {"ping",1,REDIS_CMD_INLINE},
-    {"echo",2,REDIS_CMD_BULK},
-    {"save",1,REDIS_CMD_INLINE},
-    {"bgsave",1,REDIS_CMD_INLINE},
-    {"rewriteaof",1,REDIS_CMD_INLINE},
-    {"bgrewriteaof",1,REDIS_CMD_INLINE},
-    {"shutdown",1,REDIS_CMD_INLINE},
-    {"lastsave",1,REDIS_CMD_INLINE},
-    {"type",2,REDIS_CMD_INLINE},
-    {"flushdb",1,REDIS_CMD_INLINE},
-    {"flushall",1,REDIS_CMD_INLINE},
-    {"sort",-2,REDIS_CMD_INLINE},
-    {"info",1,REDIS_CMD_INLINE},
-    {"mget",-2,REDIS_CMD_INLINE},
-    {"expire",3,REDIS_CMD_INLINE},
-    {"expireat",3,REDIS_CMD_INLINE},
-    {"ttl",2,REDIS_CMD_INLINE},
-    {"slaveof",3,REDIS_CMD_INLINE},
-    {"debug",-2,REDIS_CMD_INLINE},
-    {"mset",-3,REDIS_CMD_MULTIBULK},
-    {"msetnx",-3,REDIS_CMD_MULTIBULK},
-    {"monitor",1,REDIS_CMD_INLINE},
-    {"multi",1,REDIS_CMD_INLINE},
-    {"exec",1,REDIS_CMD_INLINE},
-    {"discard",1,REDIS_CMD_INLINE},
-    {"hset",4,REDIS_CMD_MULTIBULK},
-    {"hget",3,REDIS_CMD_BULK},
-    {"hdel",3,REDIS_CMD_BULK},
-    {"hlen",2,REDIS_CMD_INLINE},
-    {"hkeys",2,REDIS_CMD_INLINE},
-    {"hvals",2,REDIS_CMD_INLINE},
-    {"hgetall",2,REDIS_CMD_INLINE},
-    {"hexists",3,REDIS_CMD_BULK},
-    {NULL,0,0}
+    {"auth",2,CMDFLAG_NONE},
+    {"get",2,CMDFLAG_NONE},
+    {"set",3,CMDFLAG_NONE},
+    {"setnx",3,CMDFLAG_NONE},
+    {"setex",4,CMDFLAG_NONE},
+    {"append",3,CMDFLAG_NONE},
+    {"substr",4,CMDFLAG_NONE},
+    {"del",-2,CMDFLAG_NONE},
+    {"exists",2,CMDFLAG_NONE},
+    {"incr",2,CMDFLAG_NONE},
+    {"decr",2,CMDFLAG_NONE},
+    {"rpush",3,CMDFLAG_NONE},
+    {"lpush",3,CMDFLAG_NONE},
+    {"rpop",2,CMDFLAG_NONE},
+    {"lpop",2,CMDFLAG_NONE},
+    {"brpop",-3,CMDFLAG_NONE},
+    {"blpop",-3,CMDFLAG_NONE},
+    {"llen",2,CMDFLAG_NONE},
+    {"lindex",3,CMDFLAG_NONE},
+    {"lset",4,CMDFLAG_NONE},
+    {"lrange",4,CMDFLAG_NONE},
+    {"ltrim",4,CMDFLAG_NONE},
+    {"lrem",4,CMDFLAG_NONE},
+    {"rpoplpush",3,CMDFLAG_NONE},
+    {"sadd",3,CMDFLAG_NONE},
+    {"srem",3,CMDFLAG_NONE},
+    {"smove",4,CMDFLAG_NONE},
+    {"sismember",3,CMDFLAG_NONE},
+    {"scard",2,CMDFLAG_NONE},
+    {"spop",2,CMDFLAG_NONE},
+    {"srandmember",2,CMDFLAG_NONE},
+    {"sinter",-2,CMDFLAG_NONE},
+    {"sinterstore",-3,CMDFLAG_NONE},
+    {"sunion",-2,CMDFLAG_NONE},
+    {"sunionstore",-3,CMDFLAG_NONE},
+    {"sdiff",-2,CMDFLAG_NONE},
+    {"sdiffstore",-3,CMDFLAG_NONE},
+    {"smembers",2,CMDFLAG_NONE},
+    {"zadd",4,CMDFLAG_NONE},
+    {"zincrby",4,CMDFLAG_NONE},
+    {"zrem",3,CMDFLAG_NONE},
+    {"zremrangebyscore",4,CMDFLAG_NONE},
+    {"zunion",-4,CMDFLAG_NONE},
+    {"zinter",-4,CMDFLAG_NONE},
+    {"zrange",-4,CMDFLAG_NONE},
+    {"zrank",3,CMDFLAG_NONE},
+    {"zrevrank",3,CMDFLAG_NONE},
+    {"zrangebyscore",-4,CMDFLAG_NONE},
+    {"zcount",4,CMDFLAG_NONE},
+    {"zrevrange",-4,CMDFLAG_NONE},
+    {"zcard",2,CMDFLAG_NONE},
+    {"zscore",3,CMDFLAG_NONE},
+    {"incrby",3,CMDFLAG_NONE},
+    {"decrby",3,CMDFLAG_NONE},
+    {"getset",3,CMDFLAG_NONE},
+    {"randomkey",1,CMDFLAG_NONE},
+    {"select",2,CMDFLAG_NONE},
+    {"move",3,CMDFLAG_NONE},
+    {"rename",3,CMDFLAG_NONE},
+    {"renamenx",3,CMDFLAG_NONE},
+    {"keys",2,CMDFLAG_NONE},
+    {"dbsize",1,CMDFLAG_NONE},
+    {"ping",1,CMDFLAG_NONE},
+    {"echo",2,CMDFLAG_NONE},
+    {"save",1,CMDFLAG_NONE},
+    {"bgsave",1,CMDFLAG_NONE},
+    {"rewriteaof",1,CMDFLAG_NONE},
+    {"bgrewriteaof",1,CMDFLAG_NONE},
+    {"shutdown",1,CMDFLAG_NONE},
+    {"lastsave",1,CMDFLAG_NONE},
+    {"type",2,CMDFLAG_NONE},
+    {"flushdb",1,CMDFLAG_NONE},
+    {"flushall",1,CMDFLAG_NONE},
+    {"sort",-2,CMDFLAG_NONE},
+    {"info",1,CMDFLAG_RAWOUTPUT},
+    {"mget",-2,CMDFLAG_NONE},
+    {"expire",3,CMDFLAG_NONE},
+    {"expireat",3,CMDFLAG_NONE},
+    {"ttl",2,CMDFLAG_NONE},
+    {"slaveof",3,CMDFLAG_NONE},
+    {"debug",-2,CMDFLAG_NONE},
+    {"mset",-3,CMDFLAG_NONE},
+    {"msetnx",-3,CMDFLAG_NONE},
+    {"monitor",1,CMDFLAG_NONE},
+    {"multi",1,CMDFLAG_NONE},
+    {"exec",1,CMDFLAG_NONE},
+    {"discard",1,CMDFLAG_NONE},
+    {"hset",4,CMDFLAG_NONE},
+    {"hget",3,CMDFLAG_NONE},
+    {"hmset",-4,CMDFLAG_NONE},
+    {"hmget",-3,CMDFLAG_NONE},
+    {"hincrby",4,CMDFLAG_NONE},
+    {"hdel",3,CMDFLAG_NONE},
+    {"hlen",2,CMDFLAG_NONE},
+    {"hkeys",2,CMDFLAG_NONE},
+    {"hvals",2,CMDFLAG_NONE},
+    {"hgetall",2,CMDFLAG_NONE},
+    {"hexists",3,CMDFLAG_NONE},
+    {"config",-2,CMDFLAG_NONE},
+    {"subscribe",-2,CMDFLAG_NONE},
+    {"unsubscribe",-1,CMDFLAG_NONE},
+    {"psubscribe",-2,CMDFLAG_NONE},
+    {"punsubscribe",-1,CMDFLAG_NONE},
+    {"publish",3,CMDFLAG_NONE},
+    {"watch",-2,CMDFLAG_NONE},
+    {"unwatch",1,CMDFLAG_NONE},
+    {NULL,0,CMDFLAG_NONE}
 };
 
 static int cliReadReply(int fd);
@@ -217,6 +237,31 @@ static int cliReadSingleLineReply(int fd, int quiet) {
     return 0;
 }
 
+static void printStringRepr(char *s, int len) {
+    printf("\"");
+    while(len--) {
+        switch(*s) {
+        case '\\':
+        case '"':
+            printf("\\%c",*s);
+            break;
+        case '\n': printf("\\n"); break;
+        case '\r': printf("\\r"); break;
+        case '\t': printf("\\t"); break;
+        case '\a': printf("\\a"); break;
+        case '\b': printf("\\b"); break;
+        default:
+            if (isprint(*s))
+                printf("%c",*s);
+            else
+                printf("\\x%02x",(unsigned char)*s);
+            break;
+        }
+        s++;
+    }
+    printf("\"\n");
+}
+
 static int cliReadBulkReply(int fd) {
     sds replylen = cliReadLine(fd);
     char *reply, crlf[2];
@@ -232,12 +277,16 @@ static int cliReadBulkReply(int fd) {
     reply = zmalloc(bulklen);
     anetRead(fd,reply,bulklen);
     anetRead(fd,crlf,2);
-    if (bulklen && fwrite(reply,bulklen,1,stdout) == 0) {
-        zfree(reply);
-        return 1;
+    if (config.raw_output || !isatty(fileno(stdout))) {
+        if (bulklen && fwrite(reply,bulklen,1,stdout) == 0) {
+            zfree(reply);
+            return 1;
+        }
+    } else {
+        /* If you are producing output for the standard output we want
+         * a more interesting output with quoted characters and so forth */
+        printStringRepr(reply,bulklen);
     }
-    if (isatty(fileno(stdout)) && reply[bulklen-1] != '\n')
-        printf("\n");
     zfree(reply);
     return 0;
 }
@@ -267,7 +316,10 @@ static int cliReadMultiBulkReply(int fd) {
 static int cliReadReply(int fd) {
     char type;
 
-    if (anetRead(fd,&type,1) <= 0) exit(1);
+    if (anetRead(fd,&type,1) <= 0) {
+        if (config.shutdown) return 0;
+        exit(1);
+    }
     switch(type) {
     case '-':
         printf("(error) ");
@@ -311,20 +363,24 @@ static int selectDb(int fd) {
 static int cliSendCommand(int argc, char **argv, int repeat) {
     struct redisCommand *rc = lookupCommand(argv[0]);
     int fd, j, retval = 0;
-    int read_forever = 0;
     sds cmd;
 
     if (!rc) {
         fprintf(stderr,"Unknown command '%s'\n",argv[0]);
         return 1;
     }
+    config.raw_output = (rc->flags & CMDFLAG_RAWOUTPUT);
 
     if ((rc->arity > 0 && argc != rc->arity) ||
         (rc->arity < 0 && argc < -rc->arity)) {
             fprintf(stderr,"Wrong number of arguments for '%s'\n",rc->name);
             return 1;
     }
-    if (!strcasecmp(rc->name,"monitor")) read_forever = 1;
+
+    if (!strcasecmp(rc->name,"shutdown")) config.shutdown = 1;
+    if (!strcasecmp(rc->name,"monitor")) config.monitor_mode = 1;
+    if (!strcasecmp(rc->name,"subscribe") ||
+        !strcasecmp(rc->name,"psubscribe")) config.pubsub_mode = 1;
     if ((fd = cliConnect()) == -1) return 1;
 
     /* Select db number */
@@ -336,39 +392,30 @@ static int cliSendCommand(int argc, char **argv, int repeat) {
 
     while(repeat--) {
         /* Build the command to send */
-        cmd = sdsempty();
-        if (rc->flags & REDIS_CMD_MULTIBULK) {
-            cmd = sdscatprintf(cmd,"*%d\r\n",argc);
-            for (j = 0; j < argc; j++) {
-                cmd = sdscatprintf(cmd,"$%lu\r\n",
-                    (unsigned long)sdslen(argv[j]));
-                cmd = sdscatlen(cmd,argv[j],sdslen(argv[j]));
-                cmd = sdscatlen(cmd,"\r\n",2);
-            }
-        } else {
-            for (j = 0; j < argc; j++) {
-                if (j != 0) cmd = sdscat(cmd," ");
-                if (j == argc-1 && rc->flags & REDIS_CMD_BULK) {
-                    cmd = sdscatprintf(cmd,"%lu",
-                        (unsigned long)sdslen(argv[j]));
-                } else {
-                    cmd = sdscatlen(cmd,argv[j],sdslen(argv[j]));
-                }
-            }
-            cmd = sdscat(cmd,"\r\n");
-            if (rc->flags & REDIS_CMD_BULK) {
-                cmd = sdscatlen(cmd,argv[argc-1],sdslen(argv[argc-1]));
-                cmd = sdscatlen(cmd,"\r\n",2);
-            }
+        cmd = sdscatprintf(sdsempty(),"*%d\r\n",argc);
+        for (j = 0; j < argc; j++) {
+            cmd = sdscatprintf(cmd,"$%lu\r\n",
+                (unsigned long)sdslen(argv[j]));
+            cmd = sdscatlen(cmd,argv[j],sdslen(argv[j]));
+            cmd = sdscatlen(cmd,"\r\n",2);
         }
         anetWrite(fd,cmd,sdslen(cmd));
         sdsfree(cmd);
 
-        while (read_forever) {
+        while (config.monitor_mode) {
             cliReadSingleLineReply(fd,0);
         }
 
+        if (config.pubsub_mode) {
+            printf("Reading messages... (press Ctrl-c to quit)\n");
+            while (1) {
+                cliReadReply(fd);
+                printf("\n");
+            }
+        }
+
         retval = cliReadReply(fd);
+
         if (retval) {
             return retval;
         }
@@ -452,32 +499,95 @@ static char **convertToSds(int count, char** args) {
   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 == '"') {
+                        done = 1;
+                    } 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;
+        }
+    }
+}
+
+#define LINE_BUFLEN 4096
 static void repl() {
-    int size = 4096, max = size >> 1, argc;
-    char *line;
-    char **ap, *args[max];
+    int argc, j;
+    char *line, **argv;
 
     while((line = linenoise("redis> ")) != NULL) {
         if (line[0] != '\0') {
-          linenoiseHistoryAdd(line);
-          argc = 0;
-
-          for (ap = args; (*ap = strsep(&line, " \t")) != NULL;) {
-              if (**ap != '\0') {
-                  if (argc >= max) break;
-                  if (strcasecmp(*ap,"quit") == 0 || strcasecmp(*ap,"exit") == 0)
-                      exit(0);
-                  ap++;
-                  argc++;
-              }
-          }
-
-          cliSendCommand(argc, convertToSds(argc, args), 1);
+            argv = splitArguments(line,&argc);
+            linenoiseHistoryAdd(line);
+            if (argc > 0) {
+                if (strcasecmp(argv[0],"quit") == 0 ||
+                    strcasecmp(argv[0],"exit") == 0)
+                        exit(0);
+                else
+                    cliSendCommand(argc, argv, 1);
+            }
+            /* Free the argument vector */
+            for (j = 0; j < argc; j++)
+                sdsfree(argv[j]);
+            zfree(argv);
         }
-
+        /* linenoise() returns malloc-ed lines like readline() */
         free(line);
     }
-
     exit(0);
 }
 
@@ -490,7 +600,11 @@ int main(int argc, char **argv) {
     config.hostport = 6379;
     config.repeat = 1;
     config.dbnum = 0;
+    config.shutdown = 0;
     config.interactive = 0;
+    config.monitor_mode = 0;
+    config.pubsub_mode = 0;
+    config.raw_output = 0;
     config.auth = NULL;
 
     firstarg = parseOptions(argc,argv);