From 0d9ff7f075ebd7d644b011108c9563d5a6711190 Mon Sep 17 00:00:00 2001 From: robertmh Date: Sat, 9 Feb 2008 11:02:26 +0000 Subject: [PATCH] 2008-02-08 Christian Franke * commands/cat.c (grub_cmd_cat): Print '\r' as hex to avoid overwriting previous output. * kern/rescue.c (grub_rescue_cmd_cat): Likewise. --- ChangeLog | 6 ++++++ commands/cat.c | 2 +- kern/rescue.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e0846ea4d..7e84a1ec8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-02-08 Christian Franke + + * commands/cat.c (grub_cmd_cat): Print '\r' as hex to + avoid overwriting previous output. + * kern/rescue.c (grub_rescue_cmd_cat): Likewise. + 2008-02-09 Robert Millan * normal/menu.c (run_menu): If timeout is set to zero, don't bother diff --git a/commands/cat.c b/commands/cat.c index 35b4c14a9..834fd063b 100644 --- a/commands/cat.c +++ b/commands/cat.c @@ -50,7 +50,7 @@ grub_cmd_cat (struct grub_arg_list *state __attribute__ ((unused)), { unsigned char c = buf[i]; - if (grub_isprint (c) || grub_isspace (c)) + if ((grub_isprint (c) || grub_isspace (c)) && c != '\r') grub_putchar (c); else { diff --git a/kern/rescue.c b/kern/rescue.c index bd5d579f9..bb0c65087 100644 --- a/kern/rescue.c +++ b/kern/rescue.c @@ -151,7 +151,7 @@ grub_rescue_cmd_cat (int argc, char *argv[]) { unsigned char c = buf[i]; - if (grub_isprint (c) || grub_isspace (c)) + if ((grub_isprint (c) || grub_isspace (c)) && c != '\r') grub_putchar (c); else {