Changeset 64a617f in mainline

Timestamp:

2012-04-17T10:21:04Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

63920b0

Parents:

96c0b7b

Message:

backport printf fixes to kernel and boot

Files:

• boot/generic/src/printf_core.c (modified) (1 diff)
• kernel/generic/src/printf/printf_core.c (modified) (2 diffs)
• kernel/test/print/print1.c (modified) (2 diffs)
• uspace/lib/c/generic/io/printf_core.c (modified) (2 diffs)

boot/generic/src/printf_core.c

@@ -210 +210 @@
         /* Print leading spaces. */
         size_t strw = str_length(str);
-        if (precision == 0)
+        if ((precision == 0) || (precision > strw))
                 precision = strw;
         

kernel/generic/src/printf/printf_core.c

@@ -284 +284 @@
         /* Print leading spaces. */
         size_t strw = str_length(str);
-        if (precision == 0)
+        if ((precision == 0) || (precision > strw))
                 precision = strw;
         
@@ -332 +332 @@
         /* Print leading spaces. */
         size_t strw = wstr_length(str);
-        if (precision == 0)
+        if ((precision == 0) || (precision > strw))
                 precision = strw;
         

kernel/test/print/print1.c

@@ -41 +41 @@
         
         TPRINTF("Testing printf(\"%%8.10s\", \"text\"):\n");
-        TPRINTF("Expected output: \"text\"\n");
+        TPRINTF("Expected output: \"    text\"\n");
         TPRINTF("Real output:     \"%8.10s\"\n\n", "text");
         
@@ -48 +48 @@
         TPRINTF("Real output:     \"%8.10s\"\n\n", "very long text");
         
+        TPRINTF("Testing printf(\"%%-*.*s\", 7, 7, \"text\"):\n");
+        TPRINTF("Expected output: \"text   \"\n");
+        TPRINTF("Real output:     \"%-*.*s\"\n\n", 7, 7, "text");
+        
         return NULL;
 }

uspace/lib/c/generic/io/printf_core.c

@@ -283 +283 @@
         /* Print leading spaces. */
         size_t strw = str_length(str);
-        if (precision == 0 || precision > strw)
+        if ((precision == 0) || (precision > strw))
                 precision = strw;
         
@@ -331 +331 @@
         /* Print leading spaces. */
         size_t strw = wstr_length(str);
-        if (precision == 0 || precision > strw)
+        if ((precision == 0) || (precision > strw))
                 precision = strw;