ab1878245
Bernhard Reutner-Fischer
2005-10-26
Subject
* uniq.c: remove unneeded include and use short boilerplate. * coreutils.h: remove prototype of non-existing xgetoptfile_sort_uniq and add boilerplate. * networking/{ipaddr,ip,iplink,iproute,iptunnel}.c: touch includes and use short boilerplate. * libiproute/iproute.c: rename round to avoid cl
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 →
coreutils/libcoreutils/coreutils.h +4 -1coreutils/uniq.c +1 -15networking/ip.c +3 -6networking/ipaddr.c +3 -6networking/iplink.c +3 -6networking/iproute.c +3 -6networking/iptunnel.c +3 -6networking/libiproute/iproute.c +4 -7
coreutils/libcoreutils/coreutils.h+4 -1
| @@ -1,3 +1,7 @@ | |
| + | /* |
| + | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. |
| + | */ |
| + | |
| #ifndef COREUTILS_H | |
| #define COREUTILS_H 1 | |
| @@ -7,6 +11,5 @@ extern int cp_mv_stat2(const char *fn, struct stat *fn_stat, stat_func sf); | |
| extern int cp_mv_stat(const char *fn, struct stat *fn_stat); | |
| extern mode_t getopt_mk_fifo_nod(int argc, char **argv); | |
| - | extern FILE *xgetoptfile_sort_uniq(char **argv, const char *mode); |
| #endif | |
coreutils/uniq.c+1 -15
| @@ -4,20 +4,7 @@ | |
| * | |
| * Copyright (C) 2005 Manuel Novoa III <[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. |
| */ | |
| /* BB_AUDIT SUSv3 compliant */ | |
| @@ -29,7 +16,6 @@ | |
| #include <ctype.h> | |
| #include <unistd.h> | |
| #include "busybox.h" | |
| - | #include "libcoreutils/coreutils.h" |
| static const char uniq_opts[] = "f:s:" "cdu\0\1\2\4"; | |
networking/ip.c+3 -6
| @@ -1,10 +1,7 @@ | |
| /* | |
| * ip.c "ip" utility frontend. | |
| * | |
| - | * 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. |
| + | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. |
| * | |
| * Authors: Alexey Kuznetsov, <[email protected]> | |
| * | |
| @@ -23,8 +20,8 @@ | |
| #include <netinet/in.h> | |
| #include <string.h> | |
| - | #include "./libiproute/utils.h" |
| - | #include "./libiproute/ip_common.h" |
| + | #include "libiproute/utils.h" |
| + | #include "libiproute/ip_common.h" |
| #include "busybox.h" | |
networking/ipaddr.c+3 -6
| @@ -1,10 +1,7 @@ | |
| /* | |
| * ip.c "ip" utility frontend. | |
| * | |
| - | * 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. |
| + | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. |
| * | |
| * Authors: Alexey Kuznetsov, <[email protected]> | |
| * | |
| @@ -14,8 +11,8 @@ | |
| * Rani Assaf <[email protected]> 980929: resolve addresses | |
| */ | |
| - | #include "./libiproute/utils.h" |
| - | #include "./libiproute/ip_common.h" |
| + | #include "libiproute/utils.h" |
| + | #include "libiproute/ip_common.h" |
| #include "busybox.h" | |
networking/iplink.c+3 -6
| @@ -1,10 +1,7 @@ | |
| /* | |
| * ip.c "ip" utility frontend. | |
| * | |
| - | * 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. |
| + | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. |
| * | |
| * Authors: Alexey Kuznetsov, <[email protected]> | |
| * | |
| @@ -14,8 +11,8 @@ | |
| * Rani Assaf <[email protected]> 980929: resolve addresses | |
| */ | |
| - | #include "./libiproute/utils.h" |
| - | #include "./libiproute/ip_common.h" |
| + | #include "libiproute/utils.h" |
| + | #include "libiproute/ip_common.h" |
| #include "busybox.h" | |
networking/iproute.c+3 -6
| @@ -1,10 +1,7 @@ | |
| /* | |
| * ip.c "ip" utility frontend. | |
| * | |
| - | * 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. |
| + | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. |
| * | |
| * Authors: Alexey Kuznetsov, <[email protected]> | |
| * | |
| @@ -14,8 +11,8 @@ | |
| * Rani Assaf <[email protected]> 980929: resolve addresses | |
| */ | |
| - | #include "./libiproute/utils.h" |
| - | #include "./libiproute/ip_common.h" |
| + | #include "libiproute/utils.h" |
| + | #include "libiproute/ip_common.h" |
| #include "busybox.h" | |
networking/iptunnel.c+3 -6
| @@ -1,10 +1,7 @@ | |
| /* | |
| * ip.c "ip" utility frontend. | |
| * | |
| - | * 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. |
| + | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. |
| * | |
| * Authors: Alexey Kuznetsov, <[email protected]> | |
| * | |
| @@ -14,8 +11,8 @@ | |
| * Rani Assaf <[email protected]> 980929: resolve addresses | |
| */ | |
| - | #include "./libiproute/utils.h" |
| - | #include "./libiproute/ip_common.h" |
| + | #include "libiproute/utils.h" |
| + | #include "libiproute/ip_common.h" |
| #include "busybox.h" | |
networking/libiproute/iproute.c+4 -7
| @@ -1,10 +1,7 @@ | |
| /* | |
| * iproute.c "ip route". | |
| * | |
| - | * 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. |
| + | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. |
| * | |
| * Authors: Alexey Kuznetsov, <[email protected]> | |
| * | |
| @@ -588,7 +585,7 @@ static int iproute_list_or_flush(int argc, char **argv, int flush) | |
| } | |
| if (flush) { | |
| - | int round = 0; |
| + | int _round = 0; |
| char flushb[4096-512]; | |
| if (filter.tb == -1) { | |
| @@ -614,14 +611,14 @@ static int iproute_list_or_flush(int argc, char **argv, int flush) | |
| return -1; | |
| } | |
| if (filter.flushed == 0) { | |
| - | if (round == 0) { |
| + | if (_round == 0) { |
| if (filter.tb != -1 || do_ipv6 == AF_INET6) | |
| fprintf(stderr, "Nothing to flush.\n"); | |
| } | |
| fflush(stdout); | |
| return 0; | |
| } | |
| - | round++; |
| + | _round++; |
| if (flush_update() < 0) | |
| exit(1); | |
| } | |