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

Add a newline to tty output after every reply

Browse Source
This commit is contained in:
Pieter Noordhuis 2010-08-25 13:39:11 +02:00
parent 5d15b5207d
commit ae77016e57
2 changed files with 5 additions and 7 deletions
src
redis-cli.c
tests/integration
redis-cli.tcl

10
src/redis-cli.c

@ -226,7 +226,7 @@ static int cliReadReply(int fd) {
case '*': case '*':
return cliReadMultiBulkReply(fd); return cliReadMultiBulkReply(fd);
default: default:
printf("protocol error, got '%c' as reply type byte\n", type); printf("protocol error, got '%c' as reply type byte", type);
return 1; return 1;
} }
} }
@ -294,12 +294,8 @@ static int cliSendCommand(int argc, char **argv, int repeat) {
} }
retval = cliReadReply(fd); retval = cliReadReply(fd);
if (retval) { if (!config.raw_output && config.tty) printf("\n");
return retval; if (retval) return retval;
}
if (!config.raw_output && config.tty) {
printf("\n");
}
} }
return 0; return 0;
} }

2
tests/integration/redis-cli.tcl

@ -36,9 +36,11 @@ start_server {tags {"cli"}} {
} }
proc test_interactive_cli {name code} { proc test_interactive_cli {name code} {
set ::env(FAKETTY) 1
set fd [open_cli] set fd [open_cli]
test "Interactive CLI: $name" $code test "Interactive CLI: $name" $code
close_cli $fd close_cli $fd
unset ::env(FAKETTY)
} }
proc run_nontty_cli {args} { proc run_nontty_cli {args} {