]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
test: fix previous commit - we need to return from subexpression
authorAndrei Borzenkov <arvidjaar@gmail.com>
Fri, 30 Jan 2015 17:21:56 +0000 (20:21 +0300)
committerAndrei Borzenkov <arvidjaar@gmail.com>
Fri, 30 Jan 2015 17:21:56 +0000 (20:21 +0300)
( ... ) was processed recursively, we need to return from it. Revert
this change.

grub-core/commands/test.c

index f58b87c64285c747fc6a7b86d989326b25641aae..5f06642f6c69c11c4c3bd540a6b230334c69a3ba 100644 (file)
@@ -387,7 +387,7 @@ test_parse (char **args, int *argn, int argc)
       if (grub_strcmp (args[*argn], ")") == 0)
        {
          (*argn)++;
-         continue;
+         return ctx.or || ctx.and;
        }
       /* Recursively invoke if parenthesis. */
       if (grub_strcmp (args[*argn], "(") == 0)