summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko2017-06-27 17:51:07 +0200
committerDenys Vlasenko2017-06-27 17:51:07 +0200
commitf56ddf2e4ce42d7914d048f42fd952302027e8a3 (patch)
treef0eae6739f6b06f9ddd5a3809a9e85b54a3c230f
parent9f4b4226a4df67b4305f5dcb0df32cba26d8463a (diff)
downloadbusybox-f56ddf2e4ce42d7914d048f42fd952302027e8a3.zip
busybox-f56ddf2e4ce42d7914d048f42fd952302027e8a3.tar.gz
ash: fix $HOME/.profile reading if !ASH_EXPAND_PRMT
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--shell/ash.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/shell/ash.c b/shell/ash.c
index eb51d47..9681111 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.