allow 4 free trailing bytes for each value

[redis.git] / redis-cli.c

diff --git a/redis-cli.c b/redis-cli.c
index d418827cb5c41add48cd7b71c3b58ae69bb9723a..3f63aeaa665870bd3bc3c4f998f49ef19ee4901c 100644 (file)
--- a/redis-cli.c
+++ b/redis-cli.c
@@ -39,6 +39,7 @@
 #include "sds.h"
 #include "adlist.h"
 #include "zmalloc.h"
 #include "sds.h"
 #include "adlist.h"
 #include "zmalloc.h"

+#include "linenoise.h"

 
 #define REDIS_CMD_INLINE 1
 #define REDIS_CMD_BULK 2
 
 #define REDIS_CMD_INLINE 1
 #define REDIS_CMD_BULK 2


@@ -149,6 +150,7 @@ static struct redisCommand cmdTable[] = {
     {"exec",1,REDIS_CMD_INLINE},
     {"discard",1,REDIS_CMD_INLINE},
     {"hset",4,REDIS_CMD_MULTIBULK},
     {"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},
     {"hget",3,REDIS_CMD_BULK},
     {"hdel",3,REDIS_CMD_BULK},
     {"hlen",2,REDIS_CMD_INLINE},


@@ -156,6 +158,7 @@ static struct redisCommand cmdTable[] = {
     {"hvals",2,REDIS_CMD_INLINE},
     {"hgetall",2,REDIS_CMD_INLINE},
     {"hexists",3,REDIS_CMD_BULK},
     {"hvals",2,REDIS_CMD_INLINE},
     {"hgetall",2,REDIS_CMD_INLINE},
     {"hexists",3,REDIS_CMD_BULK},

+    {"config",-2,REDIS_CMD_BULK},

     {NULL,0,0}
 };
 
     {NULL,0,0}
 };
 


@@ -307,7 +310,7 @@ static int selectDb(int fd) {
     return 0;
 }
 
     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;
     struct redisCommand *rc = lookupCommand(argv[0]);
     int fd, j, retval = 0;
     int read_forever = 0;


@@ -333,7 +336,7 @@ static int cliSendCommand(int argc, char **argv) {
         return 1;
     }
 
         return 1;
     }
 

-    while(config.repeat--) {
+    while(repeat--) {

         /* Build the command to send */
         cmd = sdsempty();
         if (rc->flags & REDIS_CMD_MULTIBULK) {
         /* Build the command to send */
         cmd = sdsempty();
         if (rc->flags & REDIS_CMD_MULTIBULK) {


@@ -451,48 +454,30 @@ static char **convertToSds(int count, char** args) {
   return sds;
 }
 
   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;
 static void repl() {
     int size = 4096, max = size >> 1, argc;

-    char buffer[size];
-    char *line = buffer;
+    char *line;

     char **ap, *args[max];
 
     char **ap, *args[max];
 

-    if (config.auth != NULL) {
-        char *authargv[2];
-
-        authargv[0] = "AUTH";
-        authargv[1] = config.auth;
-        cliSendCommand(2, convertToSds(2, authargv));
-    }
-
-    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);
     }
 
     exit(0);


@@ -514,6 +499,14 @@ int main(int argc, char **argv) {
     argc -= firstarg;
     argv += firstarg;
 
     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);
     if (argc == 0 || config.interactive == 1) repl();
 
     argvcopy = convertToSds(argc, argv);


@@ -527,5 +520,5 @@ int main(int argc, char **argv) {
       }
     }
 
       }
     }
 

-    return cliSendCommand(argc, argvcopy);
+    return cliSendCommand(argc, argvcopy, config.repeat);

 }
 }