From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Wed, 7 Mar 2012 10:57:47 +0000 (+0100)
Subject: printf: fix this case: printf "%b" '\0057usr\0057bin\n'
X-Git-Tag: 1_20_0~39
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=69d81a1c1b2e4881b751ee24f8eb70c0dfaa05d9;p=oweals%2Fbusybox.git

printf: fix this case: printf "%b" '\0057usr\0057bin\n'

It was not accepting \0NNN. Standard printf tool does.

function                                             old     new   delta
printf_main                                          869     886     +17

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/coreutils/printf.c b/coreutils/printf.c
index 1437951a8..3dd43a978 100644
--- a/coreutils/printf.c
+++ b/coreutils/printf.c
@@ -131,13 +131,28 @@ static double my_xstrtod(const char *arg)
 	return result;
 }
 
+/* Handles %b */
 static void print_esc_string(const char *str)
 {
 	char c;
 	while ((c = *str) != '\0') {
 		str++;
-		if (c == '\\')
-			c = bb_process_escape_sequence(&str);
+		if (c == '\\') {
+			/* %b also accepts 4-digit octals of the form \0### */
+			if (*str == '0') {
+				if ((unsigned char)(str[1] - '0') < 8) {
+					/* 2nd char is 0..7: skip leading '0' */
+					str++;
+				}
+			}
+			{
+				/* optimization: don't force arg to be on-stack,
+				 * use another variable for that. */
+				const char *z = str;
+				c = bb_process_escape_sequence(&z);
+				str = z;
+			}
+		}
 		putchar(c);
 	}
 }