From 75a76269ba2549cb5392d7d720a4c393de01b934 Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Mon, 16 Mar 2015 14:14:11 +0000 Subject: ash: do not split the result of tilde expansion A tilde expansion generates a valid pathname. Splitting it using IFS either leaves it unchanged or changes it to something unintended. Example: IFS=m HOME=/tmp; printf "%s\n" ~ Based on this commit authored by Jilles Tjoelker: http://git.kernel.org/cgit/utils/dash/dash.git/commit/?id=834629283f6c629a4da05ef60bae9445c954a19a Signed-off-by: Ron Yorston Signed-off-by: Denys Vlasenko --- shell/ash.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/shell/ash.c b/shell/ash.c index 0f9f73e..b568013 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -5791,7 +5791,6 @@ exptilde(char *startp, char *p, int flags) struct passwd *pw; const char *home; int quotes = flags & (EXP_FULL | EXP_CASE | EXP_REDIR); - int startloc; name = p + 1; @@ -5823,9 +5822,7 @@ exptilde(char *startp, char *p, int flags) if (!home || !*home) goto lose; *p = c; - startloc = expdest - (char *)stackblock(); strtodest(home, SQSYNTAX, quotes); - recordregion(startloc, expdest - (char *)stackblock(), 0); return p; lose: *p = c; -- cgit v1.1