Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.busybox.net/busybox.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2023-03-24 18:16:35 +0300
committerDenys Vlasenko <vda.linux@googlemail.com>2023-04-25 17:47:22 +0300
commit64e967fabb1cf6c190b76f51c69e0ecb5fa49be5 (patch)
tree1525a77f544552870eda8eb80c26a85450b8a65d
parent8d198665a0d09c3f22f3a12234809f46b1c2b04a (diff)
lineedit: fix matching of directories when searching PATH
Commit 8baa643a3 (lineedit: match local directories when searching PATH) included subdirectories of the current directory in the search when tab-completing commands. Unfortunately a short time later commit 1d180cd74 (lineedit: use strncmp instead of is_prefixed_with (we know the length)) broke this feature by returning an incorrect length for the array of paths. Fix the length and reinstate matching of subdirectories. Signed-off-by: Ron Yorston <rmy@pobox.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--libbb/lineedit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index d6b2e76ff..ed7c42ba8 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -825,8 +825,8 @@ static unsigned path_parse(char ***p)
res[npth++] = tmp;
}
/* special case: "match subdirectories of the current directory" */
- /*res[npth++] = NULL; - filled by xzalloc() */
- return npth;
+ /*res[npth] = NULL; - filled by xzalloc() */
+ return npth + 1;
}
/* Complete command, directory or file name.