aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2015-03-23 13:56:37 +0000
committerRon Yorston <rmy@pobox.com>2015-03-23 13:56:37 +0000
commit486a3907f353adeb7f3ced5357db1e604659b785 (patch)
tree5033870835b2b9d5b26ba1f4544943c47893b904 /shell
parent74ba8c760f3337218cddabaaa0acc4e1f5d6e6c5 (diff)
parent1850d5ec0e90fbfb598ed7ad8ff0a63b6e5692ce (diff)
downloadbusybox-w32-486a3907f353adeb7f3ced5357db1e604659b785.tar.gz
busybox-w32-486a3907f353adeb7f3ced5357db1e604659b785.tar.bz2
busybox-w32-486a3907f353adeb7f3ced5357db1e604659b785.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'shell')
-rw-r--r--shell/ash.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/shell/ash.c b/shell/ash.c
index df7083370..8cc3f0872 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -6108,7 +6108,6 @@ exptilde(char *startp, char *p, int flags)
6108 struct passwd *pw; 6108 struct passwd *pw;
6109 const char *home; 6109 const char *home;
6110 int quotes = flags & (EXP_FULL | EXP_CASE | EXP_REDIR); 6110 int quotes = flags & (EXP_FULL | EXP_CASE | EXP_REDIR);
6111 int startloc;
6112 6111
6113 name = p + 1; 6112 name = p + 1;
6114 6113
@@ -6140,9 +6139,7 @@ exptilde(char *startp, char *p, int flags)
6140 if (!home || !*home) 6139 if (!home || !*home)
6141 goto lose; 6140 goto lose;
6142 *p = c; 6141 *p = c;
6143 startloc = expdest - (char *)stackblock();
6144 strtodest(home, SQSYNTAX, quotes); 6142 strtodest(home, SQSYNTAX, quotes);
6145 recordregion(startloc, expdest - (char *)stackblock(), 0);
6146 return p; 6143 return p;
6147 lose: 6144 lose:
6148 *p = c; 6145 *p = c;