aboutsummaryrefslogtreecommitdiff
path: root/miscutils/eject.c
diff options
context:
space:
mode:
authorGravatar Rob Landley <rob@landley.net>2005-08-10 20:35:54 +0000
committerGravatar Rob Landley <rob@landley.net>2005-08-10 20:35:54 +0000
commit6a6798b8e47c71888945ec5cb55c703db19b956c (patch)
tree9179ec8c6dc4e402cdc4a86cf6af119745de2f40 /miscutils/eject.c
parent0b62158475ecbfce16fb857042ec7f402d7594ec (diff)
downloadbusybox-6a6798b8e47c71888945ec5cb55c703db19b956c.tar.gz
busybox-6a6798b8e47c71888945ec5cb55c703db19b956c.tar.bz2
Major rewrite of mount, umount, losetup. Untangled lots of code, shrunk
things down a bit, fixed a number of funky corner cases, added support for several new features (things like mount --move, mount --bind, lazy unounts, automatic detection of loop mounts, and so on). Probably broke several other things, but it's fixable. (Bang on it, tell me what doesn't work for you...) Note: you no longer need to say "-o loop". It does that for you when necessary. Still need to add "user mount" support, which involves making mount suid. Not too hard to do under the new infrastructure, just haven't done it yet... The previous code had the following notes, that belong in the version control comments: - * 3/21/1999 Charles P. Wright <cpwright@cpwright.com> - * searches through fstab when -a is passed - * will try mounting stuff with all fses when passed -t auto - * - * 1999-04-17 Dave Cinege...Rewrote -t auto. Fixed ro mtab. - * - * 1999-10-07 Erik Andersen <andersen@codepoet.org>. - * Rewrite of a lot of code. Removed mtab usage (I plan on - * putting it back as a compile-time option some time), - * major adjustments to option parsing, and some serious - * dieting all around. - * - * 1999-11-06 mtab support is back - andersee - * - * 2000-01-12 Ben Collins <bcollins@debian.org>, Borrowed utils-linux's - * mount to add loop support. - * - * 2000-04-30 Dave Cinege <dcinege@psychosis.com> - * Rewrote fstab while loop and lower mount section. Can now do - * single mounts from fstab. Can override fstab options for single - * mount. Common mount_one call for single mounts and 'all'. Fixed - * mtab updating and stale entries. Removed 'remount' default. - *
Diffstat (limited to 'miscutils/eject.c')
-rw-r--r--miscutils/eject.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/miscutils/eject.c b/miscutils/eject.c
index 8864687e4..3f1d6ab44 100644
--- a/miscutils/eject.c
+++ b/miscutils/eject.c
@@ -48,13 +48,9 @@ extern int eject_main(int argc, char **argv)
if((m = find_mount_point(device, bb_path_mtab_file))) {
if(umount(m->mnt_dir))
bb_error_msg_and_die("Can't umount");
-#ifdef CONFIG_FEATURE_MTAB_SUPPORT
- else
- erase_mtab(m->mnt_fsname);
-#endif
+ else if(ENABLE_FEATURE_MTAB_SUPPORT) erase_mtab(m->mnt_fsname);
}
- if (ioctl(bb_xopen( device,
- (O_RDONLY | O_NONBLOCK)),
+ if (ioctl(bb_xopen( device, (O_RDONLY | O_NONBLOCK)),
( flags ? CDROMCLOSETRAY : CDROMEJECT)))
{
bb_perror_msg_and_die(device);