X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/3ce014c766c47f3966d438032a6fa318c4f6ec61..89a1433e69db5f7c996484672437616a16a6fe0a:/src/redis-cli.c diff --git a/src/redis-cli.c b/src/redis-cli.c index bc405c91..08b3a713 100644 --- a/src/redis-cli.c +++ b/src/redis-cli.c @@ -39,34 +39,37 @@ #include #include #include +#include -#include "anet.h" +#include "hiredis.h" #include "sds.h" -#include "adlist.h" #include "zmalloc.h" #include "linenoise.h" +#include "help.h" #define REDIS_NOTUSED(V) ((void) V) +static redisContext *context; static struct config { char *hostip; int hostport; + char *hostsocket; long repeat; int dbnum; int interactive; int shutdown; int monitor_mode; int pubsub_mode; - int raw_output; /* output mode per command */ - int tty; /* flag for default output format */ int stdinarg; /* get last arg from stdin. (-x option) */ - char mb_sep; char *auth; char *historyfile; + int raw_output; /* output mode per command */ + sds mb_delim; } config; -static int cliReadReply(int fd); static void usage(); +char *redisGitSHA1(void); +char *redisGitDirty(void); /*------------------------------------------------------------------------------ * Utility functions @@ -82,259 +85,414 @@ static long long mstime(void) { return mst; } -static void printStringRepr(char *s, int len) { - printf("\""); - while(len--) { - switch(*s) { - case '\\': - case '"': - printf("\\%c",*s); - break; - case '\n': printf("\\n"); break; - case '\r': printf("\\r"); break; - case '\t': printf("\\t"); break; - case '\a': printf("\\a"); break; - case '\b': printf("\\b"); break; - default: - if (isprint(*s)) - printf("%c",*s); - else - printf("\\x%02x",(unsigned char)*s); - break; - } - s++; - } - printf("\""); -} - /*------------------------------------------------------------------------------ - * Networking / parsing + * Help functions *--------------------------------------------------------------------------- */ -/* Connect to the client. If force is not zero the connection is performed - * even if there is already a connected socket. */ -static int cliConnect(int force) { - char err[ANET_ERR_LEN]; - static int fd = ANET_ERR; - - if (fd == ANET_ERR || force) { - if (force) close(fd); - fd = anetTcpConnect(err,config.hostip,config.hostport); - 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); +#define CLI_HELP_COMMAND 1 +#define CLI_HELP_GROUP 2 + +typedef struct { + int type; + int argc; + sds *argv; + sds full; + + /* Only used for help on commands */ + struct commandHelp *org; +} helpEntry; + +static helpEntry *helpEntries; +static int helpEntriesLen; + +static sds cliVersion() { + sds version; + version = sdscatprintf(sdsempty(), "%s", REDIS_VERSION); + + /* Add git commit and working tree status when available */ + if (strtoll(redisGitSHA1(),NULL,16)) { + version = sdscatprintf(version, " (git:%s", redisGitSHA1()); + if (strtoll(redisGitDirty(),NULL,10)) + version = sdscatprintf(version, "-dirty"); + version = sdscat(version, ")"); } - return fd; + return version; } -static sds cliReadLine(int fd) { - sds line = sdsempty(); +static void cliInitHelp() { + int commandslen = sizeof(commandHelp)/sizeof(struct commandHelp); + int groupslen = sizeof(commandGroups)/sizeof(char*); + int i, len, pos = 0; + helpEntry tmp; + + helpEntriesLen = len = commandslen+groupslen; + helpEntries = malloc(sizeof(helpEntry)*len); + + for (i = 0; i < groupslen; i++) { + tmp.argc = 1; + tmp.argv = malloc(sizeof(sds)); + tmp.argv[0] = sdscatprintf(sdsempty(),"@%s",commandGroups[i]); + tmp.full = tmp.argv[0]; + tmp.type = CLI_HELP_GROUP; + tmp.org = NULL; + helpEntries[pos++] = tmp; + } - while(1) { - char c; - ssize_t ret; - - ret = read(fd,&c,1); - if (ret <= 0) { - sdsfree(line); - return NULL; - } else if ((ret == 0) || (c == '\n')) { - break; - } else { - line = sdscatlen(line,&c,1); - } + for (i = 0; i < commandslen; i++) { + tmp.argv = sdssplitargs(commandHelp[i].name,&tmp.argc); + tmp.full = sdsnew(commandHelp[i].name); + tmp.type = CLI_HELP_COMMAND; + tmp.org = &commandHelp[i]; + helpEntries[pos++] = tmp; } - return sdstrim(line,"\r\n"); } -static int cliReadSingleLineReply(int fd, int quiet) { - sds reply = cliReadLine(fd); +/* Output command help to stdout. */ +static void cliOutputCommandHelp(struct commandHelp *help, int group) { + printf("\r\n \x1b[1m%s\x1b[0m \x1b[90m%s\x1b[0m\r\n", help->name, help->params); + printf(" \x1b[33msummary:\x1b[0m %s\r\n", help->summary); + printf(" \x1b[33msince:\x1b[0m %s\r\n", help->since); + if (group) { + printf(" \x1b[33mgroup:\x1b[0m %s\r\n", commandGroups[help->group]); + } +} - if (reply == NULL) return 1; - if (!quiet) - printf("%s", reply); - sdsfree(reply); - return 0; +/* Print generic help. */ +static void cliOutputGenericHelp() { + sds version = cliVersion(); + printf( + "redis-cli %s\r\n" + "Type: \"help @\" to get a list of commands in \r\n" + " \"help \" for help on \r\n" + " \"help \" to get a list of possible help topics\r\n" + " \"quit\" to exit\r\n", + version + ); + sdsfree(version); } -static int cliReadBulkReply(int fd) { - sds replylen = cliReadLine(fd); - char *reply, crlf[2]; - int bulklen; - - if (replylen == NULL) return 1; - bulklen = atoi(replylen); - if (bulklen == -1) { - sdsfree(replylen); - printf("(nil)\n"); - return 0; +/* Output all command help, filtering by group or command name. */ +static void cliOutputHelp(int argc, char **argv) { + int i, j, len; + int group = -1; + helpEntry *entry; + struct commandHelp *help; + + if (argc == 0) { + cliOutputGenericHelp(); + return; + } else if (argc > 0 && argv[0][0] == '@') { + len = sizeof(commandGroups)/sizeof(char*); + for (i = 0; i < len; i++) { + if (strcasecmp(argv[0]+1,commandGroups[i]) == 0) { + group = i; + break; + } + } } - reply = zmalloc(bulklen); - anetRead(fd,reply,bulklen); - anetRead(fd,crlf,2); - if (config.raw_output || !config.tty) { - if (bulklen && fwrite(reply,bulklen,1,stdout) == 0) { - zfree(reply); - return 1; + + assert(argc > 0); + for (i = 0; i < helpEntriesLen; i++) { + entry = &helpEntries[i]; + if (entry->type != CLI_HELP_COMMAND) continue; + + help = entry->org; + if (group == -1) { + /* Compare all arguments */ + if (argc == entry->argc) { + for (j = 0; j < argc; j++) { + if (strcasecmp(argv[j],entry->argv[j]) != 0) break; + } + if (j == argc) { + cliOutputCommandHelp(help,1); + } + } + } else { + if (group == help->group) { + cliOutputCommandHelp(help,0); + } } - } else { - /* If you are producing output for the standard output we want - * a more interesting output with quoted characters and so forth */ - printStringRepr(reply,bulklen); } - zfree(reply); - return 0; + printf("\r\n"); } -static int cliReadMultiBulkReply(int fd) { - sds replylen = cliReadLine(fd); - int elements, c = 1; - int retval = 0; +static void completionCallback(const char *buf, linenoiseCompletions *lc) { + size_t startpos = 0; + int mask; + int i; + size_t matchlen; + sds tmp; - if (replylen == NULL) return 1; - elements = atoi(replylen); - if (elements == -1) { - sdsfree(replylen); - printf("(nil)\n"); - return 0; + if (strncasecmp(buf,"help ",5) == 0) { + startpos = 5; + while (isspace(buf[startpos])) startpos++; + mask = CLI_HELP_COMMAND | CLI_HELP_GROUP; + } else { + mask = CLI_HELP_COMMAND; } - if (elements == 0) { - printf("(empty list or set)\n"); + + for (i = 0; i < helpEntriesLen; i++) { + if (!(helpEntries[i].type & mask)) continue; + + matchlen = strlen(buf+startpos); + if (strncasecmp(buf+startpos,helpEntries[i].full,matchlen) == 0) { + tmp = sdsnewlen(buf,startpos); + tmp = sdscat(tmp,helpEntries[i].full); + linenoiseAddCompletion(lc,tmp); + sdsfree(tmp); + } } - while(elements--) { - if (config.tty) printf("%d. ", c); - if (cliReadReply(fd)) retval = 1; - if (elements) printf("%c",config.mb_sep); - c++; +} + +/*------------------------------------------------------------------------------ + * Networking / parsing + *--------------------------------------------------------------------------- */ + +/* Send AUTH command to the server */ +static int cliAuth() { + redisReply *reply; + if (config.auth == NULL) return REDIS_OK; + + reply = redisCommand(context,"AUTH %s",config.auth); + if (reply != NULL) { + freeReplyObject(reply); + return REDIS_OK; } - return retval; + return REDIS_ERR; +} + +/* Send SELECT dbnum to the server */ +static int cliSelect() { + redisReply *reply; + char dbnum[16]; + if (config.dbnum == 0) return REDIS_OK; + + snprintf(dbnum,sizeof(dbnum),"%d",config.dbnum); + reply = redisCommand(context,"SELECT %s",dbnum); + if (reply != NULL) { + freeReplyObject(reply); + return REDIS_OK; + } + return REDIS_ERR; } -static int cliReadReply(int fd) { - char type; - int nread; +/* Connect to the client. If force is not zero the connection is performed + * even if there is already a connected socket. */ +static int cliConnect(int force) { + if (context == NULL || force) { + if (context != NULL) + redisFree(context); - if ((nread = anetRead(fd,&type,1)) <= 0) { - if (config.shutdown) return 0; - if (config.interactive && - (nread == 0 || (nread == -1 && errno == ECONNRESET))) - { - return ECONNRESET; + if (config.hostsocket == NULL) { + context = redisConnect(config.hostip,config.hostport); } else { - printf("I/O error while reading from socket: %s",strerror(errno)); - exit(1); + context = redisConnectUnix(config.hostsocket); + } + + if (context->err) { + fprintf(stderr,"Could not connect to Redis at "); + if (config.hostsocket == NULL) + fprintf(stderr,"%s:%d: %s\n",config.hostip,config.hostport,context->errstr); + else + fprintf(stderr,"%s: %s\n",config.hostsocket,context->errstr); + redisFree(context); + context = NULL; + return REDIS_ERR; } + + /* Do AUTH and select the right DB. */ + if (cliAuth() != REDIS_OK) + return REDIS_ERR; + if (cliSelect() != REDIS_OK) + return REDIS_ERR; } - switch(type) { - case '-': - if (config.tty) printf("(error) "); - cliReadSingleLineReply(fd,0); - return 1; - case '+': - return cliReadSingleLineReply(fd,0); - case ':': - if (config.tty) printf("(integer) "); - return cliReadSingleLineReply(fd,0); - case '$': - return cliReadBulkReply(fd); - case '*': - return cliReadMultiBulkReply(fd); + return REDIS_OK; +} + +static void cliPrintContextErrorAndExit() { + if (context == NULL) return; + fprintf(stderr,"Error: %s\n",context->errstr); + exit(1); +} + +static sds cliFormatReplyTTY(redisReply *r, char *prefix) { + sds out = sdsempty(); + switch (r->type) { + case REDIS_REPLY_ERROR: + out = sdscatprintf(out,"(error) %s\n", r->str); + break; + case REDIS_REPLY_STATUS: + out = sdscat(out,r->str); + out = sdscat(out,"\n"); + break; + case REDIS_REPLY_INTEGER: + out = sdscatprintf(out,"(integer) %lld\n",r->integer); + break; + case REDIS_REPLY_STRING: + /* If you are producing output for the standard output we want + * a more interesting output with quoted characters and so forth */ + out = sdscatrepr(out,r->str,r->len); + out = sdscat(out,"\n"); + break; + case REDIS_REPLY_NIL: + out = sdscat(out,"(nil)\n"); + break; + case REDIS_REPLY_ARRAY: + if (r->elements == 0) { + out = sdscat(out,"(empty list or set)\n"); + } else { + unsigned int i, idxlen = 0; + char _prefixlen[16]; + char _prefixfmt[16]; + sds _prefix; + sds tmp; + + /* Calculate chars needed to represent the largest index */ + i = r->elements; + do { + idxlen++; + i /= 10; + } while(i); + + /* Prefix for nested multi bulks should grow with idxlen+2 spaces */ + memset(_prefixlen,' ',idxlen+2); + _prefixlen[idxlen+2] = '\0'; + _prefix = sdscat(sdsnew(prefix),_prefixlen); + + /* Setup prefix format for every entry */ + snprintf(_prefixfmt,sizeof(_prefixfmt),"%%s%%%dd) ",idxlen); + + for (i = 0; i < r->elements; i++) { + /* Don't use the prefix for the first element, as the parent + * caller already prepended the index number. */ + out = sdscatprintf(out,_prefixfmt,i == 0 ? "" : prefix,i+1); + + /* Format the multi bulk entry */ + tmp = cliFormatReplyTTY(r->element[i],_prefix); + out = sdscatlen(out,tmp,sdslen(tmp)); + sdsfree(tmp); + } + sdsfree(_prefix); + } + break; default: - printf("protocol error, got '%c' as reply type byte", type); - return 1; + fprintf(stderr,"Unknown reply type: %d\n", r->type); + exit(1); } + return out; } -static int selectDb(int fd) { - int retval; - sds cmd; - char type; - - if (config.dbnum == 0) - return 0; - - cmd = sdsempty(); - cmd = sdscatprintf(cmd,"SELECT %d\r\n",config.dbnum); - anetWrite(fd,cmd,sdslen(cmd)); - anetRead(fd,&type,1); - if (type <= 0 || type != '+') return 1; - retval = cliReadSingleLineReply(fd,1); - if (retval) { - return retval; +static sds cliFormatReplyRaw(redisReply *r) { + sds out = sdsempty(), tmp; + size_t i; + + switch (r->type) { + case REDIS_REPLY_NIL: + /* Nothing... */ + break; + case REDIS_REPLY_ERROR: + case REDIS_REPLY_STATUS: + case REDIS_REPLY_STRING: + out = sdscatlen(out,r->str,r->len); + break; + case REDIS_REPLY_INTEGER: + out = sdscatprintf(out,"%lld",r->integer); + break; + case REDIS_REPLY_ARRAY: + for (i = 0; i < r->elements; i++) { + if (i > 0) out = sdscat(out,config.mb_delim); + tmp = cliFormatReplyRaw(r->element[i]); + out = sdscatlen(out,tmp,sdslen(tmp)); + sdsfree(tmp); + } + break; + default: + fprintf(stderr,"Unknown reply type: %d\n", r->type); + exit(1); } - return 0; + return out; } -static void showInteractiveHelp(void) { - printf( - "\n" - "Welcome to redis-cli " REDIS_VERSION "!\n" - "Just type any valid Redis command to see a pretty printed output.\n" - "\n" - "It is possible to quote strings, like in:\n" - " set \"my key\" \"some string \\xff\\n\"\n" - "\n" - "You can find a list of valid Redis commands at\n" - " http://code.google.com/p/redis/wiki/CommandReference\n" - "\n" - "Note: redis-cli supports line editing, use up/down arrows for history." - "\n\n"); +static int cliReadReply(int output_raw_strings) { + void *_reply; + redisReply *reply; + sds out; + + if (redisGetReply(context,&_reply) != REDIS_OK) { + if (config.shutdown) + return REDIS_OK; + if (config.interactive) { + /* Filter cases where we should reconnect */ + if (context->err == REDIS_ERR_IO && errno == ECONNRESET) + return REDIS_ERR; + if (context->err == REDIS_ERR_EOF) + return REDIS_ERR; + } + cliPrintContextErrorAndExit(); + return REDIS_ERR; /* avoid compiler warning */ + } + + reply = (redisReply*)_reply; + if (output_raw_strings) { + out = cliFormatReplyRaw(reply); + } else { + if (config.raw_output) { + out = cliFormatReplyRaw(reply); + out = sdscat(out,"\n"); + } else { + out = cliFormatReplyTTY(reply,""); + } + } + fwrite(out,sdslen(out),1,stdout); + sdsfree(out); + freeReplyObject(reply); + return REDIS_OK; } static int cliSendCommand(int argc, char **argv, int repeat) { char *command = argv[0]; - int fd, j, retval = 0; - sds cmd; + size_t *argvlen; + int j, output_raw; + + if (context == NULL) { + printf("Not connected, please use: connect \n"); + return REDIS_OK; + } - config.raw_output = !strcasecmp(command,"info"); - if (!strcasecmp(command,"help")) { - showInteractiveHelp(); - return 0; + output_raw = !strcasecmp(command,"info"); + if (!strcasecmp(command,"help") || !strcasecmp(command,"?")) { + cliOutputHelp(--argc, ++argv); + return REDIS_OK; } if (!strcasecmp(command,"shutdown")) config.shutdown = 1; if (!strcasecmp(command,"monitor")) config.monitor_mode = 1; if (!strcasecmp(command,"subscribe") || !strcasecmp(command,"psubscribe")) config.pubsub_mode = 1; - if ((fd = cliConnect(0)) == -1) return 1; - /* Select db number */ - retval = selectDb(fd); - if (retval) { - fprintf(stderr,"Error setting DB num\n"); - return 1; - } - - /* Build the command to send */ - cmd = sdscatprintf(sdsempty(),"*%d\r\n",argc); - for (j = 0; j < argc; j++) { - cmd = sdscatprintf(cmd,"$%lu\r\n", - (unsigned long)sdslen(argv[j])); - cmd = sdscatlen(cmd,argv[j],sdslen(argv[j])); - cmd = sdscatlen(cmd,"\r\n",2); - } + /* Setup argument length */ + argvlen = malloc(argc*sizeof(size_t)); + for (j = 0; j < argc; j++) + argvlen[j] = sdslen(argv[j]); while(repeat--) { - anetWrite(fd,cmd,sdslen(cmd)); + redisAppendCommandArgv(context,argc,(const char**)argv,argvlen); while (config.monitor_mode) { - if (cliReadSingleLineReply(fd,0)) exit(1); - printf("\n"); + if (cliReadReply(output_raw) != REDIS_OK) exit(1); + fflush(stdout); } if (config.pubsub_mode) { - printf("Reading messages... (press Ctrl-c to quit)\n"); + if (!config.raw_output) + printf("Reading messages... (press Ctrl-C to quit)\n"); while (1) { - cliReadReply(fd); - printf("\n\n"); + if (cliReadReply(output_raw) != REDIS_OK) exit(1); } } - retval = cliReadReply(fd); - if (!config.raw_output && config.tty) printf("\n"); - if (retval) return retval; + if (cliReadReply(output_raw) != REDIS_OK) + return REDIS_ERR; } - return 0; + return REDIS_OK; } /*------------------------------------------------------------------------------ @@ -348,20 +506,21 @@ static int parseOptions(int argc, char **argv) { int lastarg = i==argc-1; if (!strcmp(argv[i],"-h") && !lastarg) { - char *ip = zmalloc(32); - if (anetResolve(NULL,argv[i+1],ip) == ANET_ERR) { - printf("Can't resolve %s\n", argv[i]); - exit(1); - } - config.hostip = ip; + sdsfree(config.hostip); + config.hostip = sdsnew(argv[i+1]); i++; } else if (!strcmp(argv[i],"-h") && lastarg) { usage(); + } else if (!strcmp(argv[i],"--help")) { + usage(); } else if (!strcmp(argv[i],"-x")) { config.stdinarg = 1; } else if (!strcmp(argv[i],"-p") && !lastarg) { config.hostport = atoi(argv[i+1]); i++; + } else if (!strcmp(argv[i],"-s") && !lastarg) { + config.hostsocket = argv[i+1]; + i++; } else if (!strcmp(argv[i],"-r") && !lastarg) { config.repeat = strtoll(argv[i+1],NULL,10); i++; @@ -371,19 +530,16 @@ static int parseOptions(int argc, char **argv) { } else if (!strcmp(argv[i],"-a") && !lastarg) { config.auth = argv[i+1]; i++; - } else if (!strcmp(argv[i],"-i")) { - fprintf(stderr, -"Starting interactive mode using -i is deprecated. Interactive mode is started\n" -"by default when redis-cli is executed without a command to execute.\n" - ); - } else if (!strcmp(argv[i],"-c")) { - fprintf(stderr, -"Reading last argument from standard input using -c is deprecated.\n" -"When standard input is connected to a pipe or regular file, it is\n" -"automatically used as last argument.\n" - ); - } else if (!strcmp(argv[i],"-v")) { - printf("redis-cli shipped with Redis version %s\n", REDIS_VERSION); + } else if (!strcmp(argv[i],"--raw")) { + config.raw_output = 1; + } else if (!strcmp(argv[i],"-d") && !lastarg) { + sdsfree(config.mb_delim); + config.mb_delim = sdsnew(argv[i+1]); + i++; + } else if (!strcmp(argv[i],"-v") || !strcmp(argv[i], "--version")) { + sds version = cliVersion(); + printf("redis-cli %s\n", version); + sdsfree(version); exit(0); } else { break; @@ -410,12 +566,33 @@ static sds readArgFromStdin(void) { } static void usage() { - fprintf(stderr, "usage: redis-cli [-iv] [-h host] [-p port] [-a authpw] [-r repeat_times] [-n db_num] cmd arg1 arg2 arg3 ... argN\n"); - fprintf(stderr, "usage: echo \"argN\" | redis-cli -x [options] cmd arg1 arg2 ... arg(N-1)\n\n"); - fprintf(stderr, "example: cat /etc/passwd | redis-cli -x 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 or just don't pass any command\n"); + sds version = cliVersion(); + fprintf(stderr, +"redis-cli %s\n" +"\n" +"Usage: redis-cli [OPTIONS] [cmd [arg [arg ...]]]\n" +" -h Server hostname (default: 127.0.0.1)\n" +" -p Server port (default: 6379)\n" +" -s Server socket (overrides hostname and port)\n" +" -a Password to use when connecting to the server\n" +" -r Execute specified command N times\n" +" -n Database number\n" +" -x Read last argument from STDIN\n" +" -d Multi-bulk delimiter in for raw formatting (default: \\n)\n" +" --raw Use raw formatting for replies (default when STDOUT is not a tty)\n" +" --help Output this help and exit\n" +" --version Output version and exit\n" +"\n" +"Examples:\n" +" cat /etc/passwd | redis-cli -x set mypasswd\n" +" redis-cli get mypasswd\n" +" redis-cli -r 100 lpush mylist x\n" +"\n" +"When no command is given, redis-cli starts in interactive mode.\n" +"Type \"help\" in interactive mode for information on available commands.\n" +"\n", + version); + sdsfree(version); exit(1); } @@ -437,7 +614,9 @@ static void repl() { sds *argv; config.interactive = 1; - while((line = linenoise("redis> ")) != NULL) { + linenoiseSetCompletionCallback(completionCallback); + + while((line = linenoise(context ? "redis> " : "not connected> ")) != NULL) { if (line[0] != '\0') { argv = sdssplitargs(line,&argc); linenoiseHistoryAdd(line); @@ -450,22 +629,28 @@ static void repl() { strcasecmp(argv[0],"exit") == 0) { exit(0); + } else if (argc == 3 && !strcasecmp(argv[0],"connect")) { + sdsfree(config.hostip); + config.hostip = sdsnew(argv[1]); + config.hostport = atoi(argv[2]); + cliConnect(1); + } else if (argc == 1 && !strcasecmp(argv[0],"clear")) { + linenoiseClearScreen(); } else { - int err; long long start_time = mstime(), elapsed; - if ((err = cliSendCommand(argc, argv, 1)) != 0) { - if (err == ECONNRESET) { - printf("Reconnecting... "); - fflush(stdout); - if (cliConnect(1) == -1) exit(1); - printf("OK\n"); - cliSendCommand(argc,argv,1); - } + if (cliSendCommand(argc,argv,1) != REDIS_OK) { + cliConnect(1); + + /* If we still cannot send the command, + * print error and abort. */ + if (cliSendCommand(argc,argv,1) != REDIS_OK) + cliPrintContextErrorAndExit(); } elapsed = mstime()-start_time; - if (elapsed > 500) printf("%.2f seconds\n", - (double)elapsed/1000); + if (elapsed >= 500) { + printf("(%.2fs)\n",(double)elapsed/1000); + } } } /* Free the argument vector */ @@ -495,20 +680,21 @@ static int noninteractive(int argc, char **argv) { int main(int argc, char **argv) { int firstarg; - config.hostip = "127.0.0.1"; + config.hostip = sdsnew("127.0.0.1"); config.hostport = 6379; + config.hostsocket = NULL; config.repeat = 1; config.dbnum = 0; config.interactive = 0; config.shutdown = 0; config.monitor_mode = 0; config.pubsub_mode = 0; - config.raw_output = 0; config.stdinarg = 0; config.auth = NULL; config.historyfile = NULL; - config.tty = isatty(fileno(stdout)) || (getenv("FAKETTY") != NULL); - config.mb_sep = '\n'; + config.raw_output = !isatty(fileno(stdout)) && (getenv("FAKETTY") == NULL); + config.mb_delim = sdsnew("\n"); + cliInitHelp(); if (getenv("HOME") != NULL) { config.historyfile = malloc(256); @@ -520,19 +706,8 @@ int main(int argc, char **argv) { argc -= firstarg; argv += firstarg; - if (config.auth != NULL) { - char *authargv[2]; - int dbnum = config.dbnum; - - /* We need to save the real configured database number and set it to - * zero here, otherwise cliSendCommand() will try to perform the - * SELECT command before the authentication, and it will fail. */ - config.dbnum = 0; - authargv[0] = "AUTH"; - authargv[1] = config.auth; - cliSendCommand(2, convertToSds(2, authargv), 1); - config.dbnum = dbnum; /* restore the right DB number */ - } + /* Try to connect */ + if (cliConnect(0) != REDIS_OK) exit(1); /* Start interactive mode when no command is provided */ if (argc == 0) repl();