aboutsummaryrefslogtreecommitdiff
path: root/shell/hush.c
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-05-21 20:30:51 +0000
committerEric Andersen <andersen@codepoet.org>2001-05-21 20:30:51 +0000
commit004015e9c4e8ff98bcbaf955cf42147218204da4 (patch)
treeb6f1eb9281b70d0723d82a68ed090e619dbbf606 /shell/hush.c
parentabec344ab7060d940f133d93b76e6bbe5881e205 (diff)
downloadbusybox-w32-004015e9c4e8ff98bcbaf955cf42147218204da4.tar.gz
busybox-w32-004015e9c4e8ff98bcbaf955cf42147218204da4.tar.bz2
busybox-w32-004015e9c4e8ff98bcbaf955cf42147218204da4.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)
Diffstat (limited to 'shell/hush.c')
-rw-r--r--shell/hush.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/shell/hush.c b/shell/hush.c
index fc45bb270..722dcf7ac 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -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
119typedef enum { 119typedef enum {
@@ -843,7 +843,7 @@ static int static_peek(struct in_str *i)
843 843
844static inline void cmdedit_set_initial_prompt(void) 844static 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)
855static inline void setup_prompt_string(int promptmode, char **prompt_str) 855static 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)