#include <string.h>
#include <stdlib.h>
#include <unistd.h>
+#include <ctype.h>
#include "anet.h"
#include "sds.h"
#include "adlist.h"
#include "zmalloc.h"
+#include "linenoise.h"
#define REDIS_CMD_INLINE 1
#define REDIS_CMD_BULK 2
long repeat;
int dbnum;
int interactive;
- char *authpw;
+ char *auth;
} config;
struct redisCommand {
{"get",2,REDIS_CMD_INLINE},
{"set",3,REDIS_CMD_BULK},
{"setnx",3,REDIS_CMD_BULK},
+ {"setex",4,REDIS_CMD_BULK},
{"append",3,REDIS_CMD_BULK},
{"substr",4,REDIS_CMD_INLINE},
{"del",-2,REDIS_CMD_INLINE},
{"discard",1,REDIS_CMD_INLINE},
{"hset",4,REDIS_CMD_MULTIBULK},
{"hget",3,REDIS_CMD_BULK},
+ {"hmset",-4,REDIS_CMD_MULTIBULK},
+ {"hmget",-3,REDIS_CMD_MULTIBULK},
+ {"hincrby",4,REDIS_CMD_INLINE},
{"hdel",3,REDIS_CMD_BULK},
{"hlen",2,REDIS_CMD_INLINE},
{"hkeys",2,REDIS_CMD_INLINE},
{"hvals",2,REDIS_CMD_INLINE},
{"hgetall",2,REDIS_CMD_INLINE},
{"hexists",3,REDIS_CMD_BULK},
+ {"config",-2,REDIS_CMD_BULK},
+ {"subscribe",-2,REDIS_CMD_INLINE},
+ {"unsubscribe",-1,REDIS_CMD_INLINE},
+ {"publish",3,REDIS_CMD_BULK},
{NULL,0,0}
};
return 0;
}
-static int cliLogin(int fd)
-{
- int retval = 1;
- sds cmd;
- char type;
- if (config.authpw[0] != '\0') {
- cmd = sdsempty();
- cmd = sdscatprintf(cmd,"AUTH %s\r\n",config.authpw);
- anetWrite(fd,cmd,sdslen(cmd));
- anetRead(fd,&type,1);
- if (type == '+')
- retval = 0;
- int ret2 = cliReadSingleLineReply(fd,1);
- if (ret2)
- close(fd);
- } else {
- retval = 0;
- }
- return retval;
-}
-
-static int cliSendCommand(int argc, char **argv) {
+static int cliSendCommand(int argc, char **argv, int repeat) {
struct redisCommand *rc = lookupCommand(argv[0]);
int fd, j, retval = 0;
int read_forever = 0;
return 1;
}
- /* Login if necessary */
- retval = cliLogin(fd);
- if (retval) {
- fprintf(stderr,"Authentication failed\n");
- return 1;
- }
-
- while(config.repeat--) {
+ while(repeat--) {
/* Build the command to send */
cmd = sdsempty();
if (rc->flags & REDIS_CMD_MULTIBULK) {
config.dbnum = atoi(argv[i+1]);
i++;
} else if (!strcmp(argv[i],"-a") && !lastarg) {
- config.authpw = argv[i+1];
+ config.auth = argv[i+1];
i++;
} else if (!strcmp(argv[i],"-i")) {
config.interactive = 1;
return sds;
}
-static char *prompt(char *line, int size) {
- char *retval;
-
- do {
- printf(">> ");
- retval = fgets(line, size, stdin);
- } while (retval && *line == '\n');
- line[strlen(line) - 1] = '\0';
+static char **splitArguments(char *line, int *argc) {
+ char *p = line;
+ char *current = NULL;
+ char **vector = NULL;
- return retval;
+ *argc = 0;
+ while(1) {
+ /* skip blanks */
+ while(*p && isspace(*p)) p++;
+ if (*p) {
+ /* get a token */
+ int inq=0; /* set to 1 if we are in "quotes" */
+ int done = 0;
+
+ if (current == NULL) current = sdsempty();
+ while(!done) {
+ if (inq) {
+ if (*p == '\\' && *(p+1)) {
+ char c;
+
+ p++;
+ switch(*p) {
+ case 'n': c = '\n'; break;
+ case 'r': c = '\r'; break;
+ case 't': c = '\t'; break;
+ case 'b': c = '\b'; break;
+ case 'a': c = '\a'; break;
+ default: c = *p; break;
+ }
+ current = sdscatlen(current,&c,1);
+ } else if (*p == '"') {
+ done = 1;
+ } else {
+ current = sdscatlen(current,p,1);
+ }
+ } else {
+ switch(*p) {
+ case ' ':
+ case '\n':
+ case '\r':
+ case '\t':
+ case '\0':
+ done=1;
+ break;
+ case '"':
+ inq=1;
+ break;
+ default:
+ current = sdscatlen(current,p,1);
+ break;
+ }
+ }
+ if (*p) p++;
+ }
+ /* add the token to the vector */
+ vector = zrealloc(vector,((*argc)+1)*sizeof(char*));
+ vector[*argc] = current;
+ (*argc)++;
+ current = NULL;
+ } else {
+ return vector;
+ }
+ }
}
+#define LINE_BUFLEN 4096
static void repl() {
- int size = 4096, max = size >> 1, argc;
- char buffer[size];
- char *line = buffer;
- char **ap, *args[max];
-
- while (prompt(line, size)) {
- argc = 0;
-
- for (ap = args; (*ap = strsep(&line, " \t")) != NULL;) {
- if (**ap != '\0') {
- if (argc >= max) break;
- if (strcasecmp(*ap,"quit") == 0 || strcasecmp(*ap,"exit") == 0)
- exit(0);
- ap++;
- argc++;
+ int argc, j;
+ char *line, **argv;
+
+ while((line = linenoise("redis> ")) != NULL) {
+ if (line[0] != '\0') {
+ argv = splitArguments(line,&argc);
+ linenoiseHistoryAdd(line);
+ if (argc > 0) {
+ if (strcasecmp(argv[0],"quit") == 0 ||
+ strcasecmp(argv[0],"exit") == 0)
+ exit(0);
+ else
+ cliSendCommand(argc, argv, 1);
}
+ /* Free the argument vector */
+ for (j = 0; j < argc; j++)
+ sdsfree(argv[j]);
+ free(argv);
}
-
- config.repeat = 1;
- cliSendCommand(argc, convertToSds(argc, args));
- line = buffer;
+ /* linenoise() returns malloc-ed lines like readline() */
+ free(line);
}
-
exit(0);
}
config.repeat = 1;
config.dbnum = 0;
config.interactive = 0;
+ config.auth = NULL;
firstarg = parseOptions(argc,argv);
argc -= firstarg;
argv += firstarg;
+ if (config.auth != NULL) {
+ char *authargv[2];
+
+ authargv[0] = "AUTH";
+ authargv[1] = config.auth;
+ cliSendCommand(2, convertToSds(2, authargv), 1);
+ }
+
if (argc == 0 || config.interactive == 1) repl();
argvcopy = convertToSds(argc, argv);
}
}
- return cliSendCommand(argc, argvcopy);
+ return cliSendCommand(argc, argvcopy, config.repeat);
}
projects / redis.git / blobdiff