From 3514cc3a8f14cc39589fee3edefaa161ac1bd0a6 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Mon, 6 Aug 2012 11:16:12 -0400 Subject: [PATCH] eject: return proper 0/1 from eject_cdrom() main() expects this method to return 0 for failure and 1 for success, as the other eject_*() methods do. Add the missing comparison of ioctl() >= 0 Signed-off-by: Dave Reisner Signed-off-by: Karel Zak --- sys-utils/eject.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys-utils/eject.c b/sys-utils/eject.c index 08af08e0c5..2097961ef2 100644 --- a/sys-utils/eject.c +++ b/sys-utils/eject.c @@ -398,13 +398,13 @@ static void close_tray(int fd) static int eject_cdrom(int fd) { #if defined(CDROMEJECT) - return ioctl(fd, CDROMEJECT); + return ioctl(fd, CDROMEJECT) >= 0; #elif defined(CDIOCEJECT) - return ioctl(fd, CDIOCEJECT); + return ioctl(fd, CDIOCEJECT) >= 0; #else warnx(_("CD-ROM eject unsupported")); errno = ENOSYS; - return -1; + return 0; #endif } @@ -432,7 +432,7 @@ static void toggle_tray(int fd) case CDS_NO_DISC: case CDS_DISC_OK: - if (eject_cdrom(fd)) + if (!eject_cdrom(fd)) err(EXIT_FAILURE, _("CD-ROM eject command failed")); return; case CDS_NO_INFO: @@ -453,7 +453,7 @@ static void toggle_tray(int fd) gettimeofday(&time_start, NULL); /* Send the CDROMEJECT command to the device. */ - if (eject_cdrom(fd) < 0) + if (!eject_cdrom(fd)) err(EXIT_FAILURE, _("CD-ROM eject command failed")); /* Get the second timestamp, to measure the time needed to open -- 2.47.3