summaryrefslogtreecommitdiff
path: root/sh.c
diff options
context:
space:
mode:
authorMark Whitley2001-03-14 00:29:14 +0000
committerMark Whitley2001-03-14 00:29:14 +0000
commitf594986b3745e5b483d699425df61babab816114 (patch)
tree47f18a0199d8436d2d663ffa15fbdee4855bba35 /sh.c
parentc75f83d8740c57cd498056d43170cbdca0729275 (diff)
downloadbusybox-f594986b3745e5b483d699425df61babab816114.zip
busybox-f594986b3745e5b483d699425df61babab816114.tar.gz
- Changed name of BB_FEATURE_SIMPLE_PROMPT to BB_FEATURE_SH_SIMPLE_PROMPT
- Set BB_FEATURE_SH_STANDALONE_SHELL and BB_FEATURE_SH_APPLETS_ALWAYS_WIN to be off by default - Set BB_FEATURE_SH_SIMPLE_PROMPT to be on by default - Added some more magic to the Olympus section to make all the dependencies on the shell, cmdline editing, tab completion and friend work properly. - Tidied up the Olympus section with some whitespace. Checked the various scrips that parse through there and the extra whitespace shouldn't break anything.
Diffstat (limited to 'sh.c')
-rw-r--r--sh.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sh.c b/sh.c
index 49fb6b5..dcec14a 100644
--- a/sh.c
+++ b/sh.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)