Redis-rb sync

[redis.git] / redis-cli.c

diff --git a/redis-cli.c b/redis-cli.c
index 85652d2c16d56bdffb934b89d5584a098e723127..9acf92dc2f33b815925dbd5cf3ea783bb43591b4 100644 (file)
--- a/redis-cli.c
+++ b/redis-cli.c
@@ -79,6 +79,7 @@ static struct redisCommand cmdTable[] = {
     {"smove",4,REDIS_CMD_BULK},
     {"sismember",3,REDIS_CMD_BULK},
     {"scard",2,REDIS_CMD_INLINE},
+    {"spop",2,REDIS_CMD_INLINE},
     {"sinter",-2,REDIS_CMD_INLINE},
     {"sinterstore",-3,REDIS_CMD_INLINE},
     {"sunion",-2,REDIS_CMD_INLINE},
@@ -110,6 +111,8 @@ static struct redisCommand cmdTable[] = {
     {"mget",-2,REDIS_CMD_INLINE},
     {"expire",3,REDIS_CMD_INLINE},
     {"ttl",2,REDIS_CMD_INLINE},
+    {"slaveof",3,REDIS_CMD_INLINE},
+    {"debug",-2,REDIS_CMD_INLINE},
     {NULL,0,0}
 };
 
@@ -319,6 +322,7 @@ static sds readArgFromStdin(void) {
 int main(int argc, char **argv) {
     int firstarg, j;
     char **argvcopy;
+    struct redisCommand *rc;
 
     config.hostip = "127.0.0.1";
     config.hostport = 6379;
@@ -332,13 +336,6 @@ int main(int argc, char **argv) {
     for(j = 0; j < argc; j++)
         argvcopy[j] = sdsnew(argv[j]);
 
-    /* Read the last argument from stdandard input */
-    if (!isatty(fileno(stdin))) {
-        sds lastarg = readArgFromStdin();
-        argvcopy[argc] = lastarg;
-        argc++;
-    }
-
     if (argc < 1) {
         fprintf(stderr, "usage: redis-cli [-h host] [-p port] cmd arg1 arg2 arg3 ... argN\n");
         fprintf(stderr, "usage: echo \"argN\" | redis-cli [-h host] [-p port] cmd arg1 arg2 ... arg(N-1)\n");
@@ -348,5 +345,14 @@ int main(int argc, char **argv) {
         exit(1);
     }
 
+    /* Read the last argument from stdandard input if needed */
+    if ((rc = lookupCommand(argv[0])) != NULL) {
+        if (rc->arity > 0 && argc == rc->arity-1) {
+            sds lastarg = readArgFromStdin();
+            argvcopy[argc] = lastarg;
+            argc++;
+        }
+    }
+
     return cliSendCommand(argc, argvcopy);
 }