[git commit] ash: fix $HOME/.profile reading if !ASH_EXPAND_PRMT

Denys Vlasenko vda.linux at googlemail.com
Tue Jun 27 15:51:07 UTC 2017


commit: https://git.busybox.net/busybox/commit/?id=f56ddf2e4ce42d7914d048f42fd952302027e8a3
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 shell/ash.c | 6 ------
 1 file changed, 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.


More information about the busybox-cvs mailing list