2fe4eac4e
Rob Landley
2006-02-28
Subject
Cosmetic cleanup from tito.
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
miscutils/eject.c+11 -21
| @@ -2,20 +2,9 @@ | |
| * eject implementation for busybox | |
| * | |
| * Copyright (C) 2004 Peter Willis <[email protected]> | |
| + | * Copyright (C) 2005 Tito Ragusa <[email protected]> |
| * | |
| - | * 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); |
| } | |