Commands not executed in the else branch

Commands not executed in the else branch

[Pavel Roskin]

Hello!

While testing the new "test" command, I have found that the "else"
branch is not executed in some cases.  "echo" and "set" are executed,
but other commands are not.  Even "hello" is not working.  The problem
is not specific to the "test" command.  I can do it with "search" as
well:

grub> if search -f /; then echo 0; else hello; fi
error: no such device
grub> if search -f /; then echo 0; else echo Hello World; fi
Hello World
error: no such device
grub> if search -f /; then echo 0; else echo 1; hello; echo 2; fi
1
2
error: no such device
grub>

The problem disappears after there is a true condition in the "if" part.

-- 
Regards,
Pavel Roskin

Re: Commands not executed in the else branch

[Bean]

Hi,

It's caused by the propagation of grub_errno value. This patch should fix it.

diff --git a/normal/execute.c b/normal/execute.c
index 8bf6d17..aec4589 100644
--- a/normal/execute.c
+++ b/normal/execute.c
@@ -177,6 +177,7 @@ grub_script_execute_cmdif (struct grub_script_cmd *cmd)
      read from the env variable `?'.  */
   grub_script_execute_cmd (cmdif->exec_to_evaluate);
   result = grub_env_get ("?");
+  grub_errno = 0;

   /* Execute the `if' or the `else' part depending on the value of
      `?'.  */

On Mon, Apr 27, 2009 at 12:52 PM, Pavel Roskin <proski@gnu.org> wrote:
> Hello!
>
> While testing the new "test" command, I have found that the "else"
> branch is not executed in some cases.  "echo" and "set" are executed,
> but other commands are not.  Even "hello" is not working.  The problem
> is not specific to the "test" command.  I can do it with "search" as
> well:
>
> grub> if search -f /; then echo 0; else hello; fi
> error: no such device
> grub> if search -f /; then echo 0; else echo Hello World; fi
> Hello World
> error: no such device
> grub> if search -f /; then echo 0; else echo 1; hello; echo 2; fi
> 1
> 2
> error: no such device
> grub>
>
> The problem disappears after there is a true condition in the "if" part.
>
> --
> Regards,
> Pavel Roskin
>
>
> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> http://lists.gnu.org/mailman/listinfo/grub-devel
>



-- 
Bean

Re: Commands not executed in the else branch

[Pavel Roskin]

Quoting Bean <bean123ch@gmail.com>:

> Hi,
>
> It's caused by the propagation of grub_errno value. This patch should fix it.
>
> diff --git a/normal/execute.c b/normal/execute.c
> index 8bf6d17..aec4589 100644
> --- a/normal/execute.c
> +++ b/normal/execute.c
> @@ -177,6 +177,7 @@ grub_script_execute_cmdif (struct grub_script_cmd *cmd)
>       read from the env variable `?'.  */
>    grub_script_execute_cmd (cmdif->exec_to_evaluate);
>    result = grub_env_get ("?");
> +  grub_errno = 0;
>
>    /* Execute the `if' or the `else' part depending on the value of
>       `?'.  */

Thanks, it's working fine!

-- 
Regards,
Pavel Roskin

Re: Commands not executed in the else branch

[Bean]

Hi,

Committed.

On Mon, Apr 27, 2009 at 10:10 PM, Pavel Roskin <proski@gnu.org> wrote:
> Quoting Bean <bean123ch@gmail.com>:
>
>> Hi,
>>
>> It's caused by the propagation of grub_errno value. This patch should fix
>> it.
>>
>> diff --git a/normal/execute.c b/normal/execute.c
>> index 8bf6d17..aec4589 100644
>> --- a/normal/execute.c
>> +++ b/normal/execute.c
>> @@ -177,6 +177,7 @@ grub_script_execute_cmdif (struct grub_script_cmd
>> *cmd)
>>      read from the env variable `?'.  */
>>   grub_script_execute_cmd (cmdif->exec_to_evaluate);
>>   result = grub_env_get ("?");
>> +  grub_errno = 0;
>>
>>   /* Execute the `if' or the `else' part depending on the value of
>>      `?'.  */
>
> Thanks, it's working fine!
>
> --
> Regards,
> Pavel Roskin
>
>
> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> http://lists.gnu.org/mailman/listinfo/grub-devel
>



-- 
Bean