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

ash: fix $HOME/.profile reading if !ASH_EXPAND_PRMT

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-06-27 17:51:07 +02:00
parent 9f4b4226a4
commit f56ddf2e4c
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shell/ash.c
View File

@ -2458,12 +2458,8 @@ putprompt(const char *s)
} }
#endif #endif
#if ENABLE_ASH_EXPAND_PRMT
/* expandstr() needs parsing machinery, so it is far away ahead... */ /* expandstr() needs parsing machinery, so it is far away ahead... */
static const char *expandstr(const char *ps); static const char *expandstr(const char *ps);
#else
#define expandstr(s) s
#endif
static void static void
setprompt_if(smallint do_set, int whichprompt) setprompt_if(smallint do_set, int whichprompt)
@ -12449,7 +12445,6 @@ parseheredoc(void)
/* /*
* called by editline -- any expansions to the prompt should be added here. * called by editline -- any expansions to the prompt should be added here.
*/ */
#if ENABLE_ASH_EXPAND_PRMT
static const char * static const char *
expandstr(const char *ps) expandstr(const char *ps)
{ {
@ -12475,7 +12470,6 @@ expandstr(const char *ps)
expandarg(&n, NULL, EXP_QUOTED); expandarg(&n, NULL, EXP_QUOTED);
return stackblock(); return stackblock();
} }
#endif
/* /*
* Execute a command or commands contained in a string. * Execute a command or commands contained in a string.