aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/ash.c4
-rw-r--r--shell/ash_test/ash-vars/var-expand-tilde-in-parameter-expansion.right1
-rwxr-xr-xshell/ash_test/ash-vars/var-expand-tilde-in-parameter-expansion.tests2
3 files changed, 5 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c
index a81922add..4c43f1f30 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -6361,8 +6361,8 @@ subevalvar(char *p, char *varname, int strloc, int subtype,
6361 // p, varname, strloc, subtype, startloc, varflags, quotes); 6361 // p, varname, strloc, subtype, startloc, varflags, quotes);
6362 6362
6363 herefd = -1; 6363 herefd = -1;
6364 argstr(p, (subtype != VSASSIGN && subtype != VSQUESTION) ? EXP_CASE : 0, 6364 argstr(p, EXP_TILDE | (subtype != VSASSIGN && subtype != VSQUESTION ?
6365 var_str_list); 6365 EXP_CASE : 0), var_str_list);
6366 STPUTC('\0', expdest); 6366 STPUTC('\0', expdest);
6367 herefd = saveherefd; 6367 herefd = saveherefd;
6368 argbackq = saveargbackq; 6368 argbackq = saveargbackq;
diff --git a/shell/ash_test/ash-vars/var-expand-tilde-in-parameter-expansion.right b/shell/ash_test/ash-vars/var-expand-tilde-in-parameter-expansion.right
new file mode 100644
index 000000000..2357750c5
--- /dev/null
+++ b/shell/ash_test/ash-vars/var-expand-tilde-in-parameter-expansion.right
@@ -0,0 +1 @@
:/root
diff --git a/shell/ash_test/ash-vars/var-expand-tilde-in-parameter-expansion.tests b/shell/ash_test/ash-vars/var-expand-tilde-in-parameter-expansion.tests
new file mode 100755
index 000000000..6605315d0
--- /dev/null
+++ b/shell/ash_test/ash-vars/var-expand-tilde-in-parameter-expansion.tests
@@ -0,0 +1,2 @@
1a=~root:~root
2echo ${a#~root}