Now when a child is terminated by a signal, the signal number is logged as well

[redis.git] / redis-cli.c

diff --git a/redis-cli.c b/redis-cli.c
index dbf6c9f96f77099796f3e3cd6019c78bdf03ac2c..5760da15a803b548ab25621cace86861daa7500f 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,7 +53,7 @@ static struct config {
     long repeat;
     int dbnum;
     int interactive;
-    char *authpw;
+    char *auth;
 } config;
 
 struct redisCommand {
@@ -149,6 +150,7 @@ static struct redisCommand cmdTable[] = {
     {"exec",1,REDIS_CMD_INLINE},
     {"discard",1,REDIS_CMD_INLINE},
     {"hset",4,REDIS_CMD_MULTIBULK},
+    {"hincrby",4,REDIS_CMD_INLINE},
     {"hget",3,REDIS_CMD_BULK},
     {"hdel",3,REDIS_CMD_BULK},
     {"hlen",2,REDIS_CMD_INLINE},
@@ -156,6 +158,10 @@ static struct redisCommand cmdTable[] = {
     {"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}
 };
 
@@ -307,33 +313,7 @@ static int selectDb(int fd) {
     return 0;
 }
 
-static int cliLogin(int fd)
-{
-    int retval = 1;
-    sds cmd;
-    char type;
-    if (config.authpw != "")
-    {
-        cmd = sdsempty();
-        cmd = sdscatprintf(cmd,"AUTH %s\r\n",config.authpw);
-        anetWrite(fd,cmd,sdslen(cmd));
-        anetRead(fd,&type,1);
-        if (type == '+') 
-        {
-            retval = 0;
-        }
-        int ret2 = cliReadSingleLineReply(fd,1);
-        if (ret2)
-        {
-            close(fd);
-        }
-    } else {
-        retval = 0;
-    }
-    return retval;
-}
-
-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;
@@ -359,14 +339,7 @@ static int cliSendCommand(int argc, char **argv) {
         return 1;
     }
 
-    /* Login if necessary */
-    retval = cliLogin(fd);
-    if (retval) {
-        fprintf(stderr,"Authentication failed\n");
-        return 1;
-    }
-
-    while(config.repeat--) {
+    while(repeat--) {
         /* Build the command to send */
         cmd = sdsempty();
         if (rc->flags & REDIS_CMD_MULTIBULK) {
@@ -434,7 +407,7 @@ static int parseOptions(int argc, char **argv) {
             config.dbnum = atoi(argv[i+1]);
             i++;
         } else if (!strcmp(argv[i],"-a") && !lastarg) {
-            config.authpw = argv[i+1];
+            config.auth = argv[i+1];
             i++;
         } else if (!strcmp(argv[i],"-i")) {
             config.interactive = 1;
@@ -484,40 +457,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);
@@ -533,11 +496,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);
@@ -551,5 +523,5 @@ int main(int argc, char **argv) {
       }
     }
 
-    return cliSendCommand(argc, argvcopy);
+    return cliSendCommand(argc, argvcopy, config.repeat);
 }