X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=miscutils%2Feject.c;h=ff23b1666fbcee845c12cc0af45ccfcea0333b1b;hb=2f6df7fa0a70810d70e8ca0816b64c0f40b76847;hp=272d95980c34d85aca0afb1f8d44f8f2ef93f655;hpb=2e864cd21938eae6365b925dac1e1c29a94a0d20;p=oweals%2Fbusybox.git

diff --git a/miscutils/eject.c b/miscutils/eject.c
index 272d95980..ff23b1666 100644
--- a/miscutils/eject.c
+++ b/miscutils/eject.c
@@ -14,12 +14,13 @@
  */
 
 #include "busybox.h"
-#include <mntent.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
@@ -28,33 +29,32 @@ int eject_main(int argc, char **argv)
 {
 	unsigned long flags;
 	char *device;
-	struct mntent *m;
-	int dev;
-
-	/*bb_opt_complementally = "t--T:T--t";*/
-	flags = bb_getopt_ulflags(argc, argv, "tT");
-	device = argv[optind] ? : DEFAULT_CDROM;
-
-	m = find_mount_point(device, bb_path_mtab_file);
-	if (m) {
-		if (umount(m->mnt_dir)) {
-			bb_error_msg_and_die("can't umount");
-		} else if (ENABLE_FEATURE_MTAB_SUPPORT) {
-			erase_mtab(m->mnt_fsname);
-		}
-	}
+	int dev, cmd;
 
-	dev = xopen(device, O_RDONLY|O_NONBLOCK);
+	opt_complementary = "?:?1:t--T:T--t";
+	flags = getopt32(argc, argv, "tT");
+	device = argv[optind] ? : "/dev/cdrom";
 
-	if (flags & FLAG_CLOSE) goto close_tray;
+	// 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
 
-	if (ioctl(dev, CDROMEJECT)) {
-close_tray:
-		if (ioctl(dev, CDROMCLOSETRAY))
-			bb_perror_msg_and_die("%s", device);
+	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;
+	if (ioctl(dev, cmd)) {
+		bb_perror_msg_and_die("%s", device);
 	}
 
-	if (ENABLE_FEATURE_CLEAN_UP) close(dev);
+	if (ENABLE_FEATURE_CLEAN_UP)
+		close(dev);
 
 	return EXIT_SUCCESS;
 }