Changeset 3621 for trunk

Timestamp:

09/30/08 08:13:54 (3 months ago)

Author:

stuge

Message:

Do not try to display non-printable characters on the bootlog and
ramdump screens. This fixes unaligned display on serial console.

The current isprint() implementation assumes a C locale, so also
characters with the eigth bit set are supressed (they produced
inconsistant results on VGA and serial anyway).

Signed-off-by: Ulf Jordan <jordan@…>
Acked-by: Peter Stuge <peter@…>

Location:

trunk/payloads/coreinfo

Files:

• bootlog_module.c (modified) (1 diff)
• ramdump_module.c (modified) (1 diff)

trunk/payloads/coreinfo/bootlog_module.c

@@ -64 +64 @@
         /* FIXME: Handle lines longer than 80 characters. */
         while (y <= 18) {
-                mvwaddnstr(win, y + 2, x, tmp, 1);
+                mvwaddch(win, y + 2, x, isprint(*tmp) ? *tmp : ' ');
                 x++;
                 tmp++;

trunk/payloads/coreinfo/ramdump_module.c

@@ -45 +45 @@
                 }
                 mvwprintw(win, row + y, col + x + 9, "%02x", ptr[i - 1]);
-                mvwprintw(win, row + y, 62 + count++, "%c", ptr[i - 1]);
+                mvwprintw(win, row + y, 62 + count++, "%c",
+                          isprint(ptr[i - 1]) ? ptr[i - 1] : ' ');
                 x += 3;
                 if (x == 24)    /* One more space after column/byte 8. */