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

hush: fix PS1 prompth in !EDITING config

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2020-12-23 15:29:13 +01:00
parent a7b52d26c4
commit 649acb9e23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shell/hush.c
View File

@ -2619,7 +2619,7 @@ static const char *setup_prompt_string(void)
/* bash uses $PWD value, even if it is set by user. /* bash uses $PWD value, even if it is set by user.
* It uses current dir only if PWD is unset. * It uses current dir only if PWD is unset.
* We always use current dir. */ * We always use current dir. */
G.PS1 = xasprintf("%s %c ", get_cwd(0), (geteuid() != 0) ? '$' : '#'); prompt_str = G.PS1 = xasprintf("%s %c ", get_cwd(0), (geteuid() != 0) ? '$' : '#');
} }
# endif # endif
debug_printf("prompt_str '%s'\n", prompt_str); debug_printf("prompt_str '%s'\n", prompt_str);
@ -2709,14 +2709,14 @@ static int fgetc_interactive(struct in_str *i)
} }
return ch; return ch;
} }
#else #else /* !INTERACTIVE */
static ALWAYS_INLINE int fgetc_interactive(struct in_str *i) static ALWAYS_INLINE int fgetc_interactive(struct in_str *i)
{ {
int ch; int ch;
do ch = hfgetc(i->file); while (ch == '\0'); do ch = hfgetc(i->file); while (ch == '\0');
return ch; return ch;
} }
#endif /* INTERACTIVE */ #endif /* !INTERACTIVE */
static int i_getch(struct in_str *i) static int i_getch(struct in_str *i)
{ {