X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Fprocess_escape_sequence.c;h=346ecfa1e2c0c5de4bc299ee10c12d4c465ce685;hb=6b0695bb66dd38af4d4671fb2381fa3e1dbfe90c;hp=3ad908b57e07b14eb878b672a2eb7c1d4c378bb1;hpb=00f0ef4a0cd58582a15afcc77f4601013ce0861c;p=oweals%2Fbusybox.git

diff --git a/libbb/process_escape_sequence.c b/libbb/process_escape_sequence.c
index 3ad908b57..346ecfa1e 100644
--- a/libbb/process_escape_sequence.c
+++ b/libbb/process_escape_sequence.c
@@ -5,7 +5,7 @@
  * 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 "libbb.h"
@@ -18,52 +18,42 @@
 
 char FAST_FUNC bb_process_escape_sequence(const char **ptr)
 {
-	/* 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;
 	const char *q;
 	unsigned num_digits;
-	unsigned r;
 	unsigned n;
-	unsigned d;
 	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 char)(*q) - '0';
-#ifdef WANT_HEX_ESCAPES
-		if (d >= 10) {
-			d = (unsigned char)(_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;
 		}
 
@@ -76,21 +66,47 @@ char FAST_FUNC 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);
+		} while (*++p != '\0');
 		/* p points to found escape char or NUL,
-		 * advance it and find what it translates to */
-		p += sizeof(charmap) / 2;
-		n = *p;
+		 * 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++;
+	}
+}