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

	append out of its parent.

diff --git a/ChangeLog b/ChangeLog
index e5e2248ebfff9b82784677a8601b33061c9eb580..e67ca9aa1ab6c2e4f168b09ad32870242d4eda20 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * grub-core/commands/regexp.c (set_matches): Move setvar out of its

diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
index d6a2c7841949d4144af111639d2ecaca040b6356..a1dcc342d7f8b8525911e93d1cb4611836f70727 100644 (file)
--- a/grub-core/script/execute.c
+++ b/grub-core/script/execute.c
@@ -590,6 +590,29 @@ gettext_append (struct grub_script_argv *result, const char *orig_str)
   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.  */
 static int
 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_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)
     {
       if (grub_script_argv_next (&result))
@@ -648,7 +649,7 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
                    }
                  else
                    {
-                     if (append (values[i], 1))
+                     if (append (&result, values[i], 1))
                        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_SQSTR:
-             if (append (arg->str, 1))
+             if (append (&result, arg->str, 1))
                goto fail;
              break;
            }
@@ -727,14 +728,14 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
       if (! expansions)
        {
          grub_script_argv_next (&result);
-         append (unexpanded.args[i], -1);
+         append (&result, unexpanded.args[i], -1);
        }
       else
        {
          for (j = 0; expansions[j]; j++)
            {
              failed = (failed || grub_script_argv_next (&result) ||
-                       append (expansions[j], 0));
+                       append (&result, expansions[j], 0));
              grub_free (expansions[j]);
            }
          grub_free (expansions);