Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/process_escape_sequence.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/process_escape_sequence.c (modified) (6 diffs)

branches/2.2.9/mindi-busybox/libbb/process_escape_sequence.c

@@ -6 +6 @@
  * and Vladimir Oleynik <dzo@simtreas.ru>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
@@ -17 +17 @@
 #define _tolower(X) ((X)|((char) 0x20))
 
-char bb_process_escape_sequence(const char **ptr)
+char FAST_FUNC bb_process_escape_sequence(const char **ptr)
 {
-    static const char charmap[] ALIGN1 = {
-        'a',  'b',  'f',  'n',  'r',  't',  'v',  '\\', 0,
-        '\a', '\b', '\f', '\n', '\r', '\t', '\v', '\\', '\\' };
-
-    const char *p;
     const char *q;
-    unsigned int num_digits;
-    unsigned int r;
-    unsigned int n;
-    unsigned int d;
-    unsigned int base;
+    unsigned num_digits;
+    unsigned n;
+    unsigned base;
 
     num_digits = n = 0;
@@ -35 +28 @@
     q = *ptr;
 
-#ifdef WANT_HEX_ESCAPES
-    if (*q == 'x') {
+    if (WANT_HEX_ESCAPES && *q == 'x') {
         ++q;
         base = 16;
         ++num_digits;
     }
+
+    /* bash requires leading 0 in octal escapes:
+     * \02 works, \2 does not (prints \ and 2).
+     * We treat \2 as a valid octal escape sequence. */
+    do {
+        unsigned r;
+#if !WANT_HEX_ESCAPES
+        unsigned d = (unsigned char)(*q) - '0';
+#else
+        unsigned d = (unsigned char)_tolower(*q) - '0';
+        if (d >= 10)
+            d += ('0' - 'a' + 10);
 #endif
-
-    do {
-        d = (unsigned char)(*q) - '0';
-#ifdef WANT_HEX_ESCAPES
-        if (d >= 10) {
-            d = (unsigned char)(_tolower(*q)) - 'a' + 10;
-        }
-#endif
-
         if (d >= base) {
-#ifdef WANT_HEX_ESCAPES
-            if ((base == 16) && (!--num_digits)) {
-/*              return '\\'; */
-                --q;
+            if (WANT_HEX_ESCAPES && base == 16) {
+                --num_digits;
+                if (num_digits == 0) {
+                    /* \x<bad_char>: return '\',
+                     * leave ptr pointing to x */
+                    return '\\';
+                }
             }
-#endif
             break;
         }
@@ -70 +67 @@
     } while (++num_digits < 3);
 
-    if (num_digits == 0) {  /* mnemonic escape sequence? */
-        p = charmap;
+    if (num_digits == 0) {
+        /* Not octal or hex escape sequence.
+         * Is it one-letter one? */
+
+        /* bash builtin "echo -e '\ec'" interprets \e as ESC,
+         * but coreutils "/bin/echo -e '\ec'" does not.
+         * Manpages tend to support coreutils way.
+         * Update: coreutils added support for \e on 28 Oct 2009. */
+        static const char charmap[] ALIGN1 = {
+            'a',  'b', 'e', 'f',  'n',  'r',  't',  'v',  '\\', '\0',
+            '\a', '\b', 27, '\f', '\n', '\r', '\t', '\v', '\\', '\\',
+        };
+        const char *p = charmap;
         do {
             if (*p == *q) {
@@ -77 +85 @@
                 break;
             }
-        } while (*++p);
-        n = *(p + (sizeof(charmap)/2));
+        } while (*++p != '\0');
+        /* p points to found escape char or NUL,
+         * advance it and find what it translates to.
+         * Note that \NUL and unrecognized sequence \z return '\'
+         * and leave ptr pointing to NUL or z. */
+        n = p[sizeof(charmap) / 2];
     }
 
@@ -85 +97 @@
     return (char) n;
 }
+
+char* FAST_FUNC strcpy_and_process_escape_sequences(char *dst, const char *src)
+{
+    while (1) {
+        char c, c1;
+        c = c1 = *src++;
+        if (c1 == '\\')
+            c1 = bb_process_escape_sequence(&src);
+        *dst = c1;
+        if (c == '\0')
+            return dst;
+        dst++;
+    }
+}