'help' word wrapping problem

[hawke@…]

The help system seems to have slight problems with word wrapping.

For example, 'help terminal':
terminal: terminal [--no-echo] [--no-edit] [--timeout=SECS] [--lines=LINES] [--

s

...that is, the line beginning 'terminal:' goes out to column 79, and then on column 80 of the next line, the character 's' is printed. It looks like filo is maybe expecting CR or LF to do both?

[oxygene]

You're on the right track, I think. Following fixes it for me:
--- main/grub/char_io.c (revision 2062)
+++ main/grub/char_io.c (local)
@@ -935,6 +935,7 @@

} else if (isprint(c)) {

getyx(stdscr, y, x);
if (x + 1 == COLS) {

+ console_putchar('\r');

console_putchar('\n');

}
if (console_color_state == COLOR_STATE_HIGHLIGHT)

There is another issue (the four spaces on the long description lines are not always clean). Once I figured that out, I'll post a patch

[oxygene]

Patch attached. I'll need to figure out why grub_printf("const string") is different than grub_putstr("const string"), but putstr is the faster choice anyway (not that this really matters ;-) )

[oxygene]

committed in rev 76