diff options
author | Ron Yorston <rmy@pobox.com> | 2024-06-23 09:35:35 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2024-06-23 09:44:03 +0100 |
commit | b07c177b446498ccd739b367f9e80337c3dfa55a (patch) | |
tree | 8230bce5f937e46ae1a6f18677904d2eccc4ae9e /shell/ash.c | |
parent | 1b094d366f808a2ebc4824004f0d6f75f13c09cb (diff) | |
parent | a6ce017a8a2db09c6f23aa6abf7ce21fd00c2fdf (diff) | |
download | busybox-w32-b07c177b446498ccd739b367f9e80337c3dfa55a.tar.gz busybox-w32-b07c177b446498ccd739b367f9e80337c3dfa55a.tar.bz2 busybox-w32-b07c177b446498ccd739b367f9e80337c3dfa55a.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'shell/ash.c')
-rw-r--r-- | shell/ash.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/shell/ash.c b/shell/ash.c index 817b5635f..9ef8f7742 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -7884,6 +7884,11 @@ subevalvar(char *start, char *str, int strloc, | |||
7884 | repl = NULL; | 7884 | repl = NULL; |
7885 | break; | 7885 | break; |
7886 | } | 7886 | } |
7887 | /* Skip over quoted 'str'. Example: ${var/'/'} - second / is not a separator */ | ||
7888 | if ((unsigned char)*repl == CTLQUOTEMARK) { | ||
7889 | while ((unsigned char)*++repl != CTLQUOTEMARK) | ||
7890 | continue; | ||
7891 | } | ||
7887 | if (*repl == '/') { | 7892 | if (*repl == '/') { |
7888 | *repl = '\0'; | 7893 | *repl = '\0'; |
7889 | break; | 7894 | break; |