hush: initial stab at brace expansion support

[oweals/busybox.git] / miscutils / eject.c

diff --git a/miscutils/eject.c b/miscutils/eject.c
index 75618bea6dd038a0dbc4eb26d130168d58142140..a869c6311cc6d427ea59a697a12e187cf14fae32 100644 (file)
--- a/miscutils/eject.c
+++ b/miscutils/eject.c
@@ -16,6 +16,7 @@
 #include <sys/mount.h>
 #include "libbb.h"
 /* Must be after libbb.h: they need size_t */
+#include "fix_u32.h"
 #include <scsi/sg.h>
 #include <scsi/scsi.h>
 
@@ -75,7 +76,7 @@ static void eject_cdrom(unsigned flags, const char *dev)
        int cmd = CDROMEJECT;
 
        if (flags & FLAG_CLOSE
-        || (flags & FLAG_SMART && ioctl(dev_fd, CDROM_DRIVE_STATUS) == CDS_TRAY_OPEN)
+        || ((flags & FLAG_SMART) && ioctl(dev_fd, CDROM_DRIVE_STATUS) == CDS_TRAY_OPEN)
        ) {
                cmd = CDROMCLOSETRAY;
        }
@@ -103,7 +104,7 @@ int eject_main(int argc UNUSED_PARAM, char **argv)
           eject /dev/cdrom
        */
 
-       xmove_fd(xopen(device, O_RDONLY|O_NONBLOCK), dev_fd);
+       xmove_fd(xopen_nonblocking(device), dev_fd);
 
        if (ENABLE_FEATURE_EJECT_SCSI && (flags & FLAG_SCSI))
                eject_scsi(device);