2009-05-03 Bean <bean123ch@gmail.com>

	* script/sh/execute.c (grub_script_execute_cmdif): Reset grub_errno
	after we get the result of if statement.

diff --git a/ChangeLog b/ChangeLog
index b798fe88b6573f4320f8d778b639c21ddadbb75a..42b120c2ccf9fd42b3a3594fb3bcc54051ca5ce6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-03  Bean  <bean123ch@gmail.com>
+
+       * script/sh/execute.c (grub_script_execute_cmdif): Reset grub_errno
+       after we get the result of if statement.
+
 2009-05-03  Bean  <bean123ch@gmail.com>
 
        * Makefile.in (enable_efiemu): New variable.

diff --git a/script/sh/execute.c b/script/sh/execute.c
index 3856dd95ca33acc1050a90eb232f1a71c4a54eab..123bca8b1fc2b093eda7c0c7f7f53f133d9b906b 100644 (file)
--- a/script/sh/execute.c
+++ b/script/sh/execute.c
@@ -180,6 +180,8 @@ grub_script_execute_cmdif (struct grub_script_cmd *cmd)
   grub_script_execute_cmd (cmdif->exec_to_evaluate);
   result = grub_env_get ("?");
 
+  grub_errno = GRUB_ERR_NONE;
+
   /* Execute the `if' or the `else' part depending on the value of
      `?'.  */
   if (result && ! grub_strcmp (result, "0"))