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

Let the output mode depend on having a tty or not

Browse Source
This commit is contained in:
Pieter Noordhuis 2010-08-04 17:16:05 +02:00
parent 07242c0ccf
commit 123a10f7a5
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/redis-cli.c
View File

@ -60,6 +60,7 @@ static struct config {
int monitor_mode;
int pubsub_mode;
int raw_output; /* output mode per command */
int tty; /* flag for default output format */
char *auth;
char *historyfile;
} config;
@ -152,7 +153,7 @@ static int cliReadBulkReply(int fd) {
reply = zmalloc(bulklen);
anetRead(fd,reply,bulklen);
anetRead(fd,crlf,2);
if (config.raw_output) {
if (config.raw_output || !config.tty) {
if (bulklen && fwrite(reply,bulklen,1,stdout) == 0) {
zfree(reply);
return 1;
@ -491,6 +492,7 @@ int main(int argc, char **argv) {
config.raw_output = 0;
config.auth = NULL;
config.historyfile = NULL;
config.tty = 1;
if (getenv("HOME") != NULL) {
config.historyfile = malloc(256);
@ -515,6 +517,7 @@ int main(int argc, char **argv) {
repl();
}
config.tty = isatty(stdout) || (getenv("FAKETTY") != NULL);
argvcopy = convertToSds(argc+1, argv);
if (config.argn_from_stdin) {
sds lastarg = readArgFromStdin();

33
tests/integration/redis-cli.tcl
View File

@ -41,7 +41,7 @@ start_server {tags {"cli"}} {
close_cli $fd
}
proc run_cli {args} {
proc run_nontty_cli {args} {
set fd [open [format "|src/redis-cli -p %d -n 9 $args" [srv port]] "r"]
fconfigure $fd -buffering none
fconfigure $fd -translation binary
@ -50,8 +50,19 @@ start_server {tags {"cli"}} {
set _ $resp
}
proc test_noninteractive_cli {name code} {
test "Non-interactive CLI: $name" $code
proc test_nontty_cli {name code} {
test "Non-interactive non-TTY CLI: $name" $code
}
proc run_tty_cli {args} {
set ::env(FAKETTY) 1
set resp [run_nontty_cli {*}$args]
unset ::env(FAKETTY)
set _ $resp
}
proc test_tty_cli {name code} {
test "Non-interactive TTY CLI: $name" $code
}
test_interactive_cli "INFO response should be printed raw" {
@ -99,25 +110,25 @@ start_server {tags {"cli"}} {
assert_equal "bar" [r get key]
}
test_noninteractive_cli "Status reply" {
assert_equal "OK\n" [run_cli set key bar]
test_tty_cli "Status reply" {
assert_equal "OK\n" [run_tty_cli set key bar]
assert_equal "bar" [r get key]
}
test_noninteractive_cli "Integer reply" {
test_tty_cli "Integer reply" {
r del counter
assert_equal "(integer) 1\n" [run_cli incr counter]
assert_equal "(integer) 1\n" [run_tty_cli incr counter]
}
test_noninteractive_cli "Bulk reply" {
test_tty_cli "Bulk reply" {
r set key "tab\tnewline\n"
assert_equal "\"tab\\tnewline\\n\"\n" [run_cli get key]
assert_equal "\"tab\\tnewline\\n\"\n" [run_tty_cli get key]
}
test_noninteractive_cli "Multi-bulk reply" {
test_tty_cli "Multi-bulk reply" {
r del list
r rpush list foo
r rpush list bar
assert_equal "1. \"foo\"\n2. \"bar\"\n" [run_cli lrange list 0 -1]
assert_equal "1. \"foo\"\n2. \"bar\"\n" [run_tty_cli lrange list 0 -1]
}
}