Add SIGTERM shutdown handling.

[redis.git] / redis-cli.c

diff --git a/redis-cli.c b/redis-cli.c
index 22a09e79693d2da1c5473a780a95aee72f2371f1..98e9bdf16bf6b175510a7ae0437489546d7e6b2a 100644 (file)
--- a/redis-cli.c
+++ b/redis-cli.c
@@ -112,8 +112,8 @@ static struct redisCommand cmdTable[] = {
     {"zincrby",4,CMDFLAG_NONE},
     {"zrem",3,CMDFLAG_NONE},
     {"zremrangebyscore",4,CMDFLAG_NONE},
-    {"zmerge",-3,CMDFLAG_NONE},
-    {"zmergeweighed",-4,CMDFLAG_NONE},
+    {"zunion",-4,CMDFLAG_NONE},
+    {"zinter",-4,CMDFLAG_NONE},
     {"zrange",-4,CMDFLAG_NONE},
     {"zrank",3,CMDFLAG_NONE},
     {"zrevrank",3,CMDFLAG_NONE},
@@ -359,11 +359,11 @@ static int cliSendCommand(int argc, char **argv, int repeat) {
     int fd, j, retval = 0;
     sds cmd;
 
-    config.raw_output = (rc->flags & CMDFLAG_RAWOUTPUT);
     if (!rc) {
         fprintf(stderr,"Unknown command '%s'\n",argv[0]);
         return 1;
     }
+    config.raw_output = (rc->flags & CMDFLAG_RAWOUTPUT);
 
     if ((rc->arity > 0 && argc != rc->arity) ||
         (rc->arity < 0 && argc < -rc->arity)) {