From: robertmh Date: Sun, 27 Jul 2008 15:41:43 +0000 (+0000) Subject: forgot to checkin last commit X-Git-Tag: 1.98~1377 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2c76932c4b5dcfc14cea787b73583f54c4187466;p=thirdparty%2Fgrub.git forgot to checkin last commit --- diff --git a/commands/help.c b/commands/help.c index d5d0caf64..efff37b61 100644 --- a/commands/help.c +++ b/commands/help.c @@ -22,10 +22,6 @@ #include #include -/* XXX: This has to be changed into a function so the screen can be - optimally used. */ -#define TERM_WIDTH 80 - static grub_err_t grub_cmd_help (struct grub_arg_list *state __attribute__ ((unused)), int argc, char **args) @@ -43,16 +39,16 @@ grub_cmd_help (struct grub_arg_list *state __attribute__ ((unused)), int argc, { if (cmd->flags & GRUB_COMMAND_FLAG_CMDLINE) { - char description[TERM_WIDTH / 2]; + char description[GRUB_TERM_WIDTH / 2]; int desclen = grub_strlen (cmd->summary); - /* Make a string with a length of TERM_WIDTH / 2 - 1 filled + /* Make a string with a length of GRUB_TERM_WIDTH / 2 - 1 filled with the description followed by spaces. */ - grub_memset (description, ' ', TERM_WIDTH / 2 - 1); - description[TERM_WIDTH / 2 - 1] = '\0'; + grub_memset (description, ' ', GRUB_TERM_WIDTH / 2 - 1); + description[GRUB_TERM_WIDTH / 2 - 1] = '\0'; grub_memcpy (description, cmd->summary, - (desclen < TERM_WIDTH / 2 - 1 - ? desclen : TERM_WIDTH / 2 - 1)); + (desclen < GRUB_TERM_WIDTH / 2 - 1 + ? desclen : GRUB_TERM_WIDTH / 2 - 1)); grub_printf ("%s%s", description, (cnt++) % 2 ? "\n" : " "); }