X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/249c3a7dd1473d32d8b02830e7beb0625a51ff9b..8632fb30401ccc6824b84499602fba7052cc3346:/redis-cli.c diff --git a/redis-cli.c b/redis-cli.c index d6520bf9..2daa7c46 100644 --- a/redis-cli.c +++ b/redis-cli.c @@ -53,138 +53,18 @@ static struct config { int hostport; long repeat; int dbnum; + int argn_from_stdin; int interactive; + int shutdown; int monitor_mode; int pubsub_mode; + int raw_output; char *auth; } config; -struct redisCommand { - char *name; - int arity; - int flags; -}; - -static struct redisCommand cmdTable[] = { - {"auth",2,REDIS_CMD_INLINE}, - {"get",2,REDIS_CMD_INLINE}, - {"set",3,REDIS_CMD_BULK}, - {"setnx",3,REDIS_CMD_BULK}, - {"setex",4,REDIS_CMD_BULK}, - {"append",3,REDIS_CMD_BULK}, - {"substr",4,REDIS_CMD_INLINE}, - {"del",-2,REDIS_CMD_INLINE}, - {"exists",2,REDIS_CMD_INLINE}, - {"incr",2,REDIS_CMD_INLINE}, - {"decr",2,REDIS_CMD_INLINE}, - {"rpush",3,REDIS_CMD_BULK}, - {"lpush",3,REDIS_CMD_BULK}, - {"rpop",2,REDIS_CMD_INLINE}, - {"lpop",2,REDIS_CMD_INLINE}, - {"brpop",-3,REDIS_CMD_INLINE}, - {"blpop",-3,REDIS_CMD_INLINE}, - {"llen",2,REDIS_CMD_INLINE}, - {"lindex",3,REDIS_CMD_INLINE}, - {"lset",4,REDIS_CMD_BULK}, - {"lrange",4,REDIS_CMD_INLINE}, - {"ltrim",4,REDIS_CMD_INLINE}, - {"lrem",4,REDIS_CMD_BULK}, - {"rpoplpush",3,REDIS_CMD_BULK}, - {"sadd",3,REDIS_CMD_BULK}, - {"srem",3,REDIS_CMD_BULK}, - {"smove",4,REDIS_CMD_BULK}, - {"sismember",3,REDIS_CMD_BULK}, - {"scard",2,REDIS_CMD_INLINE}, - {"spop",2,REDIS_CMD_INLINE}, - {"srandmember",2,REDIS_CMD_INLINE}, - {"sinter",-2,REDIS_CMD_INLINE}, - {"sinterstore",-3,REDIS_CMD_INLINE}, - {"sunion",-2,REDIS_CMD_INLINE}, - {"sunionstore",-3,REDIS_CMD_INLINE}, - {"sdiff",-2,REDIS_CMD_INLINE}, - {"sdiffstore",-3,REDIS_CMD_INLINE}, - {"smembers",2,REDIS_CMD_INLINE}, - {"zadd",4,REDIS_CMD_BULK}, - {"zincrby",4,REDIS_CMD_BULK}, - {"zrem",3,REDIS_CMD_BULK}, - {"zremrangebyscore",4,REDIS_CMD_INLINE}, - {"zmerge",-3,REDIS_CMD_INLINE}, - {"zmergeweighed",-4,REDIS_CMD_INLINE}, - {"zrange",-4,REDIS_CMD_INLINE}, - {"zrank",3,REDIS_CMD_BULK}, - {"zrevrank",3,REDIS_CMD_BULK}, - {"zrangebyscore",-4,REDIS_CMD_INLINE}, - {"zcount",4,REDIS_CMD_INLINE}, - {"zrevrange",-4,REDIS_CMD_INLINE}, - {"zcard",2,REDIS_CMD_INLINE}, - {"zscore",3,REDIS_CMD_BULK}, - {"incrby",3,REDIS_CMD_INLINE}, - {"decrby",3,REDIS_CMD_INLINE}, - {"getset",3,REDIS_CMD_BULK}, - {"randomkey",1,REDIS_CMD_INLINE}, - {"select",2,REDIS_CMD_INLINE}, - {"move",3,REDIS_CMD_INLINE}, - {"rename",3,REDIS_CMD_INLINE}, - {"renamenx",3,REDIS_CMD_INLINE}, - {"keys",2,REDIS_CMD_INLINE}, - {"dbsize",1,REDIS_CMD_INLINE}, - {"ping",1,REDIS_CMD_INLINE}, - {"echo",2,REDIS_CMD_BULK}, - {"save",1,REDIS_CMD_INLINE}, - {"bgsave",1,REDIS_CMD_INLINE}, - {"rewriteaof",1,REDIS_CMD_INLINE}, - {"bgrewriteaof",1,REDIS_CMD_INLINE}, - {"shutdown",1,REDIS_CMD_INLINE}, - {"lastsave",1,REDIS_CMD_INLINE}, - {"type",2,REDIS_CMD_INLINE}, - {"flushdb",1,REDIS_CMD_INLINE}, - {"flushall",1,REDIS_CMD_INLINE}, - {"sort",-2,REDIS_CMD_INLINE}, - {"info",1,REDIS_CMD_INLINE}, - {"mget",-2,REDIS_CMD_INLINE}, - {"expire",3,REDIS_CMD_INLINE}, - {"expireat",3,REDIS_CMD_INLINE}, - {"ttl",2,REDIS_CMD_INLINE}, - {"slaveof",3,REDIS_CMD_INLINE}, - {"debug",-2,REDIS_CMD_INLINE}, - {"mset",-3,REDIS_CMD_MULTIBULK}, - {"msetnx",-3,REDIS_CMD_MULTIBULK}, - {"monitor",1,REDIS_CMD_INLINE}, - {"multi",1,REDIS_CMD_INLINE}, - {"exec",1,REDIS_CMD_INLINE}, - {"discard",1,REDIS_CMD_INLINE}, - {"hset",4,REDIS_CMD_MULTIBULK}, - {"hget",3,REDIS_CMD_BULK}, - {"hmset",-4,REDIS_CMD_MULTIBULK}, - {"hmget",-3,REDIS_CMD_MULTIBULK}, - {"hincrby",4,REDIS_CMD_INLINE}, - {"hdel",3,REDIS_CMD_BULK}, - {"hlen",2,REDIS_CMD_INLINE}, - {"hkeys",2,REDIS_CMD_INLINE}, - {"hvals",2,REDIS_CMD_INLINE}, - {"hgetall",2,REDIS_CMD_INLINE}, - {"hexists",3,REDIS_CMD_BULK}, - {"config",-2,REDIS_CMD_BULK}, - {"subscribe",-2,REDIS_CMD_INLINE}, - {"unsubscribe",-1,REDIS_CMD_INLINE}, - {"psubscribe",-2,REDIS_CMD_INLINE}, - {"punsubscribe",-1,REDIS_CMD_INLINE}, - {"publish",3,REDIS_CMD_BULK}, - {NULL,0,0} -}; - static int cliReadReply(int fd); static void usage(); -static struct redisCommand *lookupCommand(char *name) { - int j = 0; - while(cmdTable[j].name != NULL) { - if (!strcasecmp(name,cmdTable[j].name)) return &cmdTable[j]; - j++; - } - return NULL; -} - static int cliConnect(void) { char err[ANET_ERR_LEN]; static int fd = ANET_ERR; @@ -270,7 +150,7 @@ static int cliReadBulkReply(int fd) { reply = zmalloc(bulklen); anetRead(fd,reply,bulklen); anetRead(fd,crlf,2); - if (!isatty(fileno(stdout))) { + if (config.raw_output || !isatty(fileno(stdout))) { if (bulklen && fwrite(reply,bulklen,1,stdout) == 0) { zfree(reply); return 1; @@ -309,7 +189,10 @@ static int cliReadMultiBulkReply(int fd) { static int cliReadReply(int fd) { char type; - if (anetRead(fd,&type,1) <= 0) exit(1); + if (anetRead(fd,&type,1) <= 0) { + if (config.shutdown) return 0; + exit(1); + } switch(type) { case '-': printf("(error) "); @@ -351,23 +234,15 @@ static int selectDb(int fd) { } static int cliSendCommand(int argc, char **argv, int repeat) { - struct redisCommand *rc = lookupCommand(argv[0]); + char *command = argv[0]; int fd, j, retval = 0; sds cmd; - if (!rc) { - fprintf(stderr,"Unknown command '%s'\n",argv[0]); - return 1; - } - - if ((rc->arity > 0 && argc != rc->arity) || - (rc->arity < 0 && argc < -rc->arity)) { - fprintf(stderr,"Wrong number of arguments for '%s'\n",rc->name); - return 1; - } - if (!strcasecmp(rc->name,"monitor")) config.monitor_mode = 1; - if (!strcasecmp(rc->name,"subscribe") || - !strcasecmp(rc->name,"psubscribe")) config.pubsub_mode = 1; + config.raw_output = !strcasecmp(command,"info"); + 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()) == -1) return 1; /* Select db number */ @@ -377,36 +252,17 @@ static int cliSendCommand(int argc, char **argv, int repeat) { 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); + } + while(repeat--) { - /* Build the command to send */ - cmd = sdsempty(); - if (rc->flags & REDIS_CMD_MULTIBULK) { - cmd = sdscatprintf(cmd,"*%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); - } - } else { - for (j = 0; j < argc; j++) { - if (j != 0) cmd = sdscat(cmd," "); - if (j == argc-1 && rc->flags & REDIS_CMD_BULK) { - cmd = sdscatprintf(cmd,"%lu", - (unsigned long)sdslen(argv[j])); - } else { - cmd = sdscatlen(cmd,argv[j],sdslen(argv[j])); - } - } - cmd = sdscat(cmd,"\r\n"); - if (rc->flags & REDIS_CMD_BULK) { - cmd = sdscatlen(cmd,argv[argc-1],sdslen(argv[argc-1])); - cmd = sdscatlen(cmd,"\r\n",2); - } - } anetWrite(fd,cmd,sdslen(cmd)); - sdsfree(cmd); - while (config.monitor_mode) { cliReadSingleLineReply(fd,0); } @@ -457,6 +313,8 @@ static int parseOptions(int argc, char **argv) { i++; } else if (!strcmp(argv[i],"-i")) { config.interactive = 1; + } else if (!strcmp(argv[i],"-c")) { + config.argn_from_stdin = 1; } else { break; } @@ -483,7 +341,7 @@ static sds readArgFromStdin(void) { static void usage() { fprintf(stderr, "usage: redis-cli [-h host] [-p port] [-a authpw] [-r repeat_times] [-n db_num] [-i] cmd arg1 arg2 arg3 ... argN\n"); - fprintf(stderr, "usage: echo \"argN\" | redis-cli [-h host] [-a authpw] [-p port] [-r repeat_times] [-n db_num] cmd arg1 arg2 ... arg(N-1)\n"); + fprintf(stderr, "usage: echo \"argN\" | redis-cli -c [-h host] [-p port] [-a authpw] [-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"); @@ -495,7 +353,7 @@ static void usage() { /* Turn the plain C strings into Sds strings */ static char **convertToSds(int count, char** args) { int j; - char **sds = zmalloc(sizeof(char*)*count+1); + char **sds = zmalloc(sizeof(char*)*count); for(j = 0; j < count; j++) sds[j] = sdsnew(args[j]); @@ -587,7 +445,7 @@ static void repl() { /* Free the argument vector */ for (j = 0; j < argc; j++) sdsfree(argv[j]); - free(argv); + zfree(argv); } /* linenoise() returns malloc-ed lines like readline() */ free(line); @@ -598,15 +456,17 @@ static void repl() { int main(int argc, char **argv) { int firstarg; char **argvcopy; - struct redisCommand *rc; config.hostip = "127.0.0.1"; config.hostport = 6379; config.repeat = 1; config.dbnum = 0; + config.argn_from_stdin = 0; + config.shutdown = 0; config.interactive = 0; config.monitor_mode = 0; config.pubsub_mode = 0; + config.raw_output = 0; config.auth = NULL; firstarg = parseOptions(argc,argv); @@ -623,16 +483,11 @@ int main(int argc, char **argv) { if (argc == 0 || config.interactive == 1) repl(); - 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) { + argvcopy = convertToSds(argc+1, argv); + if (config.argn_from_stdin) { sds lastarg = readArgFromStdin(); argvcopy[argc] = lastarg; argc++; - } } - return cliSendCommand(argc, argvcopy, config.repeat); }