From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UbClu-0005dR-6m for mharc-grub-devel@gnu.org; Sat, 11 May 2013 12:35:46 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50680) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UbClq-0005ac-Ow for grub-devel@gnu.org; Sat, 11 May 2013 12:35:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UbClm-0001qc-CC for grub-devel@gnu.org; Sat, 11 May 2013 12:35:42 -0400 Received: from mail-la0-x22f.google.com ([2a00:1450:4010:c03::22f]:48474) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UbClm-0001qP-0R for grub-devel@gnu.org; Sat, 11 May 2013 12:35:38 -0400 Received: by mail-la0-f47.google.com with SMTP id fh20so4871400lab.20 for ; Sat, 11 May 2013 09:35:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:date:from:to:subject:message-id:in-reply-to:references :x-mailer:mime-version:content-type; bh=/nkMJokis6Y5tvE/pi1u+u/ETQ7LLwzVIFUL0jCcXeY=; b=z4ehG0ZnQkmOlAoRmdBxzmk6UBIJC1Phza96g/Ez2Qu+0gkai9ZuOwaxMvirH7n0DL Xdvi/KNinuG9uaE2tRidHTKQXWnCmQL9YWKHyKg+Ik4btObnaxUbUAEKU43y2vDcfMJk 9TTcnkv309y0R7i59jzXKELC3CP0iC6EWzEog7jpuD/onxumPJ4u/w/TWOBp5IdyXcfh Ngc3peUqqHx9ga6JugQIXJksT6KuChFwJt0dmJo98AdSehe8JxzVjHRsfRW71+zV7vuE 9VEe/Dd3SL2RGwcJknpInnXgxv1SrUGG8VNpXN/oxDzPOBsz2qapJmBmg6R+gv5Ie6R7 0bUg== X-Received: by 10.152.29.5 with SMTP id f5mr9870824lah.15.1368290136993; Sat, 11 May 2013 09:35:36 -0700 (PDT) Received: from opensuse.site ([94.29.72.160]) by mx.google.com with ESMTPSA id g4sm2593578lbe.0.2013.05.11.09.35.35 for (version=SSLv3 cipher=RC4-SHA bits=128/128); Sat, 11 May 2013 09:35:36 -0700 (PDT) Date: Sat, 11 May 2013 20:35:34 +0400 From: Andrey Borzenkov To: grub-devel@gnu.org Subject: New command eval. Message-ID: <20130511203534.52499628@opensuse.site> In-Reply-To: <518578B3.5040003@gmail.com> References: <1367240132.58582.YahooMailNeo@web120204.mail.ne1.yahoo.com> <20130501185934.3f2b9c28@opensuse.site> <518578B3.5040003@gmail.com> X-Mailer: Claws Mail 3.9.0 (GTK+ 2.24.14; x86_64-suse-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/JmhmbKsMo1v1whSXoNGqkAZ"; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::22f X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 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, 11 May 2013 16:35:45 -0000 --Sig_/JmhmbKsMo1v1whSXoNGqkAZ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable =D0=92 Sat, 04 May 2013 23:08:03 +0200 Vladimir '=CF=86-coder/phcoder' Serbinenko =D0=BF=D0=B8= =D1=88=D0=B5=D1=82: > > - it adds "eval" command (same as known from UNIX shells) which > > executes its argument >=20 > eval is generally good >=20 >=20 > > +static grub_err_t > > +grub_cmd_eval (grub_extcmd_context_t ctxt __attribute__((__unused__)), > > + int argc, char *argv[]) > > +{ >=20 > You don't use any argument parsing. It's better to use command and not > extcmd in this case. Also "eval" in bash concatenates its arguments. >=20 > > + cmd =3D grub_register_extcmd ("eval", grub_cmd_eval, 0, > > + N_("[STRING]"), N_("Evaluate commands"), >=20 > This description seems a bit vague for either human-reading or translatio= n. >=20 Is patch below OK? I decided to split off pure execute_sourcecode so that eval context would not clobber positional arguments. diff --git a/ChangeLog b/ChangeLog index cd8213a..8ca9874 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2013-05-11 Andrey Borzenkov + + * grub-core/script/execute.c (grub_script_execute_sourcecode): Split + off new function grub_script_execute_new_scope. Change callers to use + either of them as appropriate. + * grub-core/commands/eval.c: New command eval. + * docs/grub.texi (Commands): Document it. + 2013-05-11 Vladimir Serbinenko =20 * util/grub-install.in: Gettextize "Not found" message. diff --git a/docs/grub.texi b/docs/grub.texi index 75a5ea4..9dcfa2d 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -3435,6 +3435,7 @@ you forget a command, you can run the command @comman= d{help} * date:: Display or set current date and time * drivemap:: Map a drive to another * echo:: Display a line of text +* eval:: Evaluate agruments as GRUB commands * export:: Export an environment variable * false:: Do nothing, unsuccessfully * gettext:: Translate a string @@ -3812,6 +3813,15 @@ character will print that character. @end deffn =20 =20 +@node eval +@subsection eval + +@deffn Command eval string ... +Concatenate arguments together using single space as separator and evaluate +result as sequence of GRUB commands. +@end deffn + + @node export @subsection export =20 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def index 602b497..0fcc4e7 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -699,6 +699,11 @@ module =3D { }; =20 module =3D { + name =3D eval; + common =3D commands/eval.c; +}; + +module =3D { name =3D extcmd; common =3D commands/extcmd.c; common =3D lib/arg.c; diff --git a/grub-core/commands/eval.c b/grub-core/commands/eval.c new file mode 100644 index 0000000..e514a1a --- /dev/null +++ b/grub-core/commands/eval.c @@ -0,0 +1,72 @@ +/* + * GRUB -- GRand Unified Bootloader + * Copyright (C) 2009 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 + +GRUB_MOD_LICENSE ("GPLv3+"); + +static grub_err_t +grub_cmd_eval (grub_command_t cmd __attribute__((__unused__)), + int argc, char *argv[]) +{ + int i; + grub_size_t size =3D argc; /* +1 for final zero */ + char *str, *p; + grub_err_t ret; + + if (argc =3D=3D 0) + return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("missing arguments")); + + for (i =3D 0; i < argc; i++) + size +=3D grub_strlen (argv[i]); + + str =3D p =3D grub_malloc (size); + if (!str) + return grub_errno; + + for (i =3D 0; i < argc; i++) + { + grub_strcpy (p, argv[i]); + p +=3D grub_strlen (argv[i]); + *p++ =3D ' '; + } + *--p =3D '\0'; + + ret =3D grub_script_execute_sourcecode (str); + grub_free (str); + return ret; +} + +static grub_command_t cmd; + +GRUB_MOD_INIT(eval) +{ + cmd =3D grub_register_command ("eval", grub_cmd_eval, N_("STRING ..."), + N_("Evaluate arguments as GRUB commands")); +} + +GRUB_MOD_FINI(eval) +{ + grub_unregister_command (cmd); +} + diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c index fba19db..9b88290 100644 --- a/grub-core/normal/menu.c +++ b/grub-core/normal/menu.c @@ -245,7 +245,7 @@ grub_menu_execute_entry(grub_menu_entry_t entry, int au= to_boot) else grub_env_unset ("default"); =20 - grub_script_execute_sourcecode (entry->sourcecode, entry->argc, entry->a= rgs); + grub_script_execute_new_scope (entry->sourcecode, entry->argc, entry->ar= gs); =20 if (errs_before !=3D grub_err_printed_errors) grub_wait_after_message (); diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c index fae258a..0f15a7e 100644 --- a/grub-core/normal/menu_entry.c +++ b/grub-core/normal/menu_entry.c @@ -1120,7 +1120,6 @@ run (struct screen *screen) char *script; int errs_before; grub_menu_t menu =3D NULL; - char *dummy[1] =3D { NULL }; =20 grub_cls (); grub_printf (" "); @@ -1160,7 +1159,7 @@ run (struct screen *screen) } script[size] =3D '\0'; } - grub_script_execute_sourcecode (script, 0, dummy); + grub_script_execute_sourcecode (script); grub_free (script); =20 if (errs_before !=3D grub_err_printed_errors) diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c index 9babbee..afd5513 100644 --- a/grub-core/script/execute.c +++ b/grub-core/script/execute.c @@ -856,19 +856,10 @@ grub_script_execute_sourcecode_getline (char **line, =20 /* Execute a source script. */ grub_err_t -grub_script_execute_sourcecode (const char *source, int argc, char **args) +grub_script_execute_sourcecode (const char *source) { grub_err_t ret =3D 0; struct grub_script *parsed_script; - struct grub_script_scope new_scope; - struct grub_script_scope *old_scope; - - new_scope.argv.argc =3D argc; - new_scope.argv.args =3D args; - new_scope.flags =3D 0; - - old_scope =3D scope; - scope =3D &new_scope; =20 while (source) { @@ -880,13 +871,35 @@ grub_script_execute_sourcecode (const char *source, i= nt argc, char **args) if (! parsed_script) { ret =3D grub_errno; + grub_free (line); break; } =20 ret =3D grub_script_execute (parsed_script); + grub_script_free (parsed_script); grub_free (line); } =20 + return ret; +} + +/* Execute a source script in new scope. */ +grub_err_t +grub_script_execute_new_scope (const char *source, int argc, char **args) +{ + grub_err_t ret =3D 0; + struct grub_script_scope new_scope; + struct grub_script_scope *old_scope; + + new_scope.argv.argc =3D argc; + new_scope.argv.args =3D args; + new_scope.flags =3D 0; + + old_scope =3D scope; + scope =3D &new_scope; + + ret =3D grub_script_execute_sourcecode (source); + scope =3D old_scope; return ret; } diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h index 78602e4..57bdd4d 100644 --- a/include/grub/script_sh.h +++ b/include/grub/script_sh.h @@ -329,7 +329,8 @@ grub_err_t grub_script_execute_cmdwhile (struct grub_sc= ript_cmd *cmd); =20 /* Execute any GRUB pre-parsed command or script. */ grub_err_t grub_script_execute (struct grub_script *script); -grub_err_t grub_script_execute_sourcecode (const char *source, int argc, c= har **args); +grub_err_t grub_script_execute_sourcecode (const char *source); +grub_err_t grub_script_execute_new_scope (const char *source, int argc, ch= ar **args); =20 /* Break command for loops. */ grub_err_t grub_script_break (grub_command_t cmd, int argc, char *argv[]); --Sig_/JmhmbKsMo1v1whSXoNGqkAZ Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iEYEARECAAYFAlGOc1YACgkQR6LMutpd94w33QCeP2bJeH9rQcdGh9h9thjfiPCU A1cAoJnDrSSi7lmGa8myadR6ocjaFZKT =hpZz -----END PGP SIGNATURE----- --Sig_/JmhmbKsMo1v1whSXoNGqkAZ--