fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-06-13 01:01:22 +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
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();