summaryrefslogtreecommitdiff
path: root/shell/ash.c
diff options
context:
space:
mode:
authorDenys Vlasenko2017-07-05 22:19:28 +0200
committerDenys Vlasenko2017-07-05 22:19:28 +0200
commit4142f0187dcf8454e8d2a8d16b321dbd573c170e (patch)
tree88fca8c1cc9b6b213160d386c66ede7026bf7c08 /shell/ash.c
parented79a636238ec15c562862787dd71cd9de168b7d (diff)
downloadbusybox-4142f0187dcf8454e8d2a8d16b321dbd573c170e.zip
busybox-4142f0187dcf8454e8d2a8d16b321dbd573c170e.tar.gz
ash: fix escaping of a few characters (broken by last commits)
Add a testcase which tests all ASCII punctuation escapes. NB: hush is failing this test! Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell/ash.c')
-rw-r--r--shell/ash.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c
index 9b1f579..946e872 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -5939,12 +5939,17 @@ rmescapes(char *str, int flag)
* (for example, glibc <= 2.22).
*
* Lets add "\" only on the chars which need it.
+ * Testcases for less obvious chars are shown.
*/
if (*p == '*'
|| *p == '?'
|| *p == '['
- /* || *p == ']' maybe also this? */
- || *p == '\\'
+ || *p == '\\' /* case '\' in \\ ) echo ok;; *) echo WRONG;; esac */
+ || *p == ']' /* case ']' in [a\]] ) echo ok;; *) echo WRONG;; esac */
+ || *p == '-' /* case '-' in [a\-c]) echo ok;; *) echo WRONG;; esac */
+ || *p == '!' /* case '!' in [\!] ) echo ok;; *) echo WRONG;; esac */
+ /* Some libc support [^negate], that's why "^" also needs love */
+ || *p == '^' /* case '^' in [\^] ) echo ok;; *) echo WRONG;; esac */
) {
*q++ = '\\';
}