2010-01-18 Robert Millan <rmh.grub@aybabtu.com>

	Fix annoying UI bug in rescue mode.  Thanks to Tristan Gingold for
	spotting it back in 2008.  Shame on me for forgetting he did.

	* kern/rescue_reader.c (grub_rescue_run): Skip zero-length lines.

diff --git a/ChangeLog b/ChangeLog
index a53cf92792a8b7539b497be92791cd844ab2117c..df7f905878f054385ccd99dec717ccb88b515cdb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
+
+       Fix annoying UI bug in rescue mode.  Thanks to Tristan Gingold for
+       spotting it back in 2008.  Shame on me for forgetting he did.
+
+       * kern/rescue_reader.c (grub_rescue_run): Skip zero-length lines.
+
 2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
 
        * include/grub/i386/linux.h (GRUB_VIDEO_TYPE_TEXT): Rename to ...

diff --git a/kern/rescue_reader.c b/kern/rescue_reader.c
index 732124b1afc21fe013f3e4c420f5c104a28d584d..f573cf41fcdb10e58e9df8eb5d6d9ddcca36885c 100644 (file)
--- a/kern/rescue_reader.c
+++ b/kern/rescue_reader.c
@@ -1,7 +1,7 @@
 /* rescue_reader.c - rescue mode reader  */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2009,2010  Free Software Foundation, Inc.
  *
  *  GRUB is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -83,7 +83,7 @@ grub_rescue_run (void)
       grub_errno = GRUB_ERR_NONE;
 
       grub_rescue_read_line (&line, 0);
-      if (! line)
+      if (! line || line[0] == '\0')
        continue;
 
       grub_parser_get_current ()->parse_line (line, grub_rescue_read_line);