aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2016-10-26 10:32:18 +0100
committerRon Yorston <rmy@pobox.com>2016-10-26 10:32:18 +0100
commit94eac583b29d56a28bf18d41f56ecb2a9d0bd336 (patch)
treeff7f398db61a851d5e0af51a92004207707acfab /libbb
parent418f43bea899493bb70a6eec6429b3de412be6e7 (diff)
parenta513bf3c3ce0756c991b21c0ca271e24fedcdb51 (diff)
downloadbusybox-w32-94eac583b29d56a28bf18d41f56ecb2a9d0bd336.tar.gz
busybox-w32-94eac583b29d56a28bf18d41f56ecb2a9d0bd336.tar.bz2
busybox-w32-94eac583b29d56a28bf18d41f56ecb2a9d0bd336.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'libbb')
-rw-r--r--libbb/lineedit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 34eb16e6b..06f708b62 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -840,7 +840,7 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
840 pf_len = strlen(pfind); 840 pf_len = strlen(pfind);
841 841
842#if ENABLE_FEATURE_SH_STANDALONE && NUM_APPLETS != 1 842#if ENABLE_FEATURE_SH_STANDALONE && NUM_APPLETS != 1
843 if (type == FIND_EXE_ONLY && dirbuf == NULL) { 843 if (type == FIND_EXE_ONLY && !dirbuf) {
844 const char *p = applet_names; 844 const char *p = applet_names;
845 845
846 while (*p) { 846 while (*p) {