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

redis-cli does no longer try to auto detect if it is used inside a pipe. To read last argument from stdandard input there is to use the -x option. This will make it playing better inside cron scripts and in general when stdin is hacked.

Browse Source
This commit is contained in:
antirez 2010-09-09 16:38:10 +02:00
parent 7f9a4db3c0
commit bc63407be6
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/redis-cli.c
View File

@ -62,6 +62,7 @@ static struct config {
int pubsub_mode; int pubsub_mode;
int raw_output; /* output mode per command */ int raw_output; /* output mode per command */
int tty; /* flag for default output format */ int tty; /* flag for default output format */
int stdinarg; /* get last arg from stdin. (-x option) */
char mb_sep; char mb_sep;
char *auth; char *auth;
char *historyfile; char *historyfile;
@ -337,6 +338,8 @@ static int parseOptions(int argc, char **argv) {
i++; i++;
} else if (!strcmp(argv[i],"-h") && lastarg) { } else if (!strcmp(argv[i],"-h") && lastarg) {
usage(); usage();
} else if (!strcmp(argv[i],"-x")) {
config.stdinarg = 1;
} 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++;
@ -389,9 +392,8 @@ static sds readArgFromStdin(void) {
static void usage() { static void usage() {
fprintf(stderr, "usage: redis-cli [-iv] [-h host] [-p port] [-a authpw] [-r repeat_times] [-n db_num] cmd arg1 arg2 arg3 ... argN\n"); fprintf(stderr, "usage: redis-cli [-iv] [-h host] [-p port] [-a authpw] [-r repeat_times] [-n db_num] cmd arg1 arg2 arg3 ... argN\n");
fprintf(stderr, "usage: echo \"argN\" | redis-cli [-h host] [-p port] [-a authpw] [-r repeat_times] [-n db_num] cmd arg1 arg2 ... arg(N-1)\n"); fprintf(stderr, "usage: echo \"argN\" | redis-cli -x [options] cmd arg1 arg2 ... arg(N-1)\n\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 -x set my_passwd\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 get my_passwd\n");
fprintf(stderr, "example: redis-cli -r 100 lpush mylist x\n"); fprintf(stderr, "example: redis-cli -r 100 lpush mylist x\n");
fprintf(stderr, "\nRun in interactive mode: redis-cli -i or just don't pass any command\n"); fprintf(stderr, "\nRun in interactive mode: redis-cli -i or just don't pass any command\n");
@ -456,9 +458,7 @@ static void repl() {
static int noninteractive(int argc, char **argv) { static int noninteractive(int argc, char **argv) {
int retval = 0; int retval = 0;
struct stat s; if (config.stdinarg) {
fstat(fileno(stdin), &s);
if (S_ISFIFO(s.st_mode) || S_ISREG(s.st_mode)) { /* pipe, regular file */
argv = zrealloc(argv, (argc+1)*sizeof(char*)); argv = zrealloc(argv, (argc+1)*sizeof(char*));
argv[argc] = readArgFromStdin(); argv[argc] = readArgFromStdin();
retval = cliSendCommand(argc+1, argv, config.repeat); retval = cliSendCommand(argc+1, argv, config.repeat);
@ -481,6 +481,7 @@ int main(int argc, char **argv) {
config.monitor_mode = 0; config.monitor_mode = 0;
config.pubsub_mode = 0; config.pubsub_mode = 0;
config.raw_output = 0; config.raw_output = 0;
config.stdinarg = 0;
config.auth = NULL; config.auth = NULL;
config.historyfile = NULL; config.historyfile = NULL;
config.tty = isatty(fileno(stdout)) || (getenv("FAKETTY") != NULL); config.tty = isatty(fileno(stdout)) || (getenv("FAKETTY") != NULL);