2009-06-17 Felix Zielcke <fzielcke@z-51.de>

	* loader/i386/linux.c (grub_cmd_linux): Set grub_error if the
	file can't be found.
	* loader/i386/pc/linux.c (grub_cmd_linux): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 1a7a1c46be68ac56ee16e8cc6e0ff97e091b3ced..90265d0afc07232b19301987827c46728a256ce9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-17  Felix Zielcke  <fzielcke@z-51.de>
+
+       * loader/i386/linux.c (grub_cmd_linux): Set grub_error if the
+       file can't be found.
+       * loader/i386/pc/linux.c (grub_cmd_linux): Likewise.
+
 2009-06-17  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Fix newline handling

diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index 6510db670e87aefa4af9ee09a03c8c6b65487821..86f584c5735746fd55511207f261152a05e5375a 100644 (file)
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -600,7 +600,10 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 
   file = grub_file_open (argv[0]);
   if (! file)
-    goto fail;
+    {
+      grub_error (GRUB_ERR_FILE_NOT_FOUND, "file not found");
+      goto fail;
+    }
 
   if (grub_file_read (file, &lh, sizeof (lh)) != sizeof (lh))
     {

diff --git a/loader/i386/pc/linux.c b/loader/i386/pc/linux.c
index c5279f6ceeab6c296468e214fae29d63ed8acc9b..97df54dee68089b4c5d83614929149855cd88cbc 100644 (file)
--- a/loader/i386/pc/linux.c
+++ b/loader/i386/pc/linux.c
@@ -69,7 +69,10 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 
   file = grub_file_open (argv[0]);
   if (! file)
-    goto fail;
+    {
+      grub_error (GRUB_ERR_FILE_NOT_FOUND, "file not found");
+      goto fail;
+    }
 
   if ((grub_size_t) grub_file_size (file) > grub_os_area_size)
     {