* grub-core/normal/menu_text.c (grub_print_message_indented_real): Add

	trailing newline implicitly. All users updated.

diff --git a/ChangeLog b/ChangeLog
index 5740466a5780cc24a45acf80d255f32fbdb6e7cd..4da6d0ba08d6116357fbdce949b045e28439f181 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-25  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/normal/menu_text.c (grub_print_message_indented_real): Add
+       trailing newline implicitly. All users updated.
+
 2012-02-25  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Implement serial on IEEE1275 and EFI.

diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
index 93f0492bc9bb24ff8a696fec93ce0d9dda6bdd0d..d79e0c9e38d90a23dad1b52522005021d39c6a2e 100644 (file)
--- a/grub-core/normal/menu_text.c
+++ b/grub-core/normal/menu_text.c
@@ -69,16 +69,20 @@ grub_print_message_indented_real (const char *msg, int margin_left,
 {
   grub_uint32_t *unicode_msg;
   grub_uint32_t *last_position;
+  grub_size_t msg_len = grub_strlen (msg) + 2;
+  int ret;
 
-  int msg_len;
-  int ret = 0;
-
-  msg_len = grub_utf8_to_ucs4_alloc (msg, &unicode_msg, &last_position);
+  unicode_msg = grub_malloc (msg_len * sizeof (grub_uint32_t));
+ 
+  if (!unicode_msg)
+    return 0;
 
-  if (msg_len < 0)
-    {
-      return 0;
-    }
+  msg_len = grub_utf8_to_ucs4 (unicode_msg, msg_len,
+                              (grub_uint8_t *) msg, -1, 0);
+  
+  last_position = unicode_msg + msg_len;
+  *last_position++ = '\n';
+  *last_position = 0;
 
   if (dry_run)
     ret = grub_ucs4_count_lines (unicode_msg, last_position, margin_left,
@@ -157,7 +161,7 @@ command-line or ESC to discard edits and return to the GRUB menu."),
   else
     {
       const char *msg = _("Use the %C and %C keys to select which "
-                         "entry is highlighted.\n");
+                         "entry is highlighted.");
       char *msg_translated;
 
       msg_translated = grub_xasprintf (msg, GRUB_UNICODE_UPARROW,
@@ -178,7 +182,7 @@ command-line or ESC to discard edits and return to the GRUB menu."),
          ret += grub_print_message_indented_real
            (_("Press enter to boot the selected OS, "
               "\'e\' to edit the commands before booting "
-              "or \'c\' for a command-line. ESC to return previous menu.\n"),
+              "or \'c\' for a command-line. ESC to return previous menu."),
             STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run);
        }
       else
@@ -186,7 +190,7 @@ command-line or ESC to discard edits and return to the GRUB menu."),
          ret += grub_print_message_indented_real
            (_("Press enter to boot the selected OS, "
               "\'e\' to edit the commands before booting "
-              "or \'c\' for a command-line.\n"),
+              "or \'c\' for a command-line."),
             STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run);
        }       
     }