* grub-core/normal/term.c (print_ucs4_terminal): Don't try to put the

word on new line if it's too long anyway. Fixes a hang.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-04-08 14:25:44 +02:00
parent 2e335e901c
commit 6a6f80587b
2 changed files with 6 additions and 1 deletions

View file

@ -1,3 +1,8 @@
2011-04-08 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/normal/term.c (print_ucs4_terminal): Don't try to put the
word on new line if it's too long anyway. Fixes a hang.
2011-04-08 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/util/raid.h (grub_util_raid_getmembers): Make argument

View file

@ -552,7 +552,7 @@ print_ucs4_terminal (const grub_uint32_t * str,
if (line_width > max_width && last_space > line_start)
ptr = last_space;
else if (line_width > max_width
&& line_start == str && startwidth != 0)
&& line_start == str && line_width - lastspacewidth < max_width - 5)
{
ptr = str;
lastspacewidth = startwidth;