diff options
| -rw-r--r-- | Config.h | 128 | ||||
| -rw-r--r-- | cmdedit.c | 16 | ||||
| -rw-r--r-- | lash.c | 6 | ||||
| -rw-r--r-- | sh.c | 6 | ||||
| -rw-r--r-- | shell/cmdedit.c | 16 | ||||
| -rw-r--r-- | shell/lash.c | 6 |
6 files changed, 94 insertions, 84 deletions
@@ -240,7 +240,7 @@ #define BB_FEATURE_SORT_REVERSE // // Enable command line editing in the shell. -// Only relevant if BB_SH is enabled. +// Only relevant if BB_SH is enabled. On by default. #define BB_FEATURE_COMMAND_EDITING // // Enable tab completion in the shell. This is now working quite nicely. @@ -252,9 +252,9 @@ // //Allow the shell to invoke all the compiled in BusyBox applets as if they //were shell builtins. Nice for staticly linking an emergency rescue shell, -//among other things. +//among other things. Off by default. // Only relevant if BB_SH is enabled. -#define BB_FEATURE_SH_STANDALONE_SHELL +//#define BB_FEATURE_SH_STANDALONE_SHELL // //When this is enabled, busybox shell applets can be called using full path //names. This causes applets (i.e., most busybox commands) to override @@ -262,14 +262,15 @@ //will use BusyBox cat even if /bin/cat exists on the filesystem and is _not_ //busybox. Some systems want this, others do not. Choose wisely. :-) This //only has meaning when BB_FEATURE_SH_STANDALONE_SHELL is enabled. -// Only relevant if BB_SH is enabled. -#define BB_FEATURE_SH_APPLETS_ALWAYS_WIN +// Only relevant if BB_SH is enabled. Off by default. +//#define BB_FEATURE_SH_APPLETS_ALWAYS_WIN // // Some deeply embedded systems don't have usernames or even hostnames, // and the default prompt can look rather hideous on them. Uncomment // this option for a simpler, path-only prompt (which was the default until -// around BusyBox-0.48): -#define BB_FEATURE_SIMPLE_PROMPT +// around BusyBox-0.48). On by default. +// Only relevant if BB_SH is enabled. +#define BB_FEATURE_SH_SIMPLE_PROMPT // //Turn on extra fbset options //#define BB_FEATURE_FBSET_FANCY @@ -345,96 +346,105 @@ // mere mortals so leave this stuff alone. // #if defined BB_MOUNT || defined BB_UMOUNT || defined BB_DF -#ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT -#define BB_MTAB -#endif + #ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT + #define BB_MTAB + #endif #else -#undef BB_MTAB + #undef BB_MTAB #endif // -#if defined BB_FEATURE_COMMAND_EDITING && defined BB_SH -#define BB_CMDEDIT +#if defined BB_SH + #if defined BB_FEATURE_COMMAND_EDITING + #define BB_CMDEDIT + #ifndef BB_FEATURE_USE_TERMIOS + #define BB_FEATURE_USE_TERMIOS + #endif + #else + #undef BB_FEATURE_COMMAND_EDITING + #undef BB_FEATURE_COMMAND_TAB_COMPLETION + #undef BB_FEATURE_COMMAND_USERNAME_COMPLETION + #define BB_FEATURE_SH_SIMPLE_PROMPT + #endif +#else + #undef BB_FEATURE_COMMAND_EDITING + #undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN + #undef BB_FEATURE_SH_STANDALONE_SHELL + #undef BB_FEATURE_SH_SIMPLE_PROMPT #endif // #ifdef BB_KILLALL -#ifndef BB_KILL -#define BB_KILL -#endif + #ifndef BB_KILL + #define BB_KILL + #endif #endif // #ifndef BB_INIT -#undef BB_LINUXRC -#undef BB_FEATURE_LINUXRC + #undef BB_LINUXRC + #undef BB_FEATURE_LINUXRC #endif // #ifdef BB_GZIP -#ifndef BB_GUNZIP -#define BB_GUNZIP -#endif + #ifndef BB_GUNZIP + #define BB_GUNZIP + #endif #endif // #ifdef BB_DPKG -#ifndef BB_DPKG_DEB -#define BB_DPKG_DEB -#endif + #ifndef BB_DPKG_DEB + #define BB_DPKG_DEB + #endif #endif // #ifdef BB_DPKG_DEB -#ifndef BB_AR -#define BB_AR -#endif -#ifndef BB_TAR -#define BB_TAR -#endif -#ifndef BB_FEATURE_TAR_GZIP -#define BB_FEATURE_TAR_GZIP -#endif + #ifndef BB_AR + #define BB_AR + #endif + #ifndef BB_TAR + #define BB_TAR + #endif + #ifndef BB_FEATURE_TAR_GZIP + #define BB_FEATURE_TAR_GZIP + #endif #endif // #ifdef BB_TAR -#ifdef BB_FEATURE_TAR_GZIP -#ifndef BB_GUNZIP -#define BB_GUNZIP -#endif -#endif + #ifdef BB_FEATURE_TAR_GZIP + #ifndef BB_GUNZIP + #define BB_GUNZIP + #endif + #endif #endif // #if defined BB_MOUNT && defined BB_FEATURE_NFSMOUNT -#define BB_NFSMOUNT -#endif -// -#if defined BB_FEATURE_COMMAND_EDITING -#ifndef BB_FEATURE_USE_TERMIOS -#define BB_FEATURE_USE_TERMIOS -#endif + #define BB_NFSMOUNT #endif // #if defined BB_IFCONFIG -#ifdef BB_FEATURE_IFCONFIG_STATUS -#define BB_INTERFACE -#endif + #ifdef BB_FEATURE_IFCONFIG_STATUS + #define BB_INTERFACE + #endif #else -#undef BB_INTERFACE + #undef BB_INTERFACE #endif // #if defined BB_FEATURE_AUTOWIDTH -#ifndef BB_FEATURE_USE_TERMIOS -#define BB_FEATURE_USE_TERMIOS -#endif + #ifndef BB_FEATURE_USE_TERMIOS + #define BB_FEATURE_USE_TERMIOS + #endif #endif // #if defined BB_INSMOD || defined BB_LSMOD -#if ! defined BB_FEATURE_NEW_MODULE_INTERFACE && ! defined BB_FEATURE_OLD_MODULE_INTERFACE -#define BB_FEATURE_NEW_MODULE_INTERFACE -#endif + #if ! defined BB_FEATURE_NEW_MODULE_INTERFACE && ! defined BB_FEATURE_OLD_MODULE_INTERFACE + #define BB_FEATURE_NEW_MODULE_INTERFACE + #endif #endif // #ifdef BB_SYSLOGD -#if defined BB_FEATURE_IPC_SYSLOG -#define BB_LOGREAD -#endif + #if defined BB_FEATURE_IPC_SYSLOG + #define BB_LOGREAD + #endif #endif // #if defined BB_DOS2UNIX -#define BB_UNIX2DOS + #define BB_UNIX2DOS #endif @@ -55,7 +55,7 @@ #define BB_FEATURE_COMMAND_TAB_COMPLETION #define BB_FEATURE_COMMAND_USERNAME_COMPLETION #define BB_FEATURE_NONPRINTABLE_INVERSE_PUT -#undef BB_FEATURE_SIMPLE_PROMPT +#undef BB_FEATURE_SH_SIMPLE_PROMPT #define BB_FEATURE_CLEAN_UP #define D(x) x @@ -80,7 +80,7 @@ #undef BB_FEATURE_COMMAND_USERNAME_COMPLETION #endif -#if defined(BB_FEATURE_COMMAND_USERNAME_COMPLETION) || !defined(BB_FEATURE_SIMPLE_PROMPT) +#if defined(BB_FEATURE_COMMAND_USERNAME_COMPLETION) || !defined(BB_FEATURE_SH_SIMPLE_PROMPT) #define BB_FEATURE_GETUSERNAME_AND_HOMEDIR #endif @@ -178,7 +178,7 @@ static int cursor; /* required global for signal handler */ static int len; /* --- "" - - "" - -"- --""-- --""--- */ static char *command_ps; /* --- "" - - "" - -"- --""-- --""--- */ static -#ifdef BB_FEATURE_SIMPLE_PROMPT +#ifdef BB_FEATURE_SH_SIMPLE_PROMPT const #endif char *cmdedit_prompt; /* --- "" - - "" - -"- --""-- --""--- */ @@ -193,7 +193,7 @@ static char *home_pwd_buf = ""; static int my_euid; #endif -#ifndef BB_FEATURE_SIMPLE_PROMPT +#ifndef BB_FEATURE_SH_SIMPLE_PROMPT static char *hostname_buf = ""; static int num_ok_lines = 1; #endif @@ -362,7 +362,7 @@ static void put_prompt(void) cursor = 0; } -#ifdef BB_FEATURE_SIMPLE_PROMPT +#ifdef BB_FEATURE_SH_SIMPLE_PROMPT static void parse_prompt(const char *prmt_ptr) { cmdedit_prompt = prmt_ptr; @@ -1510,7 +1510,7 @@ extern void cmdedit_read_input(char *prompt, char command[BUFSIZ]) history_counter++; } } -#if !defined(BB_FEATURE_SIMPLE_PROMPT) +#if !defined(BB_FEATURE_SH_SIMPLE_PROMPT) num_ok_lines++; #endif } @@ -1519,7 +1519,7 @@ extern void cmdedit_read_input(char *prompt, char command[BUFSIZ]) #if defined(BB_FEATURE_CLEAN_UP) && defined(BB_FEATURE_COMMAND_TAB_COMPLETION) input_tab(0); /* strong free */ #endif -#if !defined(BB_FEATURE_SIMPLE_PROMPT) +#if !defined(BB_FEATURE_SH_SIMPLE_PROMPT) free(cmdedit_prompt); #endif return; @@ -1551,7 +1551,7 @@ int main(int argc, char **argv) { char buff[BUFSIZ]; char *prompt = -#if !defined(BB_FEATURE_SIMPLE_PROMPT) +#if !defined(BB_FEATURE_SH_SIMPLE_PROMPT) "\\[\\033[32;1m\\]\\u@\\[\\x1b[33;1m\\]\\h:\ \\[\\033[34;1m\\]\\w\\[\\033[35;1m\\] \ \\!\\[\\e[36;1m\\]\\$ \\[\\E[0m\\]"; @@ -440,7 +440,7 @@ static int builtin_export(struct child_prog *child) res = putenv(v); if (res) fprintf(stderr, "export: %m\n"); -#ifndef BB_FEATURE_SIMPLE_PROMPT +#ifndef BB_FEATURE_SH_SIMPLE_PROMPT if (strncmp(v, "PS1=", 4)==0) PS1 = getenv("PS1"); else if (strncmp(v, "PS2=", 4)==0) @@ -805,7 +805,7 @@ static void restore_redirects(int squirrel[]) static inline void cmdedit_set_initial_prompt(void) { -#ifdef BB_FEATURE_SIMPLE_PROMPT +#ifdef BB_FEATURE_SH_SIMPLE_PROMPT PS1 = NULL; PS2 = "> "; #else @@ -821,7 +821,7 @@ static inline void cmdedit_set_initial_prompt(void) static inline void setup_prompt_string(char **prompt_str) { -#ifdef BB_FEATURE_SIMPLE_PROMPT +#ifdef BB_FEATURE_SH_SIMPLE_PROMPT /* Set up the prompt */ if (shell_context == 0) { if (PS1) @@ -440,7 +440,7 @@ static int builtin_export(struct child_prog *child) res = putenv(v); if (res) fprintf(stderr, "export: %m\n"); -#ifndef BB_FEATURE_SIMPLE_PROMPT +#ifndef BB_FEATURE_SH_SIMPLE_PROMPT if (strncmp(v, "PS1=", 4)==0) PS1 = getenv("PS1"); else if (strncmp(v, "PS2=", 4)==0) @@ -805,7 +805,7 @@ static void restore_redirects(int squirrel[]) static inline void cmdedit_set_initial_prompt(void) { -#ifdef BB_FEATURE_SIMPLE_PROMPT +#ifdef BB_FEATURE_SH_SIMPLE_PROMPT PS1 = NULL; PS2 = "> "; #else @@ -821,7 +821,7 @@ static inline void cmdedit_set_initial_prompt(void) static inline void setup_prompt_string(char **prompt_str) { -#ifdef BB_FEATURE_SIMPLE_PROMPT +#ifdef BB_FEATURE_SH_SIMPLE_PROMPT /* Set up the prompt */ if (shell_context == 0) { if (PS1) diff --git a/shell/cmdedit.c b/shell/cmdedit.c index 1b5cbbfab..7f403b44f 100644 --- a/shell/cmdedit.c +++ b/shell/cmdedit.c @@ -55,7 +55,7 @@ #define BB_FEATURE_COMMAND_TAB_COMPLETION #define BB_FEATURE_COMMAND_USERNAME_COMPLETION #define BB_FEATURE_NONPRINTABLE_INVERSE_PUT -#undef BB_FEATURE_SIMPLE_PROMPT +#undef BB_FEATURE_SH_SIMPLE_PROMPT #define BB_FEATURE_CLEAN_UP #define D(x) x @@ -80,7 +80,7 @@ #undef BB_FEATURE_COMMAND_USERNAME_COMPLETION #endif -#if defined(BB_FEATURE_COMMAND_USERNAME_COMPLETION) || !defined(BB_FEATURE_SIMPLE_PROMPT) +#if defined(BB_FEATURE_COMMAND_USERNAME_COMPLETION) || !defined(BB_FEATURE_SH_SIMPLE_PROMPT) #define BB_FEATURE_GETUSERNAME_AND_HOMEDIR #endif @@ -178,7 +178,7 @@ static int cursor; /* required global for signal handler */ static int len; /* --- "" - - "" - -"- --""-- --""--- */ static char *command_ps; /* --- "" - - "" - -"- --""-- --""--- */ static -#ifdef BB_FEATURE_SIMPLE_PROMPT +#ifdef BB_FEATURE_SH_SIMPLE_PROMPT const #endif char *cmdedit_prompt; /* --- "" - - "" - -"- --""-- --""--- */ @@ -193,7 +193,7 @@ static char *home_pwd_buf = ""; static int my_euid; #endif -#ifndef BB_FEATURE_SIMPLE_PROMPT +#ifndef BB_FEATURE_SH_SIMPLE_PROMPT static char *hostname_buf = ""; static int num_ok_lines = 1; #endif @@ -362,7 +362,7 @@ static void put_prompt(void) cursor = 0; } -#ifdef BB_FEATURE_SIMPLE_PROMPT +#ifdef BB_FEATURE_SH_SIMPLE_PROMPT static void parse_prompt(const char *prmt_ptr) { cmdedit_prompt = prmt_ptr; @@ -1510,7 +1510,7 @@ extern void cmdedit_read_input(char *prompt, char command[BUFSIZ]) history_counter++; } } -#if !defined(BB_FEATURE_SIMPLE_PROMPT) +#if !defined(BB_FEATURE_SH_SIMPLE_PROMPT) num_ok_lines++; #endif } @@ -1519,7 +1519,7 @@ extern void cmdedit_read_input(char *prompt, char command[BUFSIZ]) #if defined(BB_FEATURE_CLEAN_UP) && defined(BB_FEATURE_COMMAND_TAB_COMPLETION) input_tab(0); /* strong free */ #endif -#if !defined(BB_FEATURE_SIMPLE_PROMPT) +#if !defined(BB_FEATURE_SH_SIMPLE_PROMPT) free(cmdedit_prompt); #endif return; @@ -1551,7 +1551,7 @@ int main(int argc, char **argv) { char buff[BUFSIZ]; char *prompt = -#if !defined(BB_FEATURE_SIMPLE_PROMPT) +#if !defined(BB_FEATURE_SH_SIMPLE_PROMPT) "\\[\\033[32;1m\\]\\u@\\[\\x1b[33;1m\\]\\h:\ \\[\\033[34;1m\\]\\w\\[\\033[35;1m\\] \ \\!\\[\\e[36;1m\\]\\$ \\[\\E[0m\\]"; diff --git a/shell/lash.c b/shell/lash.c index 49fb6b536..dcec14aba 100644 --- a/shell/lash.c +++ b/shell/lash.c @@ -440,7 +440,7 @@ static int builtin_export(struct child_prog *child) res = putenv(v); if (res) fprintf(stderr, "export: %m\n"); -#ifndef BB_FEATURE_SIMPLE_PROMPT +#ifndef BB_FEATURE_SH_SIMPLE_PROMPT if (strncmp(v, "PS1=", 4)==0) PS1 = getenv("PS1"); else if (strncmp(v, "PS2=", 4)==0) @@ -805,7 +805,7 @@ static void restore_redirects(int squirrel[]) static inline void cmdedit_set_initial_prompt(void) { -#ifdef BB_FEATURE_SIMPLE_PROMPT +#ifdef BB_FEATURE_SH_SIMPLE_PROMPT PS1 = NULL; PS2 = "> "; #else @@ -821,7 +821,7 @@ static inline void cmdedit_set_initial_prompt(void) static inline void setup_prompt_string(char **prompt_str) { -#ifdef BB_FEATURE_SIMPLE_PROMPT +#ifdef BB_FEATURE_SH_SIMPLE_PROMPT /* Set up the prompt */ if (shell_context == 0) { if (PS1) |