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.
This commit is contained in:
robertmh 2008-02-09 11:02:26 +00:00
parent c196216293
commit 0d9ff7f075
3 changed files with 8 additions and 2 deletions

View file

@ -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> 2008-02-09 Robert Millan <rmh@aybabtu.com>
* normal/menu.c (run_menu): If timeout is set to zero, don't bother * normal/menu.c (run_menu): If timeout is set to zero, don't bother

View file

@ -50,7 +50,7 @@ grub_cmd_cat (struct grub_arg_list *state __attribute__ ((unused)),
{ {
unsigned char c = buf[i]; unsigned char c = buf[i];
if (grub_isprint (c) || grub_isspace (c)) if ((grub_isprint (c) || grub_isspace (c)) && c != '\r')
grub_putchar (c); grub_putchar (c);
else else
{ {

View file

@ -151,7 +151,7 @@ grub_rescue_cmd_cat (int argc, char *argv[])
{ {
unsigned char c = buf[i]; unsigned char c = buf[i];
if (grub_isprint (c) || grub_isspace (c)) if ((grub_isprint (c) || grub_isspace (c)) && c != '\r')
grub_putchar (c); grub_putchar (c);
else else
{ {