Undo rename of function names where something went wrong

[redis.git] / src / redis-cli.c

diff --git a/src/redis-cli.c b/src/redis-cli.c
index ca70c9472e4cb26416012a1bd0dabc3c8c8ff77a..123231d477101513da2a3925c48a6a76d55537f2 100644 (file)
--- a/src/redis-cli.c
+++ b/src/redis-cli.c
@@ -62,9 +62,9 @@ static struct config {
     int pubsub_mode;
     int stdinarg; /* get last arg from stdin. (-x option) */
     char *auth;
     int pubsub_mode;
     int stdinarg; /* get last arg from stdin. (-x option) */
     char *auth;

-    char *historyfile;

     int raw_output; /* output mode per command */
     sds mb_delim;
     int raw_output; /* output mode per command */
     sds mb_delim;

+    char prompt[32];

 } config;
 
 static void usage();
 } config;
 
 static void usage();


@@ -85,6 +85,13 @@ static long long mstime(void) {
     return mst;
 }
 
     return mst;
 }
 

+static void cliRefreshPrompt(void) {
+    if (config.dbnum == 0)
+        snprintf(config.prompt,sizeof(config.prompt),"redis> ");
+    else
+        snprintf(config.prompt,sizeof(config.prompt),"redis:%d> ",config.dbnum);
+}
+

 /*------------------------------------------------------------------------------
  * Help functions
  *--------------------------------------------------------------------------- */
 /*------------------------------------------------------------------------------
  * Help functions
  *--------------------------------------------------------------------------- */


@@ -264,11 +271,9 @@ static int cliAuth() {
 /* Send SELECT dbnum to the server */
 static int cliSelect() {
     redisReply *reply;
 /* Send SELECT dbnum to the server */
 static int cliSelect() {
     redisReply *reply;

-    char dbnum[16];

     if (config.dbnum == 0) return REDIS_OK;
 
     if (config.dbnum == 0) return REDIS_OK;
 

-    snprintf(dbnum,sizeof(dbnum),"%d",config.dbnum);
-    reply = redisCommand(context,"SELECT %s",dbnum);
+    reply = redisCommand(context,"SELECT %d",config.dbnum);

     if (reply != NULL) {
         freeReplyObject(reply);
         return REDIS_OK;
     if (reply != NULL) {
         freeReplyObject(reply);
         return REDIS_OK;


@@ -414,10 +419,11 @@ static sds cliFormatReplyRaw(redisReply *r) {
 }
 
 static int cliReadReply(int output_raw_strings) {
 }
 
 static int cliReadReply(int output_raw_strings) {

+    void *_reply;

     redisReply *reply;
     sds out;
 
     redisReply *reply;
     sds out;
 

-    if (redisGetReply(context,(void**)&reply) != REDIS_OK) {
+    if (redisGetReply(context,&_reply) != REDIS_OK) {

         if (config.shutdown)
             return REDIS_OK;
         if (config.interactive) {
         if (config.shutdown)
             return REDIS_OK;
         if (config.interactive) {


@@ -431,6 +437,7 @@ static int cliReadReply(int output_raw_strings) {
         return REDIS_ERR; /* avoid compiler warning */
     }
 
         return REDIS_ERR; /* avoid compiler warning */
     }
 

+    reply = (redisReply*)_reply;

     if (output_raw_strings) {
         out = cliFormatReplyRaw(reply);
     } else {
     if (output_raw_strings) {
         out = cliFormatReplyRaw(reply);
     } else {


@@ -487,9 +494,19 @@ static int cliSendCommand(int argc, char **argv, int repeat) {
             }
         }
 
             }
         }
 

-        if (cliReadReply(output_raw) != REDIS_OK)
+        if (cliReadReply(output_raw) != REDIS_OK) {
+            free(argvlen);

             return REDIS_ERR;
             return REDIS_ERR;

+        } else {
+            /* Store database number when SELECT was successfully executed. */
+            if (!strcasecmp(command,"select") && argc == 2) {
+                config.dbnum = atoi(argv[1]);
+                cliRefreshPrompt();
+            }
+        }

     }
     }

+
+    free(argvlen);

     return REDIS_OK;
 }
 
     return REDIS_OK;
 }
 


@@ -607,18 +624,32 @@ static char **convertToSds(int count, char** args) {
 
 #define LINE_BUFLEN 4096
 static void repl() {
 
 #define LINE_BUFLEN 4096
 static void repl() {

-    int argc, j;
+    sds historyfile = NULL;
+    int history = 0;

     char *line;
     char *line;

+    int argc;

     sds *argv;
 
     config.interactive = 1;
     linenoiseSetCompletionCallback(completionCallback);
 
     sds *argv;
 
     config.interactive = 1;
     linenoiseSetCompletionCallback(completionCallback);
 

-    while((line = linenoise(context ? "redis> " : "not connected> ")) != NULL) {
+    /* Only use history when stdin is a tty. */
+    if (isatty(fileno(stdin))) {
+        history = 1;
+
+        if (getenv("HOME") != NULL) {
+            historyfile = sdscatprintf(sdsempty(),"%s/.rediscli_history",getenv("HOME"));
+            linenoiseHistoryLoad(historyfile);
+        }
+    }
+
+    cliRefreshPrompt();
+    while((line = linenoise(context ? config.prompt : "not connected> ")) != NULL) {

         if (line[0] != '\0') {
             argv = sdssplitargs(line,&argc);
         if (line[0] != '\0') {
             argv = sdssplitargs(line,&argc);

-            linenoiseHistoryAdd(line);
-            if (config.historyfile) linenoiseHistorySave(config.historyfile);
+            if (history) linenoiseHistoryAdd(line);
+            if (historyfile) linenoiseHistorySave(historyfile);
+

             if (argv == NULL) {
                 printf("Invalid argument(s)\n");
                 continue;
             if (argv == NULL) {
                 printf("Invalid argument(s)\n");
                 continue;


@@ -652,8 +683,7 @@ static void repl() {
                 }
             }
             /* Free the argument vector */
                 }
             }
             /* Free the argument vector */

-            for (j = 0; j < argc; j++)
-                sdsfree(argv[j]);
+            while(argc--) sdsfree(argv[argc]);

             zfree(argv);
         }
         /* linenoise() returns malloc-ed lines like readline() */
             zfree(argv);
         }
         /* linenoise() returns malloc-ed lines like readline() */


@@ -689,17 +719,10 @@ int main(int argc, char **argv) {
     config.pubsub_mode = 0;
     config.stdinarg = 0;
     config.auth = NULL;
     config.pubsub_mode = 0;
     config.stdinarg = 0;
     config.auth = NULL;

-    config.historyfile = NULL;

     config.raw_output = !isatty(fileno(stdout)) && (getenv("FAKETTY") == NULL);
     config.mb_delim = sdsnew("\n");
     cliInitHelp();
 
     config.raw_output = !isatty(fileno(stdout)) && (getenv("FAKETTY") == NULL);
     config.mb_delim = sdsnew("\n");
     cliInitHelp();
 

-    if (getenv("HOME") != NULL) {
-        config.historyfile = malloc(256);
-        snprintf(config.historyfile,256,"%s/.rediscli_history",getenv("HOME"));
-        linenoiseHistoryLoad(config.historyfile);
-    }
-

     firstarg = parseOptions(argc,argv);
     argc -= firstarg;
     argv += firstarg;
     firstarg = parseOptions(argc,argv);
     argc -= firstarg;
     argv += firstarg;