2008-02-11 Robert Millan <rmh@aybabtu.com>

        * util/biosdisk.c (grub_util_biosdisk_open, linux_find_partition)
        (grub_util_biosdisk_get_grub_dev): Check open() exit status by
        comparing it with -1, not 0.

diff --git a/ChangeLog b/ChangeLog
index 00490a183de1eef32d20788ad1d2c420d76fdd23..95376ee365545471e91992409064d3bab82559a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-11  Robert Millan  <rmh@aybabtu.com>
+
+       * util/biosdisk.c (grub_util_biosdisk_open, linux_find_partition)
+       (grub_util_biosdisk_get_grub_dev): Check open() exit status by
+       comparing it with -1, not 0.
+
 2008-02-10  Robert Millan  <rmh@aybabtu.com>
 
        * conf/i386-efi.rmk (grub_emu_SOURCES): Add `disk/raid.c' and

diff --git a/util/biosdisk.c b/util/biosdisk.c
index ee9041f3d29a796c999e107e9965b9bdb59fb680..4dd46d6b14bbf4dea5aa6a1f412815f98ea9b214 100644 (file)
--- a/util/biosdisk.c
+++ b/util/biosdisk.c
@@ -167,7 +167,7 @@ grub_util_biosdisk_open (const char *name, grub_disk_t disk)
     int fd;
 
     fd = open (map[drive], O_RDONLY);
-    if (! fd)
+    if (fd == -1)
       return grub_error (GRUB_ERR_BAD_DEVICE, "cannot open `%s'", map[drive]);
 
     if (fstat (fd, &st) < 0 || ! S_ISBLK (st.st_mode))
@@ -254,7 +254,7 @@ linux_find_partition (char *dev, unsigned long sector)
       
       sprintf (p, format, i);
       fd = open (real_dev, O_RDONLY);
-      if (! fd)
+      if (fd == -1)
        return 0;
 
       if (ioctl (fd, HDIO_GETGEO, &hdg))
@@ -773,7 +773,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
       return name;
     
     fd = open (os_dev, O_RDONLY);
-    if (! fd)
+    if (fd == -1)
       {
        grub_error (GRUB_ERR_BAD_DEVICE, "cannot open `%s'", os_dev);
        free (name);