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

* grub-core/script/execute.c (grub_script_arglist_to_argv): Move

Browse source 
append out of its parent.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-03-03 15:26:29 +01:00
parent cb758e96cc
commit 73b5d90fe2
2 changed files with 32 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-03-03 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/script/execute.c (grub_script_arglist_to_argv): Move
append out of its parent.
2013-03-03 Vladimir Serbinenko <phcoder@gmail.com> 2013-03-03 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/commands/regexp.c (set_matches): Move setvar out of its * grub-core/commands/regexp.c (set_matches): Move setvar out of its

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

@ -590,6 +590,29 @@ gettext_append (struct grub_script_argv *result, const char *orig_str)
return rval; return rval;
} }
static int
append (struct grub_script_argv *result,
const char *s, int escape_type)
{
int r;
char *p = 0;
if (escape_type == 0)
return grub_script_argv_append (result, s, grub_strlen (s));
if (escape_type > 0)
p = wildcard_escape (s);
else if (escape_type < 0)
p = wildcard_unescape (s);
if (! p)
return 1;
r = grub_script_argv_append (result, p, grub_strlen (p));
grub_free (p);
return r;
}
/* Convert arguments in ARGLIST into ARGV form. */ /* Convert arguments in ARGLIST into ARGV form. */
static int static int
grub_script_arglist_to_argv (struct grub_script_arglist *arglist, grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
@ -600,28 +623,6 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
struct grub_script_arg *arg = 0; struct grub_script_arg *arg = 0;
struct grub_script_argv result = { 0, 0, 0 }; struct grub_script_argv result = { 0, 0, 0 };
auto int append (const char *s, int escape_type);
int append (const char *s, int escape_type)
{
int r;
char *p = 0;
if (escape_type == 0)
return grub_script_argv_append (&result, s, grub_strlen (s));
if (escape_type > 0)
p = wildcard_escape (s);
else if (escape_type < 0)
p = wildcard_unescape (s);
if (! p)
return 1;
r = grub_script_argv_append (&result, p, grub_strlen (p));
grub_free (p);
return r;
}
for (; arglist && arglist->arg; arglist = arglist->next) for (; arglist && arglist->arg; arglist = arglist->next)
{ {
if (grub_script_argv_next (&result)) if (grub_script_argv_next (&result))
@ -648,7 +649,7 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
} }
else else
{ {
if (append (values[i], 1)) if (append (&result, values[i], 1))
goto fail; goto fail;
} }
@ -694,7 +695,7 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
case GRUB_SCRIPT_ARG_TYPE_DQSTR: case GRUB_SCRIPT_ARG_TYPE_DQSTR:
case GRUB_SCRIPT_ARG_TYPE_SQSTR: case GRUB_SCRIPT_ARG_TYPE_SQSTR:
if (append (arg->str, 1)) if (append (&result, arg->str, 1))
goto fail; goto fail;
break; break;
} }
@ -727,14 +728,14 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
if (! expansions) if (! expansions)
{ {
grub_script_argv_next (&result); grub_script_argv_next (&result);
append (unexpanded.args[i], -1); append (&result, unexpanded.args[i], -1);
} }
else else
{ {
for (j = 0; expansions[j]; j++) for (j = 0; expansions[j]; j++)
{ {
failed = (failed || grub_script_argv_next (&result) || failed = (failed || grub_script_argv_next (&result) ||
append (expansions[j], 0)); append (&result, expansions[j], 0));
grub_free (expansions[j]); grub_free (expansions[j]);
} }
grub_free (expansions); grub_free (expansions);