diff options
author | Ron Yorston <rmy@pobox.com> | 2017-07-29 09:55:08 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2017-07-29 09:55:08 +0100 |
commit | 86d60bb0ceb277e500a8daabd995bc713bbdadc9 (patch) | |
tree | 3e439f92d5a3fec2546d526579cc85e98f066e40 /libbb/lineedit.c | |
parent | b30c60a9786a1608211a96755996bd6c02951a27 (diff) | |
parent | 69be994de69d794f038f10a3e7a67519b2006581 (diff) | |
download | busybox-w32-86d60bb0ceb277e500a8daabd995bc713bbdadc9.tar.gz busybox-w32-86d60bb0ceb277e500a8daabd995bc713bbdadc9.tar.bz2 busybox-w32-86d60bb0ceb277e500a8daabd995bc713bbdadc9.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'libbb/lineedit.c')
-rw-r--r-- | libbb/lineedit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libbb/lineedit.c b/libbb/lineedit.c index 670a1b194..a28b6ef98 100644 --- a/libbb/lineedit.c +++ b/libbb/lineedit.c | |||
@@ -834,7 +834,7 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type) | |||
834 | } | 834 | } |
835 | pf_len = strlen(pfind); | 835 | pf_len = strlen(pfind); |
836 | 836 | ||
837 | #if ENABLE_FEATURE_SH_STANDALONE && NUM_APPLETS != 1 | 837 | # if ENABLE_FEATURE_SH_STANDALONE && NUM_APPLETS != 1 |
838 | if (type == FIND_EXE_ONLY && !dirbuf) { | 838 | if (type == FIND_EXE_ONLY && !dirbuf) { |
839 | const char *p = applet_names; | 839 | const char *p = applet_names; |
840 | 840 | ||
@@ -845,7 +845,7 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type) | |||
845 | } | 845 | } |
846 | add_partial_match(pfind, "busybox", pf_len); | 846 | add_partial_match(pfind, "busybox", pf_len); |
847 | } | 847 | } |
848 | #endif | 848 | # endif |
849 | 849 | ||
850 | for (i = 0; i < npaths; i++) { | 850 | for (i = 0; i < npaths; i++) { |
851 | DIR *dir; | 851 | DIR *dir; |