aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-06-27 17:51:07 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2017-06-27 17:51:07 +0200
commitf56ddf2e4ce42d7914d048f42fd952302027e8a3 (patch)
treef0eae6739f6b06f9ddd5a3809a9e85b54a3c230f
parent9f4b4226a4df67b4305f5dcb0df32cba26d8463a (diff)
downloadbusybox-w32-f56ddf2e4ce42d7914d048f42fd952302027e8a3.tar.gz
busybox-w32-f56ddf2e4ce42d7914d048f42fd952302027e8a3.tar.bz2
busybox-w32-f56ddf2e4ce42d7914d048f42fd952302027e8a3.zip
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 eb51d47cc..9681111cc 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -2458,12 +2458,8 @@ putprompt(const char *s)
2458} 2458}
2459#endif 2459#endif
2460 2460
2461#if ENABLE_ASH_EXPAND_PRMT
2462/* expandstr() needs parsing machinery, so it is far away ahead... */ 2461/* expandstr() needs parsing machinery, so it is far away ahead... */
2463static const char *expandstr(const char *ps); 2462static const char *expandstr(const char *ps);
2464#else
2465#define expandstr(s) s
2466#endif
2467 2463
2468static void 2464static void
2469setprompt_if(smallint do_set, int whichprompt) 2465setprompt_if(smallint do_set, int whichprompt)
@@ -12449,7 +12445,6 @@ parseheredoc(void)
12449/* 12445/*
12450 * called by editline -- any expansions to the prompt should be added here. 12446 * called by editline -- any expansions to the prompt should be added here.
12451 */ 12447 */
12452#if ENABLE_ASH_EXPAND_PRMT
12453static const char * 12448static const char *
12454expandstr(const char *ps) 12449expandstr(const char *ps)
12455{ 12450{
@@ -12475,7 +12470,6 @@ expandstr(const char *ps)
12475 expandarg(&n, NULL, EXP_QUOTED); 12470 expandarg(&n, NULL, EXP_QUOTED);
12476 return stackblock(); 12471 return stackblock();
12477} 12472}
12478#endif
12479 12473
12480/* 12474/*
12481 * Execute a command or commands contained in a string. 12475 * Execute a command or commands contained in a string.