Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/miscutils/eject.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/miscutils/eject.c (modified) (3 diffs)

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

@@ -6 +6 @@
  * Copyright (C) 2005  Tito Ragusa <farmatito@tiscali.it>
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
@@ -14 +14 @@
  */
 
+#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>
 
 /* various defines swiped from linux/cdrom.h */
@@ -23 +28 @@
 #define CDS_TRAY_OPEN        2
 
+#define dev_fd 3
+
+/* Code taken from the original eject (http://eject.sourceforge.net/),
+ * refactored it a bit for busybox (ne-bb@nicoerfurth.de) */
+
+static void eject_scsi(const char *dev)
+{
+    static const char sg_commands[3][6] = {
+        { ALLOW_MEDIUM_REMOVAL, 0, 0, 0, 0, 0 },
+        { START_STOP, 0, 0, 0, 1, 0 },
+        { START_STOP, 0, 0, 0, 2, 0 }
+    };
+
+    unsigned i;
+    unsigned char sense_buffer[32];
+    unsigned char inqBuff[2];
+    sg_io_hdr_t io_hdr;
+
+    if ((ioctl(dev_fd, SG_GET_VERSION_NUM, &i) < 0) || (i < 30000))
+        bb_error_msg_and_die("not a sg device or old sg driver");
+
+    memset(&io_hdr, 0, sizeof(sg_io_hdr_t));
+    io_hdr.interface_id = 'S';
+    io_hdr.cmd_len = 6;
+    io_hdr.mx_sb_len = sizeof(sense_buffer);
+    io_hdr.dxfer_direction = SG_DXFER_NONE;
+    /* io_hdr.dxfer_len = 0; */
+    io_hdr.dxferp = inqBuff;
+    io_hdr.sbp = sense_buffer;
+    io_hdr.timeout = 2000;
+
+    for (i = 0; i < 3; i++) {
+        io_hdr.cmdp = (void *)sg_commands[i];
+        ioctl_or_perror_and_die(dev_fd, SG_IO, (void *)&io_hdr, "%s", dev);
+    }
+
+    /* force kernel to reread partition table when new disc is inserted */
+    ioctl(dev_fd, BLKRRPART);
+}
+
 #define FLAG_CLOSE  1
 #define FLAG_SMART  2
+#define FLAG_SCSI   4
 
-int eject_main(int argc, char **argv);
-int eject_main(int argc, char **argv)
+static void eject_cdrom(unsigned flags, const char *dev)
 {
-    unsigned long flags;
+    int cmd = CDROMEJECT;
+
+    if (flags & FLAG_CLOSE
+     || ((flags & FLAG_SMART) && ioctl(dev_fd, CDROM_DRIVE_STATUS) == CDS_TRAY_OPEN)
+    ) {
+        cmd = CDROMCLOSETRAY;
+    }
+
+    ioctl_or_perror_and_die(dev_fd, cmd, NULL, "%s", dev);
+}
+
+int eject_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int eject_main(int argc UNUSED_PARAM, char **argv)
+{
+    unsigned flags;
     const char *device;
-    int dev, cmd;
 
     opt_complementary = "?1:t--T:T--t";
-    flags = getopt32(argv, "tT");
-    device = argv[optind] ? : "/dev/cdrom";
+    flags = getopt32(argv, "tT" IF_FEATURE_EJECT_SCSI("s"));
+    device = argv[optind] ? argv[optind] : "/dev/cdrom";
 
-    // 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
+    /* We used to do "umount <device>" here, but it was buggy
+       if something was mounted OVER cdrom and
+       if cdrom is mounted many times.
 
-    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;
+       This works equally well (or better):
+       #!/bin/sh
+       umount /dev/cdrom
+       eject /dev/cdrom
+    */
 
-    ioctl_or_perror_and_die(dev, cmd, NULL, "%s", device);
+    xmove_fd(xopen_nonblocking(device), dev_fd);
+
+    if (ENABLE_FEATURE_EJECT_SCSI && (flags & FLAG_SCSI))
+        eject_scsi(device);
+    else
+        eject_cdrom(flags, device);
 
     if (ENABLE_FEATURE_CLEAN_UP)
-        close(dev);
+        close(dev_fd);
 
     return EXIT_SUCCESS;