emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add automatic umount support to eject command. Patch from Tito,

Browse Source 
with tweaks from Mike Frysinger and Rob Landley.

Note: this will still fail to umount a path that contains an ' or \ character.
Is it worth the extra size to filter for that?
This commit is contained in:
Rob Landley 2005-05-14 00:46:18 +00:00
parent 1ece21bddd
commit 9ea8836357
3 changed files with 24 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/usage.h
View File

@ -565,18 +565,12 @@
"$ echo \"Erik\\nis\\ncool\"\n" \
"Erik\\nis\\ncool\n")
#ifdef CONFIG_FEATURE_EJECT_LONG_OPTIONS
# define USAGE_EJECT_TRAYCLOSE ",trayclose"
#else
# define USAGE_EJECT_TRAYCLOSE ""
#endif
#define eject_trivial_usage \
"[-t] [DEVICE]"
#define eject_full_usage \
"Eject specified DEVICE (or default /dev/cdrom).\n\n" \
"Options:\n" \
"\t-t" USAGE_EJECT_TRAYCLOSE "\tclose tray"
"\t-t\tclose tray"
#define env_trivial_usage \
"[-iu] [-] [name=value]... [command]"

7
miscutils/Config.in
View File

@ -89,13 +89,6 @@ config CONFIG_EJECT
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

41
miscutils/eject.c
View File

@ -24,41 +24,44 @@
* 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 <stdlib.h>
#include <unistd.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*/
#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)
{
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
char * command;
char *device=argv[optind] ? : DEFAULT_CDROM;
flags = bb_getopt_ulflags(argc, argv, "t");
bb_xasprintf(&command, "umount '%s'", device);
if (ioctl(bb_xopen((argv[optind] ? argv[optind] : DEFAULT_CDROM),
/* validate input before calling system */
if(find_mount_point(device, MTAB))
system(command);
if (ioctl(bb_xopen( device,
(O_RDONLY | O_NONBLOCK)),
( flags /*& CLOSE_TRAY*/ ? CDROMCLOSETRAY : CDROMEJECT)))
( flags ? CDROMCLOSETRAY : CDROMEJECT)))
{
bb_perror_msg_and_die(bb_msg_unknown);
bb_perror_msg_and_die(device);
}
return EXIT_SUCCESS;
#ifdef CONFIG_FEATURE_CLEAN_UP
free(command);
#endif
return(EXIT_SUCCESS);
}