int interactive;
int monitor_mode;
int pubsub_mode;
+ int raw_output;
char *auth;
} config;
int flags;
};
+#define CMDFLAG_NONE 0
+#define CMDFLAG_RAWOUTPUT 1
+
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}
+ {"auth",2,CMDFLAG_NONE},
+ {"get",2,CMDFLAG_NONE},
+ {"set",3,CMDFLAG_NONE},
+ {"setnx",3,CMDFLAG_NONE},
+ {"setex",4,CMDFLAG_NONE},
+ {"append",3,CMDFLAG_NONE},
+ {"substr",4,CMDFLAG_NONE},
+ {"del",-2,CMDFLAG_NONE},
+ {"exists",2,CMDFLAG_NONE},
+ {"incr",2,CMDFLAG_NONE},
+ {"decr",2,CMDFLAG_NONE},
+ {"rpush",3,CMDFLAG_NONE},
+ {"lpush",3,CMDFLAG_NONE},
+ {"rpop",2,CMDFLAG_NONE},
+ {"lpop",2,CMDFLAG_NONE},
+ {"brpop",-3,CMDFLAG_NONE},
+ {"blpop",-3,CMDFLAG_NONE},
+ {"llen",2,CMDFLAG_NONE},
+ {"lindex",3,CMDFLAG_NONE},
+ {"lset",4,CMDFLAG_NONE},
+ {"lrange",4,CMDFLAG_NONE},
+ {"ltrim",4,CMDFLAG_NONE},
+ {"lrem",4,CMDFLAG_NONE},
+ {"rpoplpush",3,CMDFLAG_NONE},
+ {"sadd",3,CMDFLAG_NONE},
+ {"srem",3,CMDFLAG_NONE},
+ {"smove",4,CMDFLAG_NONE},
+ {"sismember",3,CMDFLAG_NONE},
+ {"scard",2,CMDFLAG_NONE},
+ {"spop",2,CMDFLAG_NONE},
+ {"srandmember",2,CMDFLAG_NONE},
+ {"sinter",-2,CMDFLAG_NONE},
+ {"sinterstore",-3,CMDFLAG_NONE},
+ {"sunion",-2,CMDFLAG_NONE},
+ {"sunionstore",-3,CMDFLAG_NONE},
+ {"sdiff",-2,CMDFLAG_NONE},
+ {"sdiffstore",-3,CMDFLAG_NONE},
+ {"smembers",2,CMDFLAG_NONE},
+ {"zadd",4,CMDFLAG_NONE},
+ {"zincrby",4,CMDFLAG_NONE},
+ {"zrem",3,CMDFLAG_NONE},
+ {"zremrangebyscore",4,CMDFLAG_NONE},
+ {"zunion",-4,CMDFLAG_NONE},
+ {"zinter",-4,CMDFLAG_NONE},
+ {"zrange",-4,CMDFLAG_NONE},
+ {"zrank",3,CMDFLAG_NONE},
+ {"zrevrank",3,CMDFLAG_NONE},
+ {"zrangebyscore",-4,CMDFLAG_NONE},
+ {"zcount",4,CMDFLAG_NONE},
+ {"zrevrange",-4,CMDFLAG_NONE},
+ {"zcard",2,CMDFLAG_NONE},
+ {"zscore",3,CMDFLAG_NONE},
+ {"incrby",3,CMDFLAG_NONE},
+ {"decrby",3,CMDFLAG_NONE},
+ {"getset",3,CMDFLAG_NONE},
+ {"randomkey",1,CMDFLAG_NONE},
+ {"select",2,CMDFLAG_NONE},
+ {"move",3,CMDFLAG_NONE},
+ {"rename",3,CMDFLAG_NONE},
+ {"renamenx",3,CMDFLAG_NONE},
+ {"keys",2,CMDFLAG_NONE},
+ {"dbsize",1,CMDFLAG_NONE},
+ {"ping",1,CMDFLAG_NONE},
+ {"echo",2,CMDFLAG_NONE},
+ {"save",1,CMDFLAG_NONE},
+ {"bgsave",1,CMDFLAG_NONE},
+ {"rewriteaof",1,CMDFLAG_NONE},
+ {"bgrewriteaof",1,CMDFLAG_NONE},
+ {"shutdown",1,CMDFLAG_NONE},
+ {"lastsave",1,CMDFLAG_NONE},
+ {"type",2,CMDFLAG_NONE},
+ {"flushdb",1,CMDFLAG_NONE},
+ {"flushall",1,CMDFLAG_NONE},
+ {"sort",-2,CMDFLAG_NONE},
+ {"info",1,CMDFLAG_RAWOUTPUT},
+ {"mget",-2,CMDFLAG_NONE},
+ {"expire",3,CMDFLAG_NONE},
+ {"expireat",3,CMDFLAG_NONE},
+ {"ttl",2,CMDFLAG_NONE},
+ {"slaveof",3,CMDFLAG_NONE},
+ {"debug",-2,CMDFLAG_NONE},
+ {"mset",-3,CMDFLAG_NONE},
+ {"msetnx",-3,CMDFLAG_NONE},
+ {"monitor",1,CMDFLAG_NONE},
+ {"multi",1,CMDFLAG_NONE},
+ {"exec",1,CMDFLAG_NONE},
+ {"discard",1,CMDFLAG_NONE},
+ {"hset",4,CMDFLAG_NONE},
+ {"hget",3,CMDFLAG_NONE},
+ {"hmset",-4,CMDFLAG_NONE},
+ {"hmget",-3,CMDFLAG_NONE},
+ {"hincrby",4,CMDFLAG_NONE},
+ {"hdel",3,CMDFLAG_NONE},
+ {"hlen",2,CMDFLAG_NONE},
+ {"hkeys",2,CMDFLAG_NONE},
+ {"hvals",2,CMDFLAG_NONE},
+ {"hgetall",2,CMDFLAG_NONE},
+ {"hexists",3,CMDFLAG_NONE},
+ {"config",-2,CMDFLAG_NONE},
+ {"subscribe",-2,CMDFLAG_NONE},
+ {"unsubscribe",-1,CMDFLAG_NONE},
+ {"psubscribe",-2,CMDFLAG_NONE},
+ {"punsubscribe",-1,CMDFLAG_NONE},
+ {"publish",3,CMDFLAG_NONE},
+ {NULL,0,CMDFLAG_NONE}
};
static int cliReadReply(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;
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)) {
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);
- }
+ 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);
}
anetWrite(fd,cmd,sdslen(cmd));
sdsfree(cmd);
/* 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);
config.interactive = 0;
config.monitor_mode = 0;
config.pubsub_mode = 0;
+ config.raw_output = 0;
config.auth = NULL;
firstarg = parseOptions(argc,argv);
projects / redis.git / blobdiff