Bump to version 1.22.1

[platform/upstream/busybox.git] / libbb / process_escape_sequence.c

diff --git a/libbb/process_escape_sequence.c b/libbb/process_escape_sequence.c
index 138e751..346ecfa 100644 (file)
--- a/libbb/process_escape_sequence.c
+++ b/libbb/process_escape_sequence.c
@@ -5,12 +5,9 @@
  * Copyright (C) Manuel Novoa III <mjn3@codepoet.org>
  * 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.
  */
 
-#include <stdio.h>
-#include <limits.h>
-#include <ctype.h>
 #include "libbb.h"
 
 #define WANT_HEX_ESCAPES 1
@@ -19,47 +16,44 @@
 #undef _tolower
 #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[] = {
-               '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;
        base = 8;
        q = *ptr;
 
-#ifdef WANT_HEX_ESCAPES
-       if (*q == 'x') {
+       if (WANT_HEX_ESCAPES && *q == 'x') {
                ++q;
                base = 16;
                ++num_digits;
        }
-#endif
 
+       /* 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 {
-               d = (unsigned int)(*q - '0');
-#ifdef WANT_HEX_ESCAPES
-               if (d >= 10) {
-                       d = ((unsigned int)(_tolower(*q) - 'a')) + 10;
-               }
+               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
-
                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;
                }
 
@@ -72,18 +66,47 @@ char bb_process_escape_sequence(const char **ptr)
                ++q;
        } 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) {
                                q++;
                                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];
        }
 
        *ptr = q;
 
        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++;
+       }
+}