- add central knob to turn off getopt_long everywhere. EXPERIMENTAL!

[oweals/busybox.git] / miscutils / eject.c

diff --git a/miscutils/eject.c b/miscutils/eject.c
index df275d74bb1502f9d22d3ba5e747e2b11b7b1fdf..d9cb0f67b4c4943db720ff8c6e82d3d035d7c669 100644 (file)
--- a/miscutils/eject.c
+++ b/miscutils/eject.c
@@ -2,21 +2,9 @@
  * 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.
  */
 
 /*
@@ -26,8 +14,9 @@
 
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include <stdlib.h>
 #include <unistd.h>
+#include <sys/mount.h>
+#include <mntent.h>
 #include "busybox.h"
 
 /* various defines swiped from linux/cdrom.h */
@@ -35,33 +24,25 @@
 #define CDROMEJECT                0x5309  /* Ejects the cdrom media */
 #define DEFAULT_CDROM             "/dev/cdrom"
 
-#ifdef CONFIG_FEATURE_MTAB_SUPPORT
-#define MTAB  CONFIG_FEATURE_MTAB_FILENAME
-#else
-#define MTAB  "/proc/mounts"
-#endif
-
-extern int eject_main(int argc, char **argv)
+int eject_main(int argc, char **argv)
 {
        unsigned long flags;
-       char * command; 
-       char *device=argv[optind] ? : DEFAULT_CDROM;
-       
+       char *device;
+       struct mntent *m;
+
        flags = bb_getopt_ulflags(argc, argv, "t");
-       bb_xasprintf(&command, "umount '%s'", device);
-       
-       /* validate input before calling system */
-       if(find_mount_point(device, MTAB))
-               system(command);
-       
-       if (ioctl(bb_xopen( device, 
-                          (O_RDONLY | O_NONBLOCK)), 
-                 ( flags ? CDROMCLOSETRAY : CDROMEJECT)))
-       {
-               bb_perror_msg_and_die(device);
+       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("%s", device);
        }
-#ifdef CONFIG_FEATURE_CLEAN_UP 
-       free(command);
-#endif
-       return(EXIT_SUCCESS);
+       return (EXIT_SUCCESS);
 }