circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove duplicates from completion list, GitHub issue 3178.

pull/3196/head
Nicholas Marriott 2022-05-20 09:00:37 +01:00
parent 1b28b2b51d
commit cf7e1c94df
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
status.c
View File

@ -1576,11 +1576,25 @@ status_prompt_add_history(const char *line, u_int type)
status_prompt_hsize[type] = newsize; status_prompt_hsize[type] = newsize;
} }
/* Add to completion list. */
static void
status_prompt_add_list(char ***list, u_int *size, const char *s)
{
u_int i;
for (i = 0; i < *size; i++) {
if (strcmp((*list)[i], s) == 0)
return;
}
*list = xreallocarray(*list, (*size) + 1, sizeof **list);
(*list)[(*size)++] = xstrdup(s);
}
/* Build completion list. */ /* Build completion list. */
static char ** static char **
status_prompt_complete_list(u_int *size, const char *s, int at_start) status_prompt_complete_list(u_int *size, const char *s, int at_start)
{ {
char **list = NULL; char **list = NULL, *tmp;
const char **layout, *value, *cp; const char **layout, *value, *cp;
const struct cmd_entry **cmdent; const struct cmd_entry **cmdent;
const struct options_table_entry *oe; const struct options_table_entry *oe;
@ -1594,15 +1608,11 @@ status_prompt_complete_list(u_int *size, const char *s, int at_start)
*size = 0; *size = 0;
for (cmdent = cmd_table; *cmdent != NULL; cmdent++) { for (cmdent = cmd_table; *cmdent != NULL; cmdent++) {
if (strncmp((*cmdent)->name, s, slen) == 0) { if (strncmp((*cmdent)->name, s, slen) == 0)
list = xreallocarray(list, (*size) + 1, sizeof *list); status_prompt_add_list(&list, size, (*cmdent)->name);
list[(*size)++] = xstrdup((*cmdent)->name);
}
if ((*cmdent)->alias != NULL && if ((*cmdent)->alias != NULL &&
strncmp((*cmdent)->alias, s, slen) == 0) { strncmp((*cmdent)->alias, s, slen) == 0)
list = xreallocarray(list, (*size) + 1, sizeof *list); status_prompt_add_list(&list, size, (*cmdent)->alias);
list[(*size)++] = xstrdup((*cmdent)->alias);
}
} }
o = options_get_only(global_options, "command-alias"); o = options_get_only(global_options, "command-alias");
if (o != NULL) { if (o != NULL) {
@ -1615,8 +1625,9 @@ status_prompt_complete_list(u_int *size, const char *s, int at_start)
if (slen > valuelen || strncmp(value, s, slen) != 0) if (slen > valuelen || strncmp(value, s, slen) != 0)
goto next; goto next;
list = xreallocarray(list, (*size) + 1, sizeof *list); xasprintf(&tmp, "%.*s", (int)valuelen, value);
list[(*size)++] = xstrndup(value, valuelen); status_prompt_add_list(&list, size, tmp);
free(tmp);
next: next:
a = options_array_next(a); a = options_array_next(a);
@ -1624,18 +1635,13 @@ status_prompt_complete_list(u_int *size, const char *s, int at_start)
} }
if (at_start) if (at_start)
return (list); return (list);
for (oe = options_table; oe->name != NULL; oe++) { for (oe = options_table; oe->name != NULL; oe++) {
if (strncmp(oe->name, s, slen) == 0) { if (strncmp(oe->name, s, slen) == 0)
list = xreallocarray(list, (*size) + 1, sizeof *list); status_prompt_add_list(&list, size, oe->name);
list[(*size)++] = xstrdup(oe->name);
}
} }
for (layout = layouts; *layout != NULL; layout++) { for (layout = layouts; *layout != NULL; layout++) {
if (strncmp(*layout, s, slen) == 0) { if (strncmp(*layout, s, slen) == 0)
list = xreallocarray(list, (*size) + 1, sizeof *list); status_prompt_add_list(&list, size, *layout);
list[(*size)++] = xstrdup(*layout);
}
} }
return (list); return (list);
} }