2008-02-08 Christian Franke <franke@computer.org>

        * commands/cat.c (grub_cmd_cat): Print '\r' as hex to
        avoid overwriting previous output.
        * kern/rescue.c (grub_rescue_cmd_cat): Likewise.

diff --git a/ChangeLog b/ChangeLog
index e0846ea4dd43f62e39819a5a0f86edea58f3362c..7e84a1ec836cea2a3eb3114051f984925a2e43bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-08  Christian Franke  <franke@computer.org>
+
+       * 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  <rmh@aybabtu.com>
 
        * 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 35b4c14a9afc5d8e013e8bfd42585d994fdd1833..834fd063bd9fafb051f91687f91d4340ca037fe7 100644 (file)
--- 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 bd5d579f9a73da87bc19284fa9fe5c0349180589..bb0c65087b04f344e99373de8a7adf200a1d7f5b 100644 (file)
--- 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
            {