fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 17:10:50 +00:00
Code Issues Projects Releases Wiki Activity

now redis-cli understands -h

Browse Source
This commit is contained in:
antirez 2010-01-15 16:42:29 -05:00
parent 6fa987e390
commit a9158272c6
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
redis-cli.c
View File

@ -138,6 +138,7 @@ static struct redisCommand cmdTable[] = {
}; };
static int cliReadReply(int fd); static int cliReadReply(int fd);
static void usage();
static struct redisCommand *lookupCommand(char *name) { static struct redisCommand *lookupCommand(char *name) {
int j = 0; int j = 0;
@ -360,6 +361,8 @@ static int parseOptions(int argc, char **argv) {
} }
config.hostip = ip; config.hostip = ip;
i++; i++;
} else if (!strcmp(argv[i],"-h") && lastarg) {
usage();
} else if (!strcmp(argv[i],"-p") && !lastarg) { } else if (!strcmp(argv[i],"-p") && !lastarg) {
config.hostport = atoi(argv[i+1]); config.hostport = atoi(argv[i+1]);
i++; i++;
@ -393,6 +396,16 @@ static sds readArgFromStdin(void) {
return arg; 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 main(int argc, char **argv) {
int firstarg, j; int firstarg, j;
char **argvcopy; char **argvcopy;
@ -412,15 +425,7 @@ int main(int argc, char **argv) {
for(j = 0; j < argc; j++) for(j = 0; j < argc; j++)
argvcopy[j] = sdsnew(argv[j]); argvcopy[j] = sdsnew(argv[j]);
if (argc < 1) { if (argc < 1) 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);
}
/* Read the last argument from stdandard input if needed */ /* Read the last argument from stdandard input if needed */
if ((rc = lookupCommand(argv[0])) != NULL) { if ((rc = lookupCommand(argv[0])) != NULL) {