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

convert some of the ENABLE_FEATURE_EDITING from CPP if to C if

Browse Source
This commit is contained in:
Mike Frysinger 2009-03-28 12:24:44 +00:00
parent 39456a18a1
commit ec2c655702
1 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
shell/hush.c
View File

@ -1035,35 +1035,30 @@ static int static_peek(struct in_str *i)
#if ENABLE_HUSH_INTERACTIVE #if ENABLE_HUSH_INTERACTIVE
#if ENABLE_FEATURE_EDITING
static void cmdedit_set_initial_prompt(void) static void cmdedit_set_initial_prompt(void)
{ {
#if !ENABLE_FEATURE_EDITING_FANCY_PROMPT if (ENABLE_FEATURE_EDITING_FANCY_PROMPT) {
G.PS1 = NULL; G.PS1 = getenv("PS1");
#else if (G.PS1 == NULL)
G.PS1 = getenv("PS1"); G.PS1 = "\\w \\$ ";
if (G.PS1 == NULL) } else
G.PS1 = "\\w \\$ "; G.PS1 = NULL;
#endif
} }
#endif /* EDITING */
static const char* setup_prompt_string(int promptmode) static const char* setup_prompt_string(int promptmode)
{ {
const char *prompt_str; const char *prompt_str;
debug_printf("setup_prompt_string %d ", promptmode); debug_printf("setup_prompt_string %d ", promptmode);
#if !ENABLE_FEATURE_EDITING_FANCY_PROMPT if (!ENABLE_FEATURE_EDITING_FANCY_PROMPT) {
/* Set up the prompt */ /* Set up the prompt */
if (promptmode == 0) { /* PS1 */ if (promptmode == 0) { /* PS1 */
free((char*)G.PS1); free((char*)G.PS1);
G.PS1 = xasprintf("%s %c ", G.cwd, (geteuid() != 0) ? '$' : '#'); G.PS1 = xasprintf("%s %c ", G.cwd, (geteuid() != 0) ? '$' : '#');
prompt_str = G.PS1; prompt_str = G.PS1;
} else { } else
prompt_str = G.PS2; prompt_str = G.PS2;
} } else
#else prompt_str = (promptmode == 0) ? G.PS1 : G.PS2;
prompt_str = (promptmode == 0) ? G.PS1 : G.PS2;
#endif
debug_printf("result '%s'\n", prompt_str); debug_printf("result '%s'\n", prompt_str);
return prompt_str; return prompt_str;
} }
@ -4224,9 +4219,8 @@ int hush_main(int argc, char **argv)
/* Initialize some more globals to non-zero values */ /* Initialize some more globals to non-zero values */
set_cwd(); set_cwd();
#if ENABLE_HUSH_INTERACTIVE #if ENABLE_HUSH_INTERACTIVE
#if ENABLE_FEATURE_EDITING if (ENABLE_FEATURE_EDITING)
cmdedit_set_initial_prompt(); cmdedit_set_initial_prompt();
#endif
G.PS2 = "> "; G.PS2 = "> ";
#endif #endif