diff options
author | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-05-21 20:30:51 +0000 |
---|---|---|
committer | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-05-21 20:30:51 +0000 |
commit | 9cf9dad93666777f825ef46617056871534bec1f (patch) | |
tree | b6f1eb9281b70d0723d82a68ed090e619dbbf606 /hush.c | |
parent | 63a2ff929f13762d6d843471d1364c99959c7466 (diff) | |
download | busybox-w32-9cf9dad93666777f825ef46617056871534bec1f.tar.gz busybox-w32-9cf9dad93666777f825ef46617056871534bec1f.tar.bz2 busybox-w32-9cf9dad93666777f825ef46617056871534bec1f.zip |
Patch from Lars Kellogg-Stedman <lars@larsshack.org> to fix bug
#1130 (i.e. When you turn on features it should always ADD features)
git-svn-id: svn://busybox.net/trunk/busybox@2690 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'hush.c')
-rw-r--r-- | hush.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -113,7 +113,7 @@ | |||
113 | #define applet_name "hush" | 113 | #define applet_name "hush" |
114 | #include "standalone.h" | 114 | #include "standalone.h" |
115 | #define shell_main main | 115 | #define shell_main main |
116 | #define BB_FEATURE_SH_SIMPLE_PROMPT | 116 | #undef BB_FEATURE_SH_FANCY_PROMPT |
117 | #endif | 117 | #endif |
118 | 118 | ||
119 | typedef enum { | 119 | typedef enum { |
@@ -843,7 +843,7 @@ static int static_peek(struct in_str *i) | |||
843 | 843 | ||
844 | static inline void cmdedit_set_initial_prompt(void) | 844 | static inline void cmdedit_set_initial_prompt(void) |
845 | { | 845 | { |
846 | #ifdef BB_FEATURE_SH_SIMPLE_PROMPT | 846 | #ifndef BB_FEATURE_SH_FANCY_PROMPT |
847 | PS1 = NULL; | 847 | PS1 = NULL; |
848 | #else | 848 | #else |
849 | PS1 = getenv("PS1"); | 849 | PS1 = getenv("PS1"); |
@@ -855,7 +855,7 @@ static inline void cmdedit_set_initial_prompt(void) | |||
855 | static inline void setup_prompt_string(int promptmode, char **prompt_str) | 855 | static inline void setup_prompt_string(int promptmode, char **prompt_str) |
856 | { | 856 | { |
857 | debug_printf("setup_prompt_string %d ",promptmode); | 857 | debug_printf("setup_prompt_string %d ",promptmode); |
858 | #ifdef BB_FEATURE_SH_SIMPLE_PROMPT | 858 | #ifndef BB_FEATURE_SH_FANCY_PROMPT |
859 | /* Set up the prompt */ | 859 | /* Set up the prompt */ |
860 | if (promptmode == 1) { | 860 | if (promptmode == 1) { |
861 | if (PS1) | 861 | if (PS1) |