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

Fix mismerge

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-07-02 22:06:43 +02:00
parent 41ca7b81a9
commit fb73efb794
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
commands/help.c
View file

@ -49,19 +49,20 @@ grub_cmd_help (grub_extcmd_t ext __attribute__ ((unused)), int argc,
command_help = grub_xasprintf ("%s %s", cmd->name, summary_translated); command_help = grub_xasprintf ("%s %s", cmd->name, summary_translated);
if (!command_help) if (!command_help)
return 1; break;
grub_utf8_to_ucs4_alloc (command_help, &unicode_command_help, grub_utf8_to_ucs4_alloc (command_help, &unicode_command_help,
&unicode_last_position); &unicode_last_position);
FOR_ACTIVE_TERM_OUTPUTS(term) FOR_ACTIVE_TERM_OUTPUTS(term)
{ {
unsigned stringwidth; unsigned stringwidth;
grub_uint32_t *unicode_last_screen_position; grub_uint32_t *unicode_last_screen_position;
unicode_last_screen_position = unicode_command_help; unicode_last_screen_position = unicode_command_help;
stringwidth = 0; stringwidth = 0;
while (unicode_last_screen_position < unicode_last_position && while (unicode_last_screen_position < unicode_last_position &&
stringwidth < ((grub_term_width (term) / 2) - 2)) stringwidth < ((grub_term_width (term) / 2) - 2))
{ {