Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/miscutils/eject.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/miscutils/eject.c (modified) (1 diff)

branches/2.2.5/mindi-busybox/miscutils/eject.c

@@ -14 +14 @@
  */
 
-#include "busybox.h"
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-#include <mntent.h>
+#include "libbb.h"
 
 /* various defines swiped from linux/cdrom.h */
 #define CDROMCLOSETRAY            0x5319  /* pendant of CDROMEJECT  */
 #define CDROMEJECT                0x5309  /* Ejects the cdrom media */
-#define DEFAULT_CDROM             "/dev/cdrom"
+#define CDROM_DRIVE_STATUS        0x5326  /* Get tray position, etc. */
+/* drive status possibilities returned by CDROM_DRIVE_STATUS ioctl */
+#define CDS_TRAY_OPEN        2
 
+#define FLAG_CLOSE  1
+#define FLAG_SMART  2
+
+int eject_main(int argc, char **argv);
 int eject_main(int argc, char **argv)
 {
     unsigned long flags;
-    char *device;
-    struct mntent *m;
+    const char *device;
+    int dev, cmd;
 
-    flags = bb_getopt_ulflags(argc, argv, "t");
-    device = argv[optind] ? : DEFAULT_CDROM;
+    opt_complementary = "?1:t--T:T--t";
+    flags = getopt32(argv, "tT");
+    device = argv[optind] ? : "/dev/cdrom";
 
-    if ((m = find_mount_point(device, bb_path_mtab_file))) {
-        if (umount(m->mnt_dir)) {
-            bb_error_msg_and_die("Can't umount");
-        } else if (ENABLE_FEATURE_MTAB_SUPPORT) {
-            erase_mtab(m->mnt_fsname);
-        }
-    }
-    if (ioctl(bb_xopen(device, (O_RDONLY | O_NONBLOCK)),
-                (flags ? CDROMCLOSETRAY : CDROMEJECT))) {
-        bb_perror_msg_and_die("%s", device);
-    }
-    return (EXIT_SUCCESS);
+    // We used to do "umount <device>" here, but it was buggy
+    // if something was mounted OVER cdrom and
+    // if cdrom is mounted many times.
+    //
+    // This works equally well (or better):
+    // #!/bin/sh
+    // umount /dev/cdrom
+    // eject
+
+    dev = xopen(device, O_RDONLY|O_NONBLOCK);
+    cmd = CDROMEJECT;
+    if (flags & FLAG_CLOSE
+     || (flags & FLAG_SMART && ioctl(dev, CDROM_DRIVE_STATUS) == CDS_TRAY_OPEN))
+        cmd = CDROMCLOSETRAY;
+
+    ioctl_or_perror_and_die(dev, cmd, NULL, "%s", device);
+
+    if (ENABLE_FEATURE_CLEAN_UP)
+        close(dev);
+
+    return EXIT_SUCCESS;
 }