Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/coreutils/printf.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/coreutils/printf.c (modified) (3 diffs)

branches/3.2/mindi-busybox/coreutils/printf.c

@@ -37 +37 @@
 */
 
-//   19990508 Busy Boxed! Dave Cinege
+/* 19990508 Busy Boxed! Dave Cinege */
+
+//usage:#define printf_trivial_usage
+//usage:       "FORMAT [ARG]..."
+//usage:#define printf_full_usage "\n\n"
+//usage:       "Format and print ARG(s) according to FORMAT (a-la C printf)"
+//usage:
+//usage:#define printf_example_usage
+//usage:       "$ printf \"Val=%d\\n\" 5\n"
+//usage:       "Val=5\n"
 
 #include "libbb.h"
@@ -123 +132 @@
 }
 
+/* Handles %b */
 static void print_esc_string(const char *str)
 {
@@ -128 +138 @@
     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);
     }