Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/coreutils/printf.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/coreutils/printf.c (modified) (4 diffs)

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

@@ -132 +132 @@
 }
 
-/* Handles %b */
-static void print_esc_string(const char *str)
+/* Handles %b; return 1 if output is to be short-circuited by \c */
+static int print_esc_string(const char *str)
 {
     char c;
@@ -146 +146 @@
                 }
             }
+            else if (*str == 'c') {
+                return 1;
+            }
             {
                 /* optimization: don't force arg to be on-stack,
@@ -156 +159 @@
         putchar(c);
     }
+
+    return 0;
 }
 
@@ -281 +286 @@
             if (*f == 'b') {
                 if (*argv) {
-                    print_esc_string(*argv);
+                    if (print_esc_string(*argv))
+                        return saved_argv; /* causes main() to exit */
                     ++argv;
                 }