[git commit] ash: expand: Use HOME in tilde expansion when it is empty

Denys Vlasenko vda.linux at googlemail.com
Sun Feb 16 18:16:35 UTC 2020


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

Upstream commit:

    Date: Sun, 27 May 2018 17:31:57 +0800
    expand: Use HOME in tilde expansion when it is empty

    Currently if HOME is set to empty tilde expansion will fail, i.e.,
    it will remain as a literal tilde.  This patch changes it to
    return the empty string as required by POSIX.

    Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 shell/ash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/ash.c b/shell/ash.c
index 78ca1d99c..138f19abd 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -6440,7 +6440,7 @@ exptilde(char *startp, char *p, int flags)
 			goto lose;
 		home = pw->pw_dir;
 	}
-	if (!home || !*home)
+	if (!home)
 		goto lose;
 	*p = c;
 	strtodest(home, SQSYNTAX, quotes);


More information about the busybox-cvs mailing list