vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

$"..." support in scripts.

Browse source 
* grub-core/script/execute.c (grub_script_arglist_to_argv): Handle
	GRUB_SCRIPT_ARG_TYPE_GETTEXT.
	* grub-core/script/yylex.l: Likewise.
	* include/grub/script_sh.h (GRUB_SCRIPT_ARG_TYPE_GETTEXT): New enum
	value.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-26 19:02:46 +01:00
parent 15eff5d9c2
commit 7e8fac16ad
4 changed files with 41 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
grub-core/script/execute.c
View file

@ -328,8 +328,8 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
struct grub_script_arg *arg = 0;
struct grub_script_argv result = { 0, 0, 0 };
auto int append (char *s, int escape_type);
int append (char *s, int escape_type)
auto int append (const char *s, int escape_type);
int append (const char *s, int escape_type)
{
int r;
char *p = 0;
@ -395,12 +395,20 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
break;
case GRUB_SCRIPT_ARG_TYPE_TEXT:
if (grub_strlen (arg->str) &&
if (arg->str[0] &&
grub_script_argv_append (&result, arg->str,
grub_strlen (arg->str)))
goto fail;
break;
case GRUB_SCRIPT_ARG_TYPE_GETTEXT:
{
const char *t = _(arg->str);
if (grub_script_argv_append (&result, t, grub_strlen (t)))
goto fail;
}
break;
case GRUB_SCRIPT_ARG_TYPE_DQSTR:
case GRUB_SCRIPT_ARG_TYPE_SQSTR:
if (append (arg->str, 1))