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

diff --git a/miscutils/eject.c b/miscutils/eject.c
index 3f1d6ab44..ff23b1666 100644
--- a/miscutils/eject.c
+++ b/miscutils/eject.c
@@ -1,22 +1,11 @@
+/* vi: set sw=4 ts=4: */
 /*
  * eject implementation for busybox
  *
  * Copyright (C) 2004  Peter Willis <psyphreak@phreaker.net>
+ * Copyright (C) 2005  Tito Ragusa <farmatito@tiscali.it>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
 /*
@@ -24,36 +13,48 @@
  * Most of the dirty work blatantly ripped off from cat.c =)
  */
 
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-#include <sys/mount.h>
-#include <mntent.h> 
 #include "busybox.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
 
-extern int eject_main(int argc, char **argv)
+#define FLAG_CLOSE  1
+#define FLAG_SMART  2
+
+int eject_main(int argc, char **argv)
 {
 	unsigned long flags;
 	char *device;
-	struct mntent *m;
-	
-	flags = bb_getopt_ulflags(argc, argv, "t");
-	device=argv[optind] ? : DEFAULT_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(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;
+	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);
 	}
-	return(EXIT_SUCCESS);
+
+	if (ENABLE_FEATURE_CLEAN_UP)
+		close(dev);
+
+	return EXIT_SUCCESS;
 }