Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1JLLr1-0006us-KS for mharc-grub-devel@gnu.org; Sat, 02 Feb 2008 12:08:35 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JLLqy-0006qy-2n for grub-devel@gnu.org; Sat, 02 Feb 2008 12:08:32 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JLLqw-0006pC-HE for grub-devel@gnu.org; Sat, 02 Feb 2008 12:08:30 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JLLqw-0006ov-16 for grub-devel@gnu.org; Sat, 02 Feb 2008 12:08:30 -0500 Received: from aybabtu.com ([69.60.117.155]) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JLLqv-0007s3-Jp for grub-devel@gnu.org; Sat, 02 Feb 2008 12:08:29 -0500 Received: from [192.168.10.6] (helo=thorin) by aybabtu.com with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from ) id 1JLLqg-0002Sa-W7 for grub-devel@gnu.org; Sat, 02 Feb 2008 18:08:19 +0100 Received: from rmh by thorin with local (Exim 4.63) (envelope-from ) id 1JLLoL-0003Li-Lb for grub-devel@gnu.org; Sat, 02 Feb 2008 18:05:49 +0100 Date: Sat, 2 Feb 2008 18:05:49 +0100 From: Robert Millan To: The development of GRUB 2 Message-ID: <20080202170549.GB25374@thorin> References: <20080201224550.GA11984@thorin> <20080201224800.GA12043@thorin> <200802021338.28362.okuji@enbug.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="wac7ysb48OaltWcw" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <200802021338.28362.okuji@enbug.org> Organization: free as in freedom X-Message-Flag: Worried about Outlook viruses? Switch to Thunderbird! www.mozilla.com/thunderbird X-Debbugs-No-Ack: true User-Agent: Mutt/1.5.13 (2006-08-11) X-detected-kernel: by monty-python.gnu.org: Genre and OS details not recognized. Subject: Re: [PATCH] read command X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2008 17:08:34 -0000 --wac7ysb48OaltWcw Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit On Sat, Feb 02, 2008 at 01:38:28PM +0100, Yoshinori K. Okuji wrote: > > > > Does it make sense to move any of these two to kernel? Or to normal.mod ? > > Or maybe just to un-static-ize them and leave them here? > > What would be other use cases? No idea. I suggest we just leave grub_getline here and if later we find it's needed we can move it to normal or kernel. > BTW it is a bad idea to use xrealloc. xmalloc and xrealloc are sometimes used > in the GNU Project, but they must not be used in GRUB. If a program runs in > user space, when it panics, the control is back to the OS. But GRUB is a > standalone program. When it panics, the user loses any kind of control. Thus > grub_fatal must be used only if there is nothing else you can do. > > In this case, grub_getline should simply return NULL. How the user deals with > this situation is up to the user. Ok, here's a new patch, with grub_getline returning NULL and the caller handling "out of mem" error. Also fixed a memleak. -- Robert Millan I know my rights; I want my phone call! What use is a phone call… if you are unable to speak? (as seen on /.) --wac7ysb48OaltWcw Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="read.diff" * commands/read.c: New file. * conf/common.rmk (pkglib_MODULES): Add `commands/read.c'. (read_mod_SOURCES): New variable. (read_mod_CFLAGS): Likewise. (read_mod_LDFLAGS): Likewise. diff -x CVS -x '*~' -x '*.mk' -urp -N ../grub2/commands/read.c ./commands/read.c --- ../grub2/commands/read.c 1970-01-01 01:00:00.000000000 +0100 +++ ./commands/read.c 2008-02-02 18:02:31.000000000 +0100 @@ -0,0 +1,79 @@ +/* read.c - Command to read variables from user. */ +/* + * GRUB -- GRand Unified Bootloader + * Copyright (C) 2006,2007,2008 Free Software Foundation, Inc. + * + * GRUB is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * GRUB is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GRUB. If not, see . + */ + +#include +#include +#include +#include +#include +#include + +static char * +grub_getline (void) +{ + int i; + char *line; + char *tmp; + + i = 0; + line = grub_malloc (1 + i + sizeof('\0')); + + while ((line[i - 1] != '\n') && (line[i - 1] != '\r')) + { + line[i] = grub_getkey (); + if (grub_isprint (line[i])) + grub_putchar (line[i]); + i++; + tmp = grub_realloc (line, 1 + i + sizeof('\0')); + if (! tmp) + { + grub_free (line); + return NULL; + } + line = tmp; + } + line[i] = '\0'; + + return line; +} + +static grub_err_t +grub_cmd_read (struct grub_arg_list *state UNUSED, int argc, char **args) +{ + char *line = grub_getline (); + if (! line) + return grub_error (GRUB_ERR_OUT_OF_MEMORY, "Out of memory"); + if (argc > 0) + grub_env_set (args[0], line); + + grub_free (line); + return 0; +} + + +GRUB_MOD_INIT(read) +{ + grub_register_command ("read", grub_cmd_read, GRUB_COMMAND_FLAG_CMDLINE, + "read [ENVVAR]", "Set variable with user input", 0); +} + +GRUB_MOD_FINI(read) +{ + grub_unregister_command ("read"); +} diff -x CVS -x '*~' -x '*.mk' -urp -N ../grub2/conf/common.rmk ./conf/common.rmk --- ../grub2/conf/common.rmk 2008-01-30 16:32:55.000000000 +0100 +++ ./conf/common.rmk 2008-02-02 17:54:35.000000000 +0100 @@ -231,7 +231,8 @@ lvm_mod_LDFLAGS = $(COMMON_LDFLAGS) pkglib_MODULES += hello.mod boot.mod terminal.mod ls.mod \ cmp.mod cat.mod help.mod font.mod search.mod \ loopback.mod configfile.mod echo.mod \ - terminfo.mod test.mod blocklist.mod hexdump.mod + terminfo.mod test.mod blocklist.mod hexdump.mod \ + read.mod # For hello.mod. hello_mod_SOURCES = hello/hello.c @@ -326,5 +327,7 @@ gzio_mod_SOURCES = io/gzio.c gzio_mod_CFLAGS = $(COMMON_CFLAGS) gzio_mod_LDFLAGS = $(COMMON_LDFLAGS) - - +# For read.mod. +read_mod_SOURCES = commands/read.c +read_mod_CFLAGS = $(COMMON_CFLAGS) +read_mod_LDFLAGS = $(COMMON_LDFLAGS) --wac7ysb48OaltWcw--