emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch from Lars Kellogg-Stedman <lars@larsshack.org> to fix bug

Browse Source 
#1130 (i.e. When you turn on features it should always ADD features)
This commit is contained in:
Eric Andersen
2001-05-21 20:30:51 +00:00
parent abec344ab7
commit 004015e9c4
14 changed files with 62 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
shell/hush.c
View File

@ -113,7 +113,7 @@
#define applet_name "hush"
#include "standalone.h"
#define shell_main main
#define BB_FEATURE_SH_SIMPLE_PROMPT
#undef BB_FEATURE_SH_FANCY_PROMPT
#endif
typedef enum {
@ -843,7 +843,7 @@ static int static_peek(struct in_str *i)
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");
@ -855,7 +855,7 @@ static inline void cmdedit_set_initial_prompt(void)
static inline void setup_prompt_string(int promptmode, char **prompt_str)
{
debug_printf("setup_prompt_string %d ",promptmode);
#ifdef BB_FEATURE_SH_SIMPLE_PROMPT
#ifndef BB_FEATURE_SH_FANCY_PROMPT
/* Set up the prompt */
if (promptmode == 1) {
if (PS1)