From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1NOKdC-0006OJ-Th for mharc-grub-devel@gnu.org; Fri, 25 Dec 2009 19:35:42 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NOKdB-0006Le-N1 for grub-devel@gnu.org; Fri, 25 Dec 2009 19:35:41 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NOKd6-0006AZ-Lt for grub-devel@gnu.org; Fri, 25 Dec 2009 19:35:40 -0500 Received: from [199.232.76.173] (port=36232 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NOKd6-0006A5-F7 for grub-devel@gnu.org; Fri, 25 Dec 2009 19:35:36 -0500 Received: from 197.red-80-32-81.staticip.rima-tde.net ([80.32.81.197]:38058 helo=mail.pina.cat) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NOKd5-0007YQ-0x for grub-devel@gnu.org; Fri, 25 Dec 2009 19:35:35 -0500 Received: from pinux (unknown [192.168.0.108]) by mail.pina.cat (Postfix) with ESMTPA id 7BF5B2894B244 for ; Sat, 26 Dec 2009 01:35:32 +0100 (CET) Received: by pinux (Postfix, from userid 1000) id 164F18D3F; Sat, 26 Dec 2009 00:35:53 +0000 (GMT) Date: Sat, 26 Dec 2009 01:35:53 +0100 From: Carles Pina i Estany To: grub-devel@gnu.org Message-ID: <20091226003553.GA5373@pina.cat> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="k+w/mQv8wyuph6w0" Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: regression fix X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Dec 2009 00:35:42 -0000 --k+w/mQv8wyuph6w0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi, Commit 1949 introduced a bug using TAB due a miss-understanding that I had with the code. Find an attached patch that fix it. Brief ok from someone? -- Carles Pina i Estany http://pinux.info --k+w/mQv8wyuph6w0 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="space02.patch" === modified file 'ChangeLog' --- ChangeLog 2009-12-25 23:50:59 +0000 +++ ChangeLog 2009-12-26 00:17:47 +0000 @@ -1,5 +1,11 @@ 2009-12-26 Carles Pina i Estany + * normal/cmdline.c (grub_cmdline_get): Print a space after prompt. + * normal/main.c (grub_normal_read_line): Remove a space from the + default prompt. + +2009-12-26 Carles Pina i Estany + * commands/help.c (grub_cmd_help): Print the command name before the summary. (GRUB_MOD_INIT): Remove command name from the summary. === modified file 'normal/cmdline.c' --- normal/cmdline.c 2009-12-20 23:32:15 +0000 +++ normal/cmdline.c 2009-12-26 00:19:41 +0000 @@ -268,14 +268,14 @@ grub_cmdline_get (const char *prompt, ch grub_refresh (); } - plen = grub_strlen (prompt_translated); + plen = grub_strlen (prompt_translated) + 1; lpos = llen = 0; buf[0] = '\0'; if ((grub_getxy () >> 8) != 0) grub_putchar ('\n'); - grub_printf ("%s", prompt_translated); + grub_printf ("%s ", prompt_translated); xpos = plen; ystart = ypos = (grub_getxy () & 0xFF); === modified file 'normal/main.c' --- normal/main.c 2009-12-23 16:41:32 +0000 +++ normal/main.c 2009-12-26 00:10:33 +0000 @@ -546,9 +546,9 @@ static grub_err_t grub_normal_read_line (char **line, int cont) { grub_parser_t parser = grub_parser_get_current (); - char prompt[sizeof("> ") + grub_strlen (parser->name)]; + char prompt[sizeof(">") + grub_strlen (parser->name)]; - grub_sprintf (prompt, "%s> ", parser->name); + grub_sprintf (prompt, "%s>", parser->name); while (1) { --k+w/mQv8wyuph6w0--