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 9a16f80..346ecfa 100644 (file)
--- a/libbb/process_escape_sequence.c
+++ b/libbb/process_escape_sequence.c
@@ -2,79 +2,111 @@
 /*
  * Utility routines.
  *
- * Copyright (C) Manuel Nova III <mnovoa3@bellsouth.net>
+ * Copyright (C) Manuel Novoa III <mjn3@codepoet.org>
  * and Vladimir Oleynik <dzo@simtreas.ru>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * 
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
-#include <stdio.h>
-#include <limits.h>
 #include "libbb.h"
 
+#define WANT_HEX_ESCAPES 1
 
+/* Usual "this only works for ascii compatible encodings" disclaimer. */
+#undef _tolower
+#define _tolower(X) ((X)|((char) 0x20))
 
-char 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;
-       int num_digits;
-       unsigned int n;
-       
-       n = 0;
+       unsigned num_digits;
+       unsigned n;
+       unsigned base;
+
+       num_digits = n = 0;
+       base = 8;
        q = *ptr;
 
-       for ( num_digits = 0 ; num_digits < 3 ; ++num_digits) {
-               if ((*q < '0') || (*q > '7')) { /* not a digit? */
+       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
+               if (d >= base) {
+                       if (WANT_HEX_ESCAPES && base == 16) {
+                               --num_digits;
+                               if (num_digits == 0) {
+                                       /* \x<bad_char>: return '\',
+                                        * leave ptr pointing to x */
+                                       return '\\';
+                               }
+                       }
+                       break;
+               }
+
+               r = n * base + d;
+               if (r > UCHAR_MAX) {
                        break;
                }
-               n = n * 8 + (*q++ - '0');
-       }
 
-       if (num_digits == 0) {  /* mnemonic escape sequence? */
-               for (p=charmap ; *p ; p++) {
+               n = r;
+               ++q;
+       } while (++num_digits < 3);
+
+       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;
                        }
-               }
-               n = *(p+(sizeof(charmap)/2));
-       }
-
-          /* doesn't hurt to fall through to here from mnemonic case */
-       if (n > UCHAR_MAX) {    /* is octal code too big for a char? */
-               n /= 8;                 /* adjust value and */
-               --q;                            /* back up one char */
+               } 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;
 }
 
-
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/
+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++;
+       }
+}