diff options
| author | Eric Andersen <andersen@codepoet.org> | 2001-05-22 00:30:51 +0400 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2001-05-22 00:30:51 +0400 |
| commit | 004015e9c4e8ff98bcbaf955cf42147218204da4 (patch) | |
| tree | b6f1eb9281b70d0723d82a68ed090e619dbbf606 /shell/lash.c | |
| parent | abec344ab7060d940f133d93b76e6bbe5881e205 (diff) | |
Patch from Lars Kellogg-Stedman <lars@larsshack.org> to fix bug
#1130 (i.e. When you turn on features it should always ADD features)
Diffstat (limited to 'shell/lash.c')
| -rw-r--r-- | shell/lash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/shell/lash.c b/shell/lash.c index cb17e2d75..f1200ba95 100644 --- a/shell/lash.c +++ b/shell/lash.c @@ -436,7 +436,7 @@ static int builtin_export(struct child_prog *child) res = putenv(v); if (res) fprintf(stderr, "export: %m\n"); -#ifndef BB_FEATURE_SH_SIMPLE_PROMPT +#ifdef BB_FEATURE_SH_FANCY_PROMPT if (strncmp(v, "PS1=", 4)==0) PS1 = getenv("PS1"); #endif @@ -809,7 +809,7 @@ static void restore_redirects(int squirrel[]) static inline void cmdedit_set_initial_prompt(void) { -#ifdef BB_FEATURE_SH_SIMPLE_PROMPT +#ifndef BB_FEATURE_SH_FANCY_PROMPT PS1 = NULL; #else PS1 = getenv("PS1"); @@ -820,7 +820,7 @@ static inline void cmdedit_set_initial_prompt(void) static inline void setup_prompt_string(char **prompt_str) { -#ifdef BB_FEATURE_SH_SIMPLE_PROMPT +#ifndef BB_FEATURE_SH_FANCY_PROMPT /* Set up the prompt */ if (shell_context == 0) { if (PS1) |