X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=miscutils%2Feject.c;h=ff3976ebb62f2511412f29e3c4235dd359555c27;hb=4e12b1a2a9e68685dff61acaee1e1f6c377d978c;hp=ff23b1666fbcee845c12cc0af45ccfcea0333b1b;hpb=f7a57848c2a63957ef14b605c5f10b2691d36e73;p=oweals%2Fbusybox.git

diff --git a/miscutils/eject.c b/miscutils/eject.c
index ff23b1666..ff3976ebb 100644
--- a/miscutils/eject.c
+++ b/miscutils/eject.c
@@ -13,7 +13,7 @@
  * Most of the dirty work blatantly ripped off from cat.c =)
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* various defines swiped from linux/cdrom.h */
 #define CDROMCLOSETRAY            0x5319  /* pendant of CDROMEJECT  */
@@ -22,39 +22,95 @@
 /* drive status possibilities returned by CDROM_DRIVE_STATUS ioctl */
 #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) */
+
+#include <scsi/sg.h>
+#include <scsi/scsi.h>
+
+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)
+static void eject_cdrom(unsigned flags, const char *dev)
 {
-	unsigned long flags;
-	char *device;
-	int dev, cmd;
-
-	opt_complementary = "?:?1:t--T:T--t";
-	flags = getopt32(argc, argv, "tT");
-	device = 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
-
-	dev = xopen(device, O_RDONLY|O_NONBLOCK);
-	cmd = CDROMEJECT;
+	int cmd = CDROMEJECT;
+
 	if (flags & FLAG_CLOSE
-	 || (flags & FLAG_SMART && ioctl(dev, CDROM_DRIVE_STATUS) == CDS_TRAY_OPEN))
+	 || (flags & FLAG_SMART && ioctl(dev_fd, CDROM_DRIVE_STATUS) == CDS_TRAY_OPEN)
+	) {
 		cmd = CDROMCLOSETRAY;
-	if (ioctl(dev, cmd)) {
-		bb_perror_msg_and_die("%s", device);
 	}
 
+	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;
+
+	opt_complementary = "?1:t--T:T--t";
+	flags = getopt32(argv, "tT" USE_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 /dev/cdrom
+	*/
+
+	xmove_fd(xopen(device, O_RDONLY|O_NONBLOCK), 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;
 }