From 278681dc7bd35743f2d3b3e1faf343476f82a10b Mon Sep 17 00:00:00 2001 From: okuji Date: Sat, 19 Jan 2002 19:05:43 +0000 Subject: [PATCH] 2002-01-20 Yoshinori K. Okuji * grub/asmstub.c (console_putchar): When not using curses, ignore a carriage return, because a newline in Unix is only a line feed. --- ChangeLog | 19 +++++++++++++------ grub/asmstub.c | 6 +++++- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 96dc210bc..db663167d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,15 +1,22 @@ +2002-01-20 Yoshinori K. Okuji + + * grub/asmstub.c (console_putchar): When not using curses, + ignore a carriage return, because a newline in Unix is only a + line feed. + 2002-01-18 Klaus Reichl * stage2/fsys_minix.c (minix_dir): Fixed bug getting filenames with MAXNAMELEN right. - * stage2/char_io.c (get_cmdline, cl_refresh): If TERMINAL_DUMB - section is always 0. - Line is only cleared if !TERMINAL_DUMB. + * stage2/char_io.c (get_cmdline, cl_refresh): If TERMINAL_DUMB + section is always 0. + Line is only cleared if !TERMINAL_DUMB. - * grub/main.c (use_curses): Initialize to 0 if !HAVE_LIBCURSES - (main): Check for curses use and set terminal to dumb if we don't - use it (helps for --batch and variants of non-curses setup). + * grub/main.c (use_curses): Initialize to 0 if !HAVE_LIBCURSES + (main): Check for curses use and set terminal to dumb if we + don't use it (helps for --batch and variants of non-curses + setup). 2002-01-15 Yoshinori K. Okuji diff --git a/grub/asmstub.c b/grub/asmstub.c index 3d8266f80..78abe0fc8 100644 --- a/grub/asmstub.c +++ b/grub/asmstub.c @@ -572,7 +572,11 @@ console_putchar (int c) } else #endif - putchar (c); + { + /* CR is not used in Unix. */ + if (c != '\r') + putchar (c); + } }