X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/7db723adb22bb98f3c3ca5bf4c35636ee75b25ba..c8c72447f6c9e999a17d37338e9d3460f45722f4:/redis-cli.c diff --git a/redis-cli.c b/redis-cli.c index f34aef83..58c17613 100644 --- a/redis-cli.c +++ b/redis-cli.c @@ -1,6 +1,6 @@ /* Redis CLI (command line interface) * - * Copyright (c) 2006-2009, Salvatore Sanfilippo + * Copyright (c) 2009-2010, Salvatore Sanfilippo * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -42,7 +42,7 @@ #define REDIS_CMD_INLINE 1 #define REDIS_CMD_BULK 2 -#define REDIS_CMD_MULTIBULK 3 +#define REDIS_CMD_MULTIBULK 4 #define REDIS_NOTUSED(V) ((void) V) @@ -63,6 +63,7 @@ static struct redisCommand cmdTable[] = { {"get",2,REDIS_CMD_INLINE}, {"set",3,REDIS_CMD_BULK}, {"setnx",3,REDIS_CMD_BULK}, + {"append",3,REDIS_CMD_BULK}, {"del",-2,REDIS_CMD_INLINE}, {"exists",2,REDIS_CMD_INLINE}, {"incr",2,REDIS_CMD_INLINE}, @@ -71,6 +72,8 @@ static struct redisCommand cmdTable[] = { {"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}, @@ -96,9 +99,10 @@ static struct redisCommand cmdTable[] = { {"zincrby",4,REDIS_CMD_BULK}, {"zrem",3,REDIS_CMD_BULK}, {"zremrangebyscore",4,REDIS_CMD_INLINE}, - {"zrange",4,REDIS_CMD_INLINE}, - {"zrangebyscore",4,REDIS_CMD_INLINE}, - {"zrevrange",4,REDIS_CMD_INLINE}, + {"zrange",-4,REDIS_CMD_INLINE}, + {"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}, @@ -115,6 +119,8 @@ static struct redisCommand cmdTable[] = { {"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}, @@ -130,10 +136,12 @@ static struct redisCommand cmdTable[] = { {"debug",-2,REDIS_CMD_INLINE}, {"mset",-3,REDIS_CMD_MULTIBULK}, {"msetnx",-3,REDIS_CMD_MULTIBULK}, + {"monitor",1,REDIS_CMD_INLINE}, {NULL,0,0} }; static int cliReadReply(int fd); +static void usage(); static struct redisCommand *lookupCommand(char *name) { int j = 0; @@ -183,6 +191,7 @@ static int cliReadSingleLineReply(int fd, int quiet) { if (reply == NULL) return 1; if (!quiet) printf("%s\n", reply); + sdsfree(reply); return 0; } @@ -282,6 +291,7 @@ static int selectDb(int fd) static int cliSendCommand(int argc, char **argv) { struct redisCommand *rc = lookupCommand(argv[0]); int fd, j, retval = 0; + int read_forever = 0; sds cmd; if (!rc) { @@ -294,6 +304,7 @@ static int cliSendCommand(int argc, char **argv) { fprintf(stderr,"Wrong number of arguments for '%s'\n",rc->name); return 1; } + if (!strcasecmp(rc->name,"monitor")) read_forever = 1; if ((fd = cliConnect()) == -1) return 1; /* Select db number */ @@ -309,7 +320,8 @@ static int cliSendCommand(int argc, char **argv) { if (rc->flags & REDIS_CMD_MULTIBULK) { cmd = sdscatprintf(cmd,"*%d\r\n",argc); for (j = 0; j < argc; j++) { - cmd = sdscatprintf(cmd,"$%d\r\n",sdslen(argv[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); } @@ -317,7 +329,8 @@ static int cliSendCommand(int argc, char **argv) { for (j = 0; j < argc; j++) { if (j != 0) cmd = sdscat(cmd," "); if (j == argc-1 && rc->flags & REDIS_CMD_BULK) { - cmd = sdscatprintf(cmd,"%d",sdslen(argv[j])); + cmd = sdscatprintf(cmd,"%lu", + (unsigned long)sdslen(argv[j])); } else { cmd = sdscatlen(cmd,argv[j],sdslen(argv[j])); } @@ -330,6 +343,11 @@ static int cliSendCommand(int argc, char **argv) { } anetWrite(fd,cmd,sdslen(cmd)); sdsfree(cmd); + + while (read_forever) { + cliReadSingleLineReply(fd,0); + } + retval = cliReadReply(fd); if (retval) { close(fd); @@ -354,6 +372,8 @@ static int parseOptions(int argc, char **argv) { } config.hostip = ip; i++; + } else if (!strcmp(argv[i],"-h") && lastarg) { + usage(); } else if (!strcmp(argv[i],"-p") && !lastarg) { config.hostport = atoi(argv[i+1]); i++; @@ -387,6 +407,16 @@ static sds readArgFromStdin(void) { return arg; } +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: 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"); + exit(1); +} + int main(int argc, char **argv) { int firstarg, j; char **argvcopy; @@ -406,15 +436,7 @@ int main(int argc, char **argv) { for(j = 0; j < argc; j++) argvcopy[j] = sdsnew(argv[j]); - if (argc < 1) { - fprintf(stderr, "usage: redis-cli [-h host] [-p port] [-r repeat_times] [-n db_num] 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"); - exit(1); - } + if (argc < 1) usage(); /* Read the last argument from stdandard input if needed */ if ((rc = lookupCommand(argv[0])) != NULL) {