gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

redis-cli: fix bugs in hints of commands with subcommands. (#8914)

Browse Source 
There are two bugs in redis-cli hints:
* The hints of commands with subcommands lack first params.
* When search matching command of currently input, we should find the
command with longest matching prefix. If not COMMAND INFO will always
match COMMAND and display no hints.
This commit is contained in:
Huang Zhw 2021-05-17 21:52:40 +08:00 committed by GitHub
parent 46d9f31e94
commit 8827aae83b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/redis-cli.c
View File

@ -707,9 +707,10 @@ static void completionCallback(const char *buf, linenoiseCompletions *lc) {
static char *hintsCallback(const char *buf, int *color, int *bold) {
if (!pref.hints) return NULL;
int i, argc, buflen = strlen(buf);
sds *argv = sdssplitargs(buf,&argc);
int i, rawargc, argc, buflen = strlen(buf), matchlen = 0;
sds *rawargv, *argv = sdssplitargs(buf,&argc);
int endspace = buflen && isspace(buf[buflen-1]);
helpEntry *entry = NULL;
/* Check if the argument list is empty and return ASAP. */
if (argc == 0) {
@ -717,19 +718,35 @@ static char *hintsCallback(const char *buf, int *color, int *bold) {
return NULL;
}
/* Search longest matching prefix command */
for (i = 0; i < helpEntriesLen; i++) {
if (!(helpEntries[i].type & CLI_HELP_COMMAND)) continue;
if (strcasecmp(argv[0],helpEntries[i].full) == 0 ||
strcasecmp(buf,helpEntries[i].full) == 0)
{
rawargv = sdssplitargs(helpEntries[i].full,&rawargc);
if (rawargc <= argc) {
int j;
for (j = 0; j < rawargc; j++) {
if (strcasecmp(rawargv[j],argv[j])) {
break;
}
}
if (j == rawargc && rawargc > matchlen) {
matchlen = rawargc;
entry = &helpEntries[i];
}
}
sdsfreesplitres(rawargv,rawargc);
}
sdsfreesplitres(argv,argc);
if (entry) {
*color = 90;
*bold = 0;
sds hint = sdsnew(helpEntries[i].org->params);
sds hint = sdsnew(entry->org->params);
/* Remove arguments from the returned hint to show only the
* ones the user did not yet typed. */
int toremove = argc-1;
* ones the user did not yet type. */
int toremove = argc-matchlen;
while(toremove > 0 && sdslen(hint)) {
if (hint[0] == '[') break;
if (hint[0] == ' ') toremove--;
@ -744,11 +761,8 @@ static char *hintsCallback(const char *buf, int *color, int *bold) {
hint = newhint;
}
sdsfreesplitres(argv,argc);
return hint;
}
}
sdsfreesplitres(argv,argc);
return NULL;
}