vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
trailing newline implicitly. All users updated.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-26 17:16:05 +01:00
parent a9c7fd1c6c
commit d43ad75467
2 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2012-02-25 Vladimir Serbinenko <phcoder@gmail.com>
Implement serial on IEEE1275 and EFI. Implement serial on IEEE1275 and EFI.

24
grub-core/normal/menu_text.c
View file

@ -69,16 +69,20 @@ grub_print_message_indented_real (const char *msg, int margin_left,
{ {
grub_uint32_t *unicode_msg; grub_uint32_t *unicode_msg;
grub_uint32_t *last_position; grub_uint32_t *last_position;
grub_size_t msg_len = grub_strlen (msg) + 2;
int ret;
int msg_len; unicode_msg = grub_malloc (msg_len * sizeof (grub_uint32_t));
int ret = 0;
msg_len = grub_utf8_to_ucs4_alloc (msg, &unicode_msg, &last_position); if (!unicode_msg)
return 0;
if (msg_len < 0) msg_len = grub_utf8_to_ucs4 (unicode_msg, msg_len,
{ (grub_uint8_t *) msg, -1, 0);
return 0;
} last_position = unicode_msg + msg_len;
*last_position++ = '\n';
*last_position = 0;
if (dry_run) if (dry_run)
ret = grub_ucs4_count_lines (unicode_msg, last_position, margin_left, 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 else
{ {
const char *msg = _("Use the %C and %C keys to select which " const char *msg = _("Use the %C and %C keys to select which "
"entry is highlighted.\n"); "entry is highlighted.");
char *msg_translated; char *msg_translated;
msg_translated = grub_xasprintf (msg, GRUB_UNICODE_UPARROW, 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 ret += grub_print_message_indented_real
(_("Press enter to boot the selected OS, " (_("Press enter to boot the selected OS, "
"\'e\' to edit the commands before booting " "\'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); STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run);
} }
else else
@ -186,7 +190,7 @@ command-line or ESC to discard edits and return to the GRUB menu."),
ret += grub_print_message_indented_real ret += grub_print_message_indented_real
(_("Press enter to boot the selected OS, " (_("Press enter to boot the selected OS, "
"\'e\' to edit the commands before booting " "\'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); STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run);
} }
} }