Merge remote branch 'djanowski/interactive'

redis-cli.c

@@ -51,6 +51,7 @@ static struct config {
     int hostport;
     long repeat;
     int dbnum;
+    int interactive;
 } config;
 
 struct redisCommand {
@@ -137,6 +138,9 @@ static struct redisCommand cmdTable[] = {
     {"mset",-3,REDIS_CMD_MULTIBULK},
     {"msetnx",-3,REDIS_CMD_MULTIBULK},
     {"monitor",1,REDIS_CMD_INLINE},
+    {"multi",1,REDIS_CMD_INLINE},
+    {"exec",1,REDIS_CMD_MULTIBULK},
+    {"discard",1,REDIS_CMD_INLINE},
     {NULL,0,0}
 };
 
@@ -154,14 +158,16 @@ static struct redisCommand *lookupCommand(char *name) {
 
 static int cliConnect(void) {
     char err[ANET_ERR_LEN];
-    int fd;
+    static int fd = ANET_ERR;
 
-    fd = anetTcpConnect(err,config.hostip,config.hostport);
     if (fd == ANET_ERR) {
-        fprintf(stderr,"Connect: %s\n",err);
+        fd = anetTcpConnect(err,config.hostip,config.hostport);
-        return -1;
+        if (fd == ANET_ERR) {
+            fprintf(stderr, "Could not connect to Redis at %s:%d: %s", config.hostip, config.hostport, err);
+            return -1;
+        }
+        anetTcpNoDelay(NULL,fd);
     }
-    anetTcpNoDelay(NULL,fd);
     return fd;
 }
 
@@ -266,8 +272,7 @@ static int cliReadReply(int fd) {
     }
 }
 
-static int selectDb(int fd)
+static int selectDb(int fd) {
-{
     int retval;
     sds cmd;
     char type;
@@ -282,8 +287,7 @@ static int selectDb(int fd)
     if (type <= 0 || type != '+') return 1;
     retval = cliReadSingleLineReply(fd,1);
     if (retval) {
-        close(fd);
+        return retval;
-	return retval;
     }
     return 0;
 }
@@ -313,7 +317,7 @@ static int cliSendCommand(int argc, char **argv) {
         fprintf(stderr,"Error setting DB num\n");
         return 1;
     }
- 
+
     while(config.repeat--) {
         /* Build the command to send */
         cmd = sdsempty();
@@ -350,11 +354,9 @@ static int cliSendCommand(int argc, char **argv) {
 
         retval = cliReadReply(fd);
         if (retval) {
-            close(fd);
             return retval;
         }
     }
-    close(fd);
     return 0;
 }
 
@@ -363,7 +365,7 @@ static int parseOptions(int argc, char **argv) {
 
     for (i = 1; i < argc; i++) {
         int lastarg = i==argc-1;
-        
+
         if (!strcmp(argv[i],"-h") && !lastarg) {
             char *ip = zmalloc(32);
             if (anetResolve(NULL,argv[i+1],ip) == ANET_ERR) {
@@ -383,6 +385,8 @@ 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],"-i")) {
+            config.interactive = 1;
         } else {
             break;
         }
@@ -408,17 +412,69 @@ static sds readArgFromStdin(void) {
 }
 
 static void usage() {
-    fprintf(stderr, "usage: redis-cli [-h host] [-p port] [-r repeat_times] [-n db_num] cmd arg1 arg2 arg3 ... argN\n");
+    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, "\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");
     fprintf(stderr, "example: redis-cli -r 100 lpush mylist x\n");
+    fprintf(stderr, "\nRun in interactive mode: redis-cli -i \n");
     exit(1);
 }
 
+/* Turn the plain C strings into Sds strings */
+static char **convertToSds(int count, char** args) {
+  int j;
+  char **sds = zmalloc(sizeof(char*)*count+1);
+
+  for(j = 0; j < count; j++)
+    sds[j] = sdsnew(args[j]);
+
+  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';
+
+    fpurge(stdin);
+
+    return retval;
+}
+
+static void repl() {
+    int size = 4096, max = size >> 1, argc;
+    char buffer[size];
+    char *line = buffer;
+    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;
+                ap++;
+                argc++;
+            }
+        }
+
+        config.repeat = 1;
+        cliSendCommand(argc, convertToSds(argc, args));
+        line = buffer;
+    }
+
+    exit(0);
+}
+
 int main(int argc, char **argv) {
-    int firstarg, j;
+    int firstarg;
     char **argvcopy;
     struct redisCommand *rc;
 
@@ -426,25 +482,25 @@ int main(int argc, char **argv) {
     config.hostport = 6379;
     config.repeat = 1;
     config.dbnum = 0;
+    config.interactive = 0;
 
     firstarg = parseOptions(argc,argv);
+
     argc -= firstarg;
     argv += firstarg;
-    
-    /* Turn the plain C strings into Sds strings */
-    argvcopy = zmalloc(sizeof(char*)*argc+1);
-    for(j = 0; j < argc; j++)
-        argvcopy[j] = sdsnew(argv[j]);
 
+    if (config.interactive == 1) repl();
     if (argc < 1) usage();
 
+    argvcopy = convertToSds(argc, argv);
+
     /* Read the last argument from stdandard input if needed */
     if ((rc = lookupCommand(argv[0])) != NULL) {
-        if (rc->arity > 0 && argc == rc->arity-1) {
+      if (rc->arity > 0 && argc == rc->arity-1) {
-            sds lastarg = readArgFromStdin();
+        sds lastarg = readArgFromStdin();
-            argvcopy[argc] = lastarg;
+        argvcopy[argc] = lastarg;
-            argc++;
+        argc++;
-        }
+      }
     }
 
     return cliSendCommand(argc, argvcopy);