Skip to content

perf(all_variables_matching_prefix): avoid making list of all visible variables#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
akinomyoga wants to merge 4 commits into
base:devel
Choose a base branch
from
Open

perf(all_variables_matching_prefix): avoid making list of all visible variables #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a5bba7f
fix(strlist_create): clear all elements
akinomyoga Aug 14, 2026
1a21dfe
perf(all_variables_matching_prefix): avoid making list of all visible…
akinomyoga Aug 12, 2026
3185e1a
feat(ITEM_LIST::list_getter): accept a hint text
akinomyoga Aug 14, 2026
9c3169b
perf(it_init_variables): use "all_variables_matching_prefix"
akinomyoga Aug 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/sh/stringlist.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ strlist_create (size_t n)
{
ret->list = strvec_create (n+1);
ret->list_size = n;
for (i = 0; i < n; i++)
for (i = 0; i <= n; i++)
ret->list[i] = (char *)NULL;
}
else
Expand DownExpand Up@@ -168,7 +168,7 @@ strlist_append (STRINGLIST *m1, STRINGLIST *m2)

if (len2)
{
m1 = strlist_resize (m1, len1 + len2 + 1);
m1 = strlist_resize (m1, len1 + len2);
for (i = 0, n = len1; i < len2; i++, n++)
m1->list[n] = STRDUP (m2->list[i]);
m1->list[n] = (char *)NULL;
Expand Down
181 changes: 93 additions & 88 deletions pcomplete.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,7 @@
#endif
#define STRDUP(x) ((x) ? savestring (x) : (char *)NULL)

typedef SHELL_VAR **SVFUNC (void);
typedef char **STRVECFUNC (const char *);

extern STRING_INT_ALIST word_token_alist[];
extern char *signal_names[];
Expand All@@ -83,29 +83,29 @@ static void debug_printf (const char *, ...) __attribute__((__format__ (printf,

static int it_init_joblist (ITEMLIST *, int);

static int it_init_aliases (ITEMLIST *);
static int it_init_arrayvars (ITEMLIST *);
static int it_init_bindings (ITEMLIST *);
static int it_init_builtins (ITEMLIST *);
static int it_init_disabled (ITEMLIST *);
static int it_init_enabled (ITEMLIST *);
static int it_init_exported (ITEMLIST *);
static int it_init_functions (ITEMLIST *);
static int it_init_helptopics (ITEMLIST *);
static int it_init_hostnames (ITEMLIST *);
static int it_init_jobs (ITEMLIST *);
static int it_init_running (ITEMLIST *);
static int it_init_stopped (ITEMLIST *);
static int it_init_keywords (ITEMLIST *);
static int it_init_signals (ITEMLIST *);
static int it_init_variables (ITEMLIST *);
static int it_init_setopts (ITEMLIST *);
static int it_init_shopts (ITEMLIST *);
static int it_init_aliases (ITEMLIST *, const char *);
static int it_init_arrayvars (ITEMLIST *, const char *);
static int it_init_bindings (ITEMLIST *, const char *);
static int it_init_builtins (ITEMLIST *, const char *);
static int it_init_disabled (ITEMLIST *, const char *);
static int it_init_enabled (ITEMLIST *, const char *);
static int it_init_exported (ITEMLIST *, const char *);
static int it_init_functions (ITEMLIST *, const char *);
static int it_init_helptopics (ITEMLIST *, const char *);
static int it_init_hostnames (ITEMLIST *, const char *);
static int it_init_jobs (ITEMLIST *, const char *);
static int it_init_running (ITEMLIST *, const char *);
static int it_init_stopped (ITEMLIST *, const char *);
static int it_init_keywords (ITEMLIST *, const char *);
static int it_init_signals (ITEMLIST *, const char *);
static int it_init_variables (ITEMLIST *, const char *);
static int it_init_setopts (ITEMLIST *, const char *);
static int it_init_shopts (ITEMLIST *, const char *);

static int shouldexp_filterpat (char *);
static char *preproc_filterpat (const char *, const char *);

static void init_itemlist_from_varlist (ITEMLIST *, SVFUNC *);
static void init_itemlist_from_strvec (ITEMLIST *, STRVECFUNC *, const char *);

static STRINGLIST *gen_matches_from_itemlist (ITEMLIST *, const char *);
static STRINGLIST *gen_action_completions (COMPSPEC *, const char *);
Expand DownExpand Up@@ -211,9 +211,10 @@ set_itemlist_dirty (ITEMLIST *it)
}

void
initialize_itemlist (ITEMLIST *itp)
initialize_itemlist (ITEMLIST *itp, const char *hint_text)
{
(*itp->list_getter) (itp);
itp->flags &= ~LIST_PREFIXFILTERED;
(*itp->list_getter) (itp, hint_text);
itp->flags |= LIST_INITIALIZED;
itp->flags &= ~LIST_DIRTY;
}
Expand DownExpand Up@@ -311,35 +312,21 @@ STRINGLIST *
completions_to_stringlist (char **matches)
{
STRINGLIST *sl;
int i, n;
size_t mlen;

mlen = (matches == 0) ? 0 : strvec_len (matches);
sl = strlist_create (mlen + 1);

sl = strlist_create (0);
if (matches == 0 || matches[0] == 0)
return sl;

if (matches[1] == 0)
{
sl->list[0] = STRDUP (matches[0]);
sl->list[sl->list_len = 1] = (char *)NULL;
return sl;
}

for (i = 1, n = 0; i < mlen; i++, n++)
sl->list[n] = STRDUP (matches[i]);
sl->list_len = n;
sl->list[n] = (char *)NULL;

sl->list = strvec_copy (matches);
sl->list_len = sl->list_size = strvec_len (matches);
return sl;
}

/* Functions to manage the various ITEMLISTs that we populate internally.
The caller is responsible for setting ITP->flags correctly. */

static int
it_init_aliases (ITEMLIST *itp)
it_init_aliases (ITEMLIST *itp, const char *)
{
#ifdef ALIAS
alias_t **alias_list;
Expand All@@ -355,7 +342,7 @@ it_init_aliases (ITEMLIST *itp)
}
for (n = 0; alias_list[n]; n++)
;
sl = strlist_create (n+1);
sl = strlist_create (n);
for (i = 0; i < n; i++)
sl->list[i] = STRDUP (alias_list[i]->name);
sl->list[n] = (char *)NULL;
Expand All@@ -369,42 +356,38 @@ it_init_aliases (ITEMLIST *itp)
}

static void
init_itemlist_from_varlist (ITEMLIST *itp, SVFUNC *svfunc)
init_itemlist_from_strvec (ITEMLIST *itp, STRVECFUNC *strvecfunc, const char *prefix)
{
SHELL_VAR **vlist;
char **svec;
STRINGLIST *sl;
int i;
size_t n;

vlist = (*svfunc) ();
if (vlist == 0)
svec = (*strvecfunc) (prefix);
if (svec == 0)
{
itp->slist = (STRINGLIST *)NULL;
return;
}
for (n = 0; vlist[n]; n++)
;
sl = strlist_create (n+1);
for (i = 0; i < n; i++)
sl->list[i] = savestring (vlist[i]->name);
sl->list[sl->list_len = n] = (char *)NULL;
}

sl = strlist_create (0);
sl->list = svec;
sl->list_len = sl->list_size = strvec_len(svec);
itp->slist = sl;
free (vlist);
itp->flags |= LIST_PREFIXFILTERED;
}

static int
it_init_arrayvars (ITEMLIST *itp)
it_init_arrayvars (ITEMLIST *itp, const char *prefix)
{
#if defined (ARRAY_VARS)
init_itemlist_from_varlist (itp, all_array_variables);
init_itemlist_from_strvec (itp, all_array_variables_matching_prefix, prefix);
return 1;
#else
return 0;
#endif
}

static int
it_init_bindings (ITEMLIST *itp)
it_init_bindings (ITEMLIST *itp, const char *)
{
char **blist;
STRINGLIST *sl;
Expand All@@ -422,7 +405,7 @@ it_init_bindings (ITEMLIST *itp)
}

static int
it_init_builtins (ITEMLIST *itp)
it_init_builtins (ITEMLIST *itp, const char *)
{
STRINGLIST *sl;
int i;
Expand All@@ -439,7 +422,7 @@ it_init_builtins (ITEMLIST *itp)
}

static int
it_init_enabled (ITEMLIST *itp)
it_init_enabled (ITEMLIST *itp, const char *)
{
STRINGLIST *sl;
int i;
Expand All@@ -458,7 +441,7 @@ it_init_enabled (ITEMLIST *itp)
}

static int
it_init_disabled (ITEMLIST *itp)
it_init_disabled (ITEMLIST *itp, const char *)
{
STRINGLIST *sl;
int i;
Expand All@@ -477,23 +460,23 @@ it_init_disabled (ITEMLIST *itp)
}

static int
it_init_exported (ITEMLIST *itp)
it_init_exported (ITEMLIST *itp, const char *prefix)
{
init_itemlist_from_varlist (itp, all_exported_variables);
init_itemlist_from_strvec (itp, all_exported_variables_matching_prefix, prefix);
return 0;
}

static int
it_init_functions (ITEMLIST *itp)
it_init_functions (ITEMLIST *itp, const char *prefix)
{
init_itemlist_from_varlist (itp, all_visible_functions);
init_itemlist_from_strvec (itp, all_functions_matching_prefix, prefix);
return 0;
}

/* Like it_init_builtins, but includes everything the help builtin looks at,
not just builtins with an active implementing function. */
static int
it_init_helptopics (ITEMLIST *itp)
it_init_helptopics (ITEMLIST *itp, const char *)
{
STRINGLIST *sl;
int i;
Expand All@@ -509,7 +492,7 @@ it_init_helptopics (ITEMLIST *itp)
}

static int
it_init_hostnames (ITEMLIST *itp)
it_init_hostnames (ITEMLIST *itp, const char *)
{
STRINGLIST *sl;

Expand DownExpand Up@@ -563,25 +546,25 @@ it_init_joblist (ITEMLIST *itp, int jstate)
}

static int
it_init_jobs (ITEMLIST *itp)
it_init_jobs (ITEMLIST *itp, const char *)
{
return (it_init_joblist (itp, -1));
}

static int
it_init_running (ITEMLIST *itp)
it_init_running (ITEMLIST *itp, const char *)
{
return (it_init_joblist (itp, 0));
}

static int
it_init_stopped (ITEMLIST *itp)
it_init_stopped (ITEMLIST *itp, const char *)
{
return (it_init_joblist (itp, 1));
}

static int
it_init_keywords (ITEMLIST *itp)
it_init_keywords (ITEMLIST *itp, const char *)
{
STRINGLIST *sl;
int i;
Expand All@@ -599,7 +582,7 @@ it_init_keywords (ITEMLIST *itp)
}

static int
it_init_signals (ITEMLIST *itp)
it_init_signals (ITEMLIST *itp, const char *)
{
STRINGLIST *sl;

Expand All@@ -612,14 +595,14 @@ it_init_signals (ITEMLIST *itp)
}

static int
it_init_variables (ITEMLIST *itp)
it_init_variables (ITEMLIST *itp, const char *prefix)
{
init_itemlist_from_varlist (itp, all_visible_variables);
init_itemlist_from_strvec (itp, all_variables_matching_prefix, prefix);
return 0;
}

static int
it_init_setopts (ITEMLIST *itp)
it_init_setopts (ITEMLIST *itp, const char *)
{
STRINGLIST *sl;

Expand All@@ -632,7 +615,7 @@ it_init_setopts (ITEMLIST *itp)
}

static int
it_init_shopts (ITEMLIST *itp)
it_init_shopts (ITEMLIST *itp, const char *)
{
STRINGLIST *sl;

Expand All@@ -656,28 +639,50 @@ gen_matches_from_itemlist (ITEMLIST *itp, const char *text)
size_t tlen, i, n;
char *ntxt;

ntxt = bash_dequote_text (text);

if ((itp->flags & (LIST_DIRTY|LIST_DYNAMIC)) ||
(itp->flags & LIST_INITIALIZED) == 0)
{
if (itp->flags & (LIST_DIRTY|LIST_DYNAMIC))
clean_itemlist (itp);
if ((itp->flags & LIST_INITIALIZED) == 0)
initialize_itemlist (itp);
initialize_itemlist (itp, ntxt);
}
if (itp->slist == 0)
return ((STRINGLIST *)NULL);
ret = strlist_create (itp->slist->list_len+1);
sl = itp->slist;

ntxt = bash_dequote_text (text);
tlen = STRLEN (ntxt);
{
FREE (ntxt);
return ((STRINGLIST *)NULL);
}

for (i = n = 0; i < sl->list_len; i++)
if (itp->flags & LIST_PREFIXFILTERED)
{
/* When the items are aready filtered by itp->list_getter using the
prefix text "ntxt", flag LIST_PREFIXFILTERED is set. In this case, we
can simply pass or copy the created string list. */
if (itp-> flags & (LIST_DONTFREEMEMBERS|LIST_DONTFREE))
ret = strlist_copy (itp->slist);
else
{
ret = itp->slist;
itp->slist = (STRINGLIST *)NULL;
clean_itemlist (itp);
}
}
else
{
if (tlen == 0 || STREQN (sl->list[i], ntxt, tlen))
ret->list[n++] = STRDUP (sl->list[i]);
ret = strlist_create (itp->slist->list_len);
sl = itp->slist;

tlen = STRLEN (ntxt);

for (i = n = 0; i < sl->list_len; i++)
{
if (tlen == 0 || STREQN (sl->list[i], ntxt, tlen))
ret->list[n++] = STRDUP (sl->list[i]);
}
ret->list[ret->list_len = n] = (char *)NULL;
}
ret->list[ret->list_len = n] = (char *)NULL;

FREE (ntxt);
return ret;
Expand DownExpand Up@@ -881,7 +886,7 @@ gen_wordlist_matches (COMPSPEC *cs, const char *text)
dispose_words (l);

nw = wlist_length (l2);
sl = strlist_create (nw + 1);
sl = strlist_create (nw);

ntxt = bash_dequote_text (text);
tlen = STRLEN (ntxt);
Expand Down
Loading