From f56ddf2e4ce42d7914d048f42fd952302027e8a3 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 27 Jun 2017 17:51:07 +0200 Subject: ash: fix $HOME/.profile reading if !ASH_EXPAND_PRMT Signed-off-by: Denys Vlasenko --- shell/ash.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'shell') diff --git a/shell/ash.c b/shell/ash.c index eb51d47cc..9681111cc 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -2458,12 +2458,8 @@ putprompt(const char *s) } #endif -#if ENABLE_ASH_EXPAND_PRMT /* expandstr() needs parsing machinery, so it is far away ahead... */ static const char *expandstr(const char *ps); -#else -#define expandstr(s) s -#endif static void 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. */ -#if ENABLE_ASH_EXPAND_PRMT static const char * expandstr(const char *ps) { @@ -12475,7 +12470,6 @@ expandstr(const char *ps) expandarg(&n, NULL, EXP_QUOTED); return stackblock(); } -#endif /* * Execute a command or commands contained in a string. -- cgit v1.2.3