b5ca9e0c4
Rob Landley
2005-12-02
Subject
A cleanup patch I've had lying around in my tree for a while, I think it was from Bernhard Fischer?
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 →
debianutils/mktemp.c+10 -35
| @@ -6,20 +6,7 @@ | |
| * Copyright (C) 2000 by Daniel Jacobowitz | |
| * Written by Daniel Jacobowitz <[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. |
| */ | |
| #include <stdio.h> | |
| @@ -31,33 +18,21 @@ | |
| extern int mktemp_main(int argc, char **argv) | |
| { | |
| - | unsigned char dir_flag = 0; |
| - | int opt; |
| - | |
| - | while ((opt = getopt(argc, argv, "qd")) != -1) { |
| - | if (opt == 'd') { |
| - | dir_flag = 1; |
| - | } |
| - | else if (opt != 'q') { |
| - | bb_show_usage(); |
| - | } |
| - | } |
| - | |
| - | if (optind + 1 != argc) { |
| + | unsigned long flags = bb_getopt_ulflags(argc, argv, "dq"); |
| + | |
| + | if (optind + 1 != argc) |
| bb_show_usage(); | |
| - | } |
| - | if (dir_flag) { |
| - | if (mkdtemp(argv[argc-1]) == NULL) { |
| + | if (flags & 1) { |
| + | if (mkdtemp(argv[optind]) == NULL) |
| return EXIT_FAILURE; | |
| - | } |
| - | } else { |
| - | if (mkstemp(argv[argc-1]) < 0) { |
| + | } |
| + | else { |
| + | if (mkstemp(argv[optind]) < 0) |
| return EXIT_FAILURE; | |
| - | } |
| } | |
| - | (void) puts(argv[argc-1]); |
| + | puts(argv[optind]); |
| return EXIT_SUCCESS; | |
| } | |