Skip to content
Browse files

Fix for issue #306, thanks to tchajed (on github) for the pull reques…

…t. The original patch was reworked a bit.
  • Loading branch information...
1 parent 4eb3b3e commit a5bd08487ff22156cbaae9286ab8820172b35df7 @antirez committed Feb 22, 2012
Showing with 13 additions and 6 deletions.
  1. +13 −6 src/redis-cli.c
View
19 src/redis-cli.c
@@ -68,7 +68,7 @@ static struct config {
char *auth;
int raw_output; /* output mode per command */
sds mb_delim;
- char prompt[32];
+ char prompt[128];
char *eval;
} config;
@@ -91,12 +91,19 @@ static long long mstime(void) {
}
static void cliRefreshPrompt(void) {
- if (config.dbnum == 0)
- snprintf(config.prompt,sizeof(config.prompt),"redis %s:%d> ",
- config.hostip, config.hostport);
+ int len;
+
+ if (config.hostsocket != NULL)
+ len = snprintf(config.prompt,sizeof(config.prompt),"redis %s",
+ config.hostsocket);
else
- snprintf(config.prompt,sizeof(config.prompt),"redis %s:%d[%d]> ",
- config.hostip, config.hostport, config.dbnum);
+ len = snprintf(config.prompt,sizeof(config.prompt),"redis %s:%d",
+ config.hostip, config.hostport);
+ /* Add [dbnum] if needed */
+ if (config.dbnum != 0)
+ len += snprintf(config.prompt+len,sizeof(config.prompt)-len,"[%d]",
+ config.dbnum);
+ snprintf(config.prompt+len,sizeof(config.prompt)-len,"> ");
}
/*------------------------------------------------------------------------------

0 comments on commit a5bd084

Please sign in to comment.
Something went wrong with that request. Please try again.