diff options
-rw-r--r-- | shell/hush.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/shell/hush.c b/shell/hush.c index 9403e1f6c..c4381f7a7 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
@@ -2619,7 +2619,7 @@ static const char *setup_prompt_string(void) | |||
2619 | /* bash uses $PWD value, even if it is set by user. | 2619 | /* bash uses $PWD value, even if it is set by user. |
2620 | * It uses current dir only if PWD is unset. | 2620 | * It uses current dir only if PWD is unset. |
2621 | * We always use current dir. */ | 2621 | * We always use current dir. */ |
2622 | G.PS1 = xasprintf("%s %c ", get_cwd(0), (geteuid() != 0) ? '$' : '#'); | 2622 | prompt_str = G.PS1 = xasprintf("%s %c ", get_cwd(0), (geteuid() != 0) ? '$' : '#'); |
2623 | } | 2623 | } |
2624 | # endif | 2624 | # endif |
2625 | debug_printf("prompt_str '%s'\n", prompt_str); | 2625 | debug_printf("prompt_str '%s'\n", prompt_str); |
@@ -2709,14 +2709,14 @@ static int fgetc_interactive(struct in_str *i) | |||
2709 | } | 2709 | } |
2710 | return ch; | 2710 | return ch; |
2711 | } | 2711 | } |
2712 | #else | 2712 | #else /* !INTERACTIVE */ |
2713 | static ALWAYS_INLINE int fgetc_interactive(struct in_str *i) | 2713 | static ALWAYS_INLINE int fgetc_interactive(struct in_str *i) |
2714 | { | 2714 | { |
2715 | int ch; | 2715 | int ch; |
2716 | do ch = hfgetc(i->file); while (ch == '\0'); | 2716 | do ch = hfgetc(i->file); while (ch == '\0'); |
2717 | return ch; | 2717 | return ch; |
2718 | } | 2718 | } |
2719 | #endif /* INTERACTIVE */ | 2719 | #endif /* !INTERACTIVE */ |
2720 | 2720 | ||
2721 | static int i_getch(struct in_str *i) | 2721 | static int i_getch(struct in_str *i) |
2722 | { | 2722 | { |