summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorEric Andersen2001-02-16 20:26:50 +0000
committerEric Andersen2001-02-16 20:26:50 +0000
commit28a78ab62c011820d91ab9edc5ae45196d813a13 (patch)
tree44eb3e8aa958a10328d81adac45a47d94ef63f27 /shell
parent6faae7deb4b88dccffb7dbbf267315cb7bbc0af9 (diff)
downloadbusybox-28a78ab62c011820d91ab9edc5ae45196d813a13.zip
busybox-28a78ab62c011820d91ab9edc5ae45196d813a13.tar.gz
Several features were hard coded on. Stop that. List tab completion
as working (thanks Vladimir!) and taking 4k. -Erik
Diffstat (limited to 'shell')
-rw-r--r--shell/cmdedit.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/shell/cmdedit.c b/shell/cmdedit.c
index 6fd80fd..0979189 100644
--- a/shell/cmdedit.c
+++ b/shell/cmdedit.c
@@ -41,12 +41,8 @@
#else
-#define BB_FEATURE_SH_COMMAND_EDITING
-#define BB_FEATURE_SH_TAB_COMPLETION
-#define BB_FEATURE_USERNAME_COMPLETION
-#define BB_FEATURE_NONPRINTABLE_INVERSE_PUT
-#define BB_FEATURE_BASH_STYLE_PROMT
-#define BB_FEATURE_CLEAN_UP
+//#define BB_FEATURE_NONPRINTABLE_INVERSE_PUT
+//#define BB_FEATURE_BASH_STYLE_PROMT
#define TRUE 1
#define FALSE 0
@@ -57,10 +53,10 @@
#ifdef BB_FEATURE_SH_COMMAND_EDITING
#ifndef BB_FEATURE_SH_TAB_COMPLETION
-#undef BB_FEATURE_USERNAME_COMPLETION
+#undef BB_FEATURE_SH_USERNAME_COMPLETION
#endif
-#if defined(BB_FEATURE_USERNAME_COMPLETION) || defined(BB_FEATURE_BASH_STYLE_PROMT)
+#if defined(BB_FEATURE_SH_USERNAME_COMPLETION) || defined(BB_FEATURE_BASH_STYLE_PROMT)
#define BB_FEATURE_GETUSERNAME_AND_HOMEDIR
#endif
@@ -626,7 +622,7 @@ static int is_execute(const struct stat *st)
return FALSE;
}
-#ifdef BB_FEATURE_USERNAME_COMPLETION
+#ifdef BB_FEATURE_SH_USERNAME_COMPLETION
static char **username_tab_completion(char *ud, int *num_matches)
{
@@ -688,7 +684,7 @@ static char **username_tab_completion(char *ud, int *num_matches)
return (matches);
}
}
-#endif /* BB_FEATURE_USERNAME_COMPLETION */
+#endif /* BB_FEATURE_SH_USERNAME_COMPLETION */
enum {
FIND_EXE_ONLY = 0,
@@ -785,7 +781,7 @@ static char **exe_n_cwd_tab_completion(char *command, int *num_matches,
strcpy(dirbuf, command);
/* set dir only */
dirbuf[(pfind - command) + 1] = 0;
-#ifdef BB_FEATURE_USERNAME_COMPLETION
+#ifdef BB_FEATURE_SH_USERNAME_COMPLETION
if (dirbuf[0] == '~') /* ~/... or ~user/... */
username_tab_completion(dirbuf, 0);
#endif
@@ -1066,7 +1062,7 @@ static void input_tab(int *lastWasTab)
/* Free up any memory already allocated */
input_tab(0);
-#ifdef BB_FEATURE_USERNAME_COMPLETION
+#ifdef BB_FEATURE_SH_USERNAME_COMPLETION
/* If the word starts with `~' and there is no slash in the word,
* then try completing this word as a username. */