Revert "version 1.3.10"

[redis.git] / redis-cli.c

diff --git a/redis-cli.c b/redis-cli.c
index d2273db0e48ba7f979c3c49e37d09d666aa1de94..b34c42773364b0e868a068c544f7cbc610bbea09 100644 (file)
--- a/redis-cli.c
+++ b/redis-cli.c
@@ -39,6 +39,7 @@
 #include "sds.h"
 #include "adlist.h"
 #include "zmalloc.h"
+#include "linenoise.h"
 
 #define REDIS_CMD_INLINE 1
 #define REDIS_CMD_BULK 2
@@ -52,6 +53,7 @@ static struct config {
     long repeat;
     int dbnum;
     int interactive;
+    char *auth;
 } config;
 
 struct redisCommand {
@@ -61,6 +63,7 @@ struct redisCommand {
 };
 
 static struct redisCommand cmdTable[] = {
+    {"auth",2,REDIS_CMD_INLINE},
     {"get",2,REDIS_CMD_INLINE},
     {"set",3,REDIS_CMD_BULK},
     {"setnx",3,REDIS_CMD_BULK},
@@ -105,6 +108,7 @@ static struct redisCommand cmdTable[] = {
     {"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},
@@ -147,11 +151,19 @@ static struct redisCommand cmdTable[] = {
     {"discard",1,REDIS_CMD_INLINE},
     {"hset",4,REDIS_CMD_MULTIBULK},
     {"hget",3,REDIS_CMD_BULK},
+    {"hmset",-4,REDIS_CMD_MULTIBULK},
+    {"hmget",-3,REDIS_CMD_MULTIBULK},
+    {"hincrby",4,REDIS_CMD_INLINE},
     {"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},
+    {"config",-2,REDIS_CMD_BULK},
+    {"subscribe",-2,REDIS_CMD_INLINE},
+    {"unsubscribe",-1,REDIS_CMD_INLINE},
+    {"publish",3,REDIS_CMD_BULK},
     {NULL,0,0}
 };
 
@@ -303,7 +315,7 @@ static int selectDb(int fd) {
     return 0;
 }
 
-static int cliSendCommand(int argc, char **argv) {
+static int cliSendCommand(int argc, char **argv, int repeat) {
     struct redisCommand *rc = lookupCommand(argv[0]);
     int fd, j, retval = 0;
     int read_forever = 0;
@@ -329,7 +341,7 @@ static int cliSendCommand(int argc, char **argv) {
         return 1;
     }
 
-    while(config.repeat--) {
+    while(repeat--) {
         /* Build the command to send */
         cmd = sdsempty();
         if (rc->flags & REDIS_CMD_MULTIBULK) {
@@ -396,6 +408,9 @@ static int parseOptions(int argc, char **argv) {
         } else if (!strcmp(argv[i],"-n") && !lastarg) {
             config.dbnum = atoi(argv[i+1]);
             i++;
+        } else if (!strcmp(argv[i],"-a") && !lastarg) {
+            config.auth = argv[i+1];
+            i++;
         } else if (!strcmp(argv[i],"-i")) {
             config.interactive = 1;
         } else {
@@ -423,8 +438,8 @@ static sds readArgFromStdin(void) {
 }
 
 static void usage() {
-    fprintf(stderr, "usage: redis-cli [-h host] [-p port] [-r repeat_times] [-n db_num] [-i] cmd arg1 arg2 arg3 ... argN\n");
-    fprintf(stderr, "usage: echo \"argN\" | redis-cli [-h host] [-p port] [-r repeat_times] [-n db_num] cmd arg1 arg2 ... arg(N-1)\n");
+    fprintf(stderr, "usage: redis-cli [-h host] [-p port] [-a authpw] [-r repeat_times] [-n db_num] [-i] cmd arg1 arg2 arg3 ... argN\n");
+    fprintf(stderr, "usage: echo \"argN\" | redis-cli [-h host] [-a authpw] [-p port] [-r repeat_times] [-n db_num] cmd arg1 arg2 ... arg(N-1)\n");
     fprintf(stderr, "\nIf a pipe from standard input is detected this data is used as last argument.\n\n");
     fprintf(stderr, "example: cat /etc/passwd | redis-cli set my_passwd\n");
     fprintf(stderr, "example: redis-cli get my_passwd\n");
@@ -444,40 +459,30 @@ static char **convertToSds(int count, char** args) {
   return sds;
 }
 
-static char *prompt(char *line, int size) {
-    char *retval;
-
-    do {
-        printf(">> ");
-        retval = fgets(line, size, stdin);
-    } while (retval && *line == '\n');
-    line[strlen(line) - 1] = '\0';
-
-    return retval;
-}
-
 static void repl() {
     int size = 4096, max = size >> 1, argc;
-    char buffer[size];
-    char *line = buffer;
+    char *line;
     char **ap, *args[max];
 
-    while (prompt(line, size)) {
-        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++;
-            }
+    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);
         }
 
-        config.repeat = 1;
-        cliSendCommand(argc, convertToSds(argc, args));
-        line = buffer;
+        free(line);
     }
 
     exit(0);
@@ -493,11 +498,20 @@ int main(int argc, char **argv) {
     config.repeat = 1;
     config.dbnum = 0;
     config.interactive = 0;
+    config.auth = NULL;
 
     firstarg = parseOptions(argc,argv);
     argc -= firstarg;
     argv += firstarg;
 
+    if (config.auth != NULL) {
+        char *authargv[2];
+
+        authargv[0] = "AUTH";
+        authargv[1] = config.auth;
+        cliSendCommand(2, convertToSds(2, authargv), 1);
+    }
+
     if (argc == 0 || config.interactive == 1) repl();
 
     argvcopy = convertToSds(argc, argv);
@@ -511,5 +525,5 @@ int main(int argc, char **argv) {
       }
     }
 
-    return cliSendCommand(argc, argvcopy);
+    return cliSendCommand(argc, argvcopy, config.repeat);
 }