From d0db4b0454e6747d7fc133ef264119ae602a2048 Mon Sep 17 00:00:00 2001 From: robertmh Date: Mon, 11 Feb 2008 15:47:35 +0000 Subject: [PATCH] 2008-02-11 Robert Millan * 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. --- ChangeLog | 6 ++++++ util/biosdisk.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 00490a183..95376ee36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-02-11 Robert Millan + + * 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 * conf/i386-efi.rmk (grub_emu_SOURCES): Add `disk/raid.c' and diff --git a/util/biosdisk.c b/util/biosdisk.c index ee9041f3d..4dd46d6b1 100644 --- 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);