svn commit: trunk/busybox: include miscutils scripts

aldot at busybox.net aldot at busybox.net
Fri Feb 8 15:04:03 UTC 2008


Author: aldot
Date: 2008-02-08 07:04:00 -0800 (Fri, 08 Feb 2008)
New Revision: 20960

Log:
- add eject -s for SCSI- and USB-devices (Nico Erfurth)


Modified:
   trunk/busybox/include/usage.h
   trunk/busybox/miscutils/Config.in
   trunk/busybox/miscutils/eject.c
   trunk/busybox/scripts/defconfig


Changeset:
Modified: trunk/busybox/include/usage.h
===================================================================
--- trunk/busybox/include/usage.h	2008-02-08 13:43:39 UTC (rev 20959)
+++ trunk/busybox/include/usage.h	2008-02-08 15:04:00 UTC (rev 20960)
@@ -881,6 +881,9 @@
 #define eject_full_usage \
        "Eject specified DEVICE (or default /dev/cdrom)" \
        "\n\nOptions:\n" \
+       USE_FEATURE_EJECT_SCSI( \
+       "	-s	scsi device\n" \
+       ) \
        "	-t	Close tray\n" \
        "	-T	Open/close tray (toggle)"
 

Modified: trunk/busybox/miscutils/Config.in
===================================================================
--- trunk/busybox/miscutils/Config.in	2008-02-08 13:43:39 UTC (rev 20959)
+++ trunk/busybox/miscutils/Config.in	2008-02-08 15:04:00 UTC (rev 20960)
@@ -126,6 +126,14 @@
 	help
 	  Used to eject cdroms.  (defaults to /dev/cdrom)
 
+config FEATURE_EJECT_SCSI
+  bool "eject scsi support"
+  default n
+  depends on EJECT
+  help
+    Add the -s option to eject, this allows to eject SCSI-Devices and
+    usb-storage devices.
+
 config LAST
 	bool "last"
 	default n

Modified: trunk/busybox/miscutils/eject.c
===================================================================
--- trunk/busybox/miscutils/eject.c	2008-02-08 13:43:39 UTC (rev 20959)
+++ trunk/busybox/miscutils/eject.c	2008-02-08 15:04:00 UTC (rev 20960)
@@ -25,33 +25,86 @@
 #define FLAG_CLOSE  1
 #define FLAG_SMART  2
 
+
+/* Code taken from the original eject (http://eject.sourceforge.net/),
+ * refactored it a bit for busybox (ne-bb at nicoerfurth.de) */
+#define FLAG_SCSI   4
+
+#include <scsi/sg.h>
+#include <scsi/scsi.h>
+static void eject_scsi(const int fd, const char * const dev)
+{
+  int i;
+  unsigned char sense_buffer[32];
+  unsigned char inqBuff[2];
+  sg_io_hdr_t io_hdr;
+  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}
+  };
+
+  if ((ioctl(fd, SG_GET_VERSION_NUM, &i) < 0) || (i < 30000))
+    bb_error_msg_and_die("not an 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 = sg_commands[i];
+    ioctl_or_perror_and_die(fd, SG_IO, (void *)&io_hdr, "%s", dev);
+  }
+
+  /* force kernel to reread partition table when new disc inserted */
+  ioctl(fd, BLKRRPART);
+}
+
+static void eject_cdrom(const int fd, const unsigned long flags,
+						const char * const dev)
+{
+	int cmd = CDROMEJECT;
+
+	if (flags & FLAG_CLOSE
+	 || (flags & FLAG_SMART && ioctl(fd, CDROM_DRIVE_STATUS) == CDS_TRAY_OPEN))
+		cmd = CDROMCLOSETRAY;
+
+	return ioctl_or_perror_and_die(fd, cmd, NULL, "%s", dev);
+}
+
 int eject_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int eject_main(int argc, char **argv)
 {
 	unsigned long flags;
 	const char *device;
-	int dev, cmd;
+	int dev;
 
 	opt_complementary = "?1:t--T:T--t";
-	flags = getopt32(argv, "tT");
-	device = argv[optind] ? : "/dev/cdrom";
+	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
+	/* 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_EJECT_SCSI && (flags & FLAG_SCSI))
+		eject_scsi(dev, device);
+	else
+		eject_cdrom(dev, flags, device);
 
 	if (ENABLE_FEATURE_CLEAN_UP)
 		close(dev);

Modified: trunk/busybox/scripts/defconfig
===================================================================
--- trunk/busybox/scripts/defconfig	2008-02-08 13:43:39 UTC (rev 20959)
+++ trunk/busybox/scripts/defconfig	2008-02-08 15:04:00 UTC (rev 20960)
@@ -512,6 +512,7 @@
 # CONFIG_DEVFSD_VERBOSE is not set
 # CONFIG_FEATURE_DEVFS is not set
 CONFIG_EJECT=y
+CONFIG_FEATURE_EJECT_SCSI=y
 CONFIG_LAST=y
 CONFIG_LESS=y
 CONFIG_FEATURE_LESS_MAXLINES=9999999




More information about the busybox-cvs mailing list