X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/aab055ae1f3a4900db2983490236c9e5fb3af0eb..c651fd9ee3ce3d1dca7cc8dbf7648cd588255bd9:/redis-cli.c diff --git a/redis-cli.c b/redis-cli.c index 502d8527..b34c4277 100644 --- a/redis-cli.c +++ b/redis-cli.c @@ -39,6 +39,7 @@ #include "sds.h" #include "adlist.h" #include "zmalloc.h" +#include "linenoise.h" #define REDIS_CMD_INLINE 1 #define REDIS_CMD_BULK 2 @@ -150,12 +151,19 @@ static struct redisCommand cmdTable[] = { {"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}, + {"publish",3,REDIS_CMD_BULK}, {NULL,0,0} }; @@ -451,39 +459,30 @@ static char **convertToSds(int count, char** args) { return sds; } -static char *prompt(char *line, int size) { - char *retval; - - do { - printf(">> "); - retval = fgets(line, size, stdin); - } while (retval && *line == '\n'); - line[strlen(line) - 1] = '\0'; - - return retval; -} - static void repl() { int size = 4096, max = size >> 1, argc; - char buffer[size]; - char *line = buffer; + char *line; char **ap, *args[max]; - while (prompt(line, size)) { - argc = 0; - - for (ap = args; (*ap = strsep(&line, " \t")) != NULL;) { - if (**ap != '\0') { - if (argc >= max) break; - if (strcasecmp(*ap,"quit") == 0 || strcasecmp(*ap,"exit") == 0) - exit(0); - ap++; - argc++; - } + while((line = linenoise("redis> ")) != NULL) { + if (line[0] != '\0') { + linenoiseHistoryAdd(line); + argc = 0; + + for (ap = args; (*ap = strsep(&line, " \t")) != NULL;) { + if (**ap != '\0') { + if (argc >= max) break; + if (strcasecmp(*ap,"quit") == 0 || strcasecmp(*ap,"exit") == 0) + exit(0); + ap++; + argc++; + } + } + + cliSendCommand(argc, convertToSds(argc, args), 1); } - cliSendCommand(argc, convertToSds(argc, args), 1); - line = buffer; + free(line); } exit(0);