emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lineedit: search applets as well as PATH for tab completion

Browse Source 
In standalone shell mode search the applet table as well as PATH
when tab completing a command.

Use a stupid linear search:  we're also about to read all the
directories on PATH so efficiency isn't a big concern.

function                                             old     new   delta
add_match                                              -      53     +53
complete_cmd_dir_file                                687     724     +37
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 1/0 up/down: 90/0)               Total: 90 bytes

Signed-off-by: Ron Yorston <rmy@frippery.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Ron Yorston 2015-05-29 11:31:40 +01:00 committed by Denys Vlasenko
parent ae57af6e78
commit f23264b35f
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libbb/lineedit.c
View File

@ -47,7 +47,8 @@
* It stems from simplistic "cmdedit_y = cmdedit_prmt_len / cmdedit_termw" * It stems from simplistic "cmdedit_y = cmdedit_prmt_len / cmdedit_termw"
* calculation of how many lines the prompt takes. * calculation of how many lines the prompt takes.
*/ */
#include "libbb.h" #include "busybox.h"
#include "NUM_APPLETS.h"
#include "unicode.h" #include "unicode.h"
#ifndef _POSIX_VDISABLE #ifndef _POSIX_VDISABLE
# define _POSIX_VDISABLE '\0' # define _POSIX_VDISABLE '\0'
@ -774,6 +775,20 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
} }
pf_len = strlen(pfind); pf_len = strlen(pfind);
#if ENABLE_FEATURE_SH_STANDALONE && NUM_APPLETS != 1
if (type == FIND_EXE_ONLY) {
const char *p = applet_names;
i = 0;
while (i < NUM_APPLETS) {
if (strncmp(pfind, p, pf_len) == 0)
add_match(xstrdup(p));
p += strlen(p) + 1;
i++;
}
}
#endif
for (i = 0; i < npaths; i++) { for (i = 0; i < npaths; i++) {
DIR *dir; DIR *dir;
struct dirent *next; struct dirent *next;