From f594986b3745e5b483d699425df61babab816114 Mon Sep 17 00:00:00 2001 From: Mark Whitley Date: Wed, 14 Mar 2001 00:29:14 +0000 Subject: - 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. --- sh.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sh.c') diff --git a/sh.c b/sh.c index 49fb6b536..dcec14aba 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) -- cgit v1.2.3