D39839.id121119.diff
No OneTemporary
Actions

Size

957 B

Referenced Files

None

Subscribers

None

D39839.id121119.diff
View Options

	diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c
	--- a/bin/sh/histedit.c
	+++ b/bin/sh/histedit.c
	@@ -605,7 +605,7 @@
	{
	char free_path = NULL, path;
	const char *dirname;
	- char **matches = NULL;
	+ char matches = NULL, rmatches;
	size_t i = 0, size = 16, uniq;
	size_t curpos = end - start, lcstring = -1;

	@@ -631,7 +631,6 @@
	}
	while ((entry = readdir(dir)) != NULL) {
	struct stat statb;
	- char **rmatches;

	if (strncmp(entry->d_name, text, curpos) != 0)
	continue;
	@@ -655,6 +654,18 @@
	}
	closedir(dir);
	}
	+ for (const unsigned char bp = builtincmd; bp != '\0'; bp += 2 + bp[0]) {
	+ if (memcmp(bp + 2, text, MIN(curpos, bp[0])) != 0)
	+ continue;
	+ matches[++i] = strndup(bp + 2, bp[0]);
	+ if (i < size - 1)
	+ continue;
	+ size *= 2;
	+ rmatches = reallocarray(matches, size, sizeof(matches[0]));
	+ if (rmatches == NULL)
	+ goto out;
	+ matches = rmatches;
	+ }
	out:
	free(free_path);
	if (i == 0) {