import eject by Peter Willis / Tito Ragusa

3 files changed, 91 insertions, 13 deletions

diff --git a/miscutils/Config.in b/miscutils/Config.in
index 77e13e84e..710639aba 100644
--- a/miscutils/Config.in
+++ b/miscutils/Config.in
@@ -83,6 +83,19 @@ config CONFIG_DEVFSD_VERBOSE
         help
           Increases logging to stderr or syslog.
 
+config CONFIG_EJECT
+        bool "eject"
+        default n
+        help
+          Used to eject cdroms.  (defaults to /dev/cdrom)
+
+config CONFIG_FEATURE_EJECT_LONG_OPTIONS
+        bool "  Enable support for --trayclose long option (-t)"
+        default n
+        depends on CONFIG_EJECT
+        help
+          Enable use of long options (like --trayclose for -t).
+
 config CONFIG_LAST
         bool "last"
         default n
diff --git a/miscutils/Makefile.in b/miscutils/Makefile.in
index ddddf72b3..d714f4038 100644
--- a/miscutils/Makefile.in
+++ b/miscutils/Makefile.in
@@ -24,19 +24,20 @@ endif
 srcdir=$(top_srcdir)/miscutils
 
 MISCUTILS-y:=
-MISCUTILS-$(CONFIG_ADJTIMEX)            += adjtimex.o
-MISCUTILS-$(CONFIG_CROND)               += crond.o
-MISCUTILS-$(CONFIG_CRONTAB)             += crontab.o
-MISCUTILS-$(CONFIG_DC)                  += dc.o
-MISCUTILS-$(CONFIG_DEVFSD)              += devfsd.o
-MISCUTILS-$(CONFIG_HDPARM)              += hdparm.o
-MISCUTILS-$(CONFIG_LAST)                += last.o
-MISCUTILS-$(CONFIG_MAKEDEVS)            += makedevs.o
-MISCUTILS-$(CONFIG_MT)                  += mt.o
-MISCUTILS-$(CONFIG_RX)                  += rx.o
-MISCUTILS-$(CONFIG_STRINGS)             += strings.o
-MISCUTILS-$(CONFIG_TIME)                += time.o
-MISCUTILS-$(CONFIG_WATCHDOG)            += watchdog.o
+MISCUTILS-$(CONFIG_ADJTIMEX)    += adjtimex.o
+MISCUTILS-$(CONFIG_CROND)       += crond.o
+MISCUTILS-$(CONFIG_CRONTAB)     += crontab.o
+MISCUTILS-$(CONFIG_DC)          += dc.o
+MISCUTILS-$(CONFIG_DEVFSD)      += devfsd.o
+MISCUTILS-$(CONFIG_EJECT)       += eject.o
+MISCUTILS-$(CONFIG_HDPARM)      += hdparm.o
+MISCUTILS-$(CONFIG_LAST)        += last.o
+MISCUTILS-$(CONFIG_MAKEDEVS)    += makedevs.o
+MISCUTILS-$(CONFIG_MT)          += mt.o
+MISCUTILS-$(CONFIG_RX)          += rx.o
+MISCUTILS-$(CONFIG_STRINGS)     += strings.o
+MISCUTILS-$(CONFIG_TIME)        += time.o
+MISCUTILS-$(CONFIG_WATCHDOG)    += watchdog.o
 
 libraries-y+=$(MISCUTILS_DIR)$(MISCUTILS_AR)
 
diff --git a/miscutils/eject.c b/miscutils/eject.c
new file mode 100644
index 000000000..cbfd115f7
--- /dev/null
+++ b/miscutils/eject.c
@@ -0,0 +1,64 @@
+/*
+ * eject implementation for busybox
+ *
+ * Copyright (C) 2004  Peter Willis <psyphreak@phreaker.net>
+ *
+ * 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
+ *
+ */
+
+/*
+ * This is a simple hack of eject based on something Erik posted in #uclibc.
+ * Most of the dirty work blatantly ripped off from cat.c =)
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <getopt.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 CLOSE_TRAY              1*/
+
+extern int eject_main(int argc, char **argv)
+{
+        unsigned long flags;
+        
+#ifdef CONFIG_FEATURE_EJECT_LONG_OPTIONS
+        static const struct option eject_long_options[] = {
+                { "trayclose", 0, 0, 't' },
+                { 0,           0, 0, 0 }
+        };
+        bb_applet_long_options = eject_long_options;
+#endif
+
+        flags = bb_getopt_ulflags(argc, argv, "t");
+
+        if (ioctl(bb_xopen((argv[optind] ? argv[optind] : DEFAULT_CDROM), 
+                           (O_RDONLY | O_NONBLOCK)), 
+                  ( flags /*& CLOSE_TRAY*/ ? CDROMCLOSETRAY : CDROMEJECT)))
+        {
+                bb_perror_msg_and_die(bb_msg_unknown);
+        }
+
+        return EXIT_SUCCESS;
+}