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

redis-cli now is able to also output the string representation instead of the raw string. Much better for debugging

Browse Source
This commit is contained in:
antirez 2010-04-26 18:54:55 +02:00
parent a88a2af6c5
commit 21cdc9f064
1 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
redis-cli.c
View File

@ -226,6 +226,31 @@ static int cliReadSingleLineReply(int fd, int quiet) {
return 0; return 0;
} }
static void printStringRepr(char *s, int len) {
printf("\"");
while(len--) {
switch(*s) {
case '\\':
case '"':
printf("\\%c",*s);
break;
case '\n': printf("\\n"); break;
case '\r': printf("\\r"); break;
case '\t': printf("\\t"); break;
case '\a': printf("\\a"); break;
case '\b': printf("\\b"); break;
default:
if (isprint(*s))
printf("%c",*s);
else
printf("\\x%02x",(unsigned char)*s);
break;
}
s++;
}
printf("\"\n");
}
static int cliReadBulkReply(int fd) { static int cliReadBulkReply(int fd) {
sds replylen = cliReadLine(fd); sds replylen = cliReadLine(fd);
char *reply, crlf[2]; char *reply, crlf[2];
@ -241,12 +266,17 @@ static int cliReadBulkReply(int fd) {
reply = zmalloc(bulklen); reply = zmalloc(bulklen);
anetRead(fd,reply,bulklen); anetRead(fd,reply,bulklen);
anetRead(fd,crlf,2); anetRead(fd,crlf,2);
if (bulklen && fwrite(reply,bulklen,1,stdout) == 0) { if (!isatty(fileno(stdout))) {
zfree(reply); if (bulklen && fwrite(reply,bulklen,1,stdout) == 0) {
return 1; zfree(reply);
return 1;
}
if (reply[bulklen-1] != '\n') printf("\n");
} else {
/* If you are producing output for the standard output we want
* a more interesting output with quoted characters and so forth */
printStringRepr(reply,bulklen);
} }
if (isatty(fileno(stdout)) && reply[bulklen-1] != '\n')
printf("\n");
zfree(reply); zfree(reply);
return 0; return 0;
} }