diff options
| author | Rob Landley <rob@landley.net> | 2006-02-28 04:45:24 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2006-02-28 04:45:24 +0000 |
| commit | 2fe4eac4ea355cfc5e85bc3acf50d26b86146a2c (patch) | |
| tree | 09f332189f5012be34ffa5d6c8b63ca2c4070c41 | |
| parent | e813ddba18d5f619fc406a7ff6551ec470552144 (diff) | |
| download | busybox-2fe4eac4ea355cfc5e85bc3acf50d26b86146a2c.tar.gz | |
Cosmetic cleanup from tito.
| -rw-r--r-- | miscutils/eject.c | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/miscutils/eject.c b/miscutils/eject.c index 511d8b204..2643f36d5 100644 --- a/miscutils/eject.c +++ b/miscutils/eject.c @@ -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. * */ @@ -43,17 +32,18 @@ extern int eject_main(int argc, char **argv) struct mntent *m; flags = bb_getopt_ulflags(argc, argv, "t"); - device=argv[optind] ? : DEFAULT_CDROM; + device = argv[optind] ? : DEFAULT_CDROM; - if((m = find_mount_point(device, bb_path_mtab_file))) { - if(umount(m->mnt_dir)) + 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); + } else if (ENABLE_FEATURE_MTAB_SUPPORT) { + erase_mtab(m->mnt_fsname); + } } - if (ioctl(bb_xopen( device, (O_RDONLY | O_NONBLOCK)), - ( flags ? CDROMCLOSETRAY : CDROMEJECT))) - { + if (ioctl(bb_xopen(device, (O_RDONLY | O_NONBLOCK)), + (flags ? CDROMCLOSETRAY : CDROMEJECT))) { bb_perror_msg_and_die(device); } - return(EXIT_SUCCESS); + return (EXIT_SUCCESS); } |