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

Cosmetic cleanup from tito.

Browse Source
This commit is contained in:
Rob Landley 2006-02-28 04:45:24 +00:00
parent e813ddba18
commit 2fe4eac4ea
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
miscutils/eject.c
View File

@ -2,20 +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.
*
*/
@ -46,13 +35,14 @@ extern int eject_main(int argc, char **argv)
device = argv[optind] ? : DEFAULT_CDROM;
if ((m = find_mount_point(device, bb_path_mtab_file))) {
if(umount(m->mnt_dir))
if (umount(m->mnt_dir)) {
bb_error_msg_and_die("Can't umount");
else if(ENABLE_FEATURE_MTAB_SUPPORT) erase_mtab(m->mnt_fsname);
} else if (ENABLE_FEATURE_MTAB_SUPPORT) {
erase_mtab(m->mnt_fsname);
}
}
if (ioctl(bb_xopen(device, (O_RDONLY | O_NONBLOCK)),
( flags ? CDROMCLOSETRAY : CDROMEJECT)))
{
(flags ? CDROMCLOSETRAY : CDROMEJECT))) {
bb_perror_msg_and_die(device);
}
return (EXIT_SUCCESS);