caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-22 16:18:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Issue with redis-client used in scripts solved, now to check if the latest argument must come from standard input we do not check that stdin is or not a tty but the command arity

Browse Source
This commit is contained in:
antirez 2009-05-24 09:15:40 +02:00
parent 4d30232b04
commit 2073a849df
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
redis-cli.c
View File

@ -320,6 +320,7 @@ static sds readArgFromStdin(void) {
int main(int argc, char **argv) { int main(int argc, char **argv) {
int firstarg, j; int firstarg, j;
char **argvcopy; char **argvcopy;
struct redisCommand *rc;
config.hostip = "127.0.0.1"; config.hostip = "127.0.0.1";
config.hostport = 6379; config.hostport = 6379;
@ -333,13 +334,6 @@ 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]);
/* Read the last argument from stdandard input */
if (!isatty(fileno(stdin))) {
sds lastarg = readArgFromStdin();
argvcopy[argc] = lastarg;
argc++;
}
if (argc < 1) { if (argc < 1) {
fprintf(stderr, "usage: redis-cli [-h host] [-p port] cmd arg1 arg2 arg3 ... argN\n"); 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"); fprintf(stderr, "usage: echo \"argN\" | redis-cli [-h host] [-p port] cmd arg1 arg2 ... arg(N-1)\n");
@ -349,5 +343,14 @@ int main(int argc, char **argv) {
exit(1); 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); return cliSendCommand(argc, argvcopy);
} }