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

* uniq.c: remove unneeded include and use short boilerplate.

Browse Source 
* 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 clashes with older
	SuSE gcc and use short boilerplate.
This commit is contained in:
Bernhard Reutner-Fischer 2005-10-26 10:47:26 +00:00
parent c58fd15db5
commit ab1878245c
8 changed files with 24 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
coreutils/libcoreutils/coreutils.h
View File

@ -1,3 +1,7 @@
/*
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*/
#ifndef COREUTILS_H #ifndef COREUTILS_H
#define COREUTILS_H 1 #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 int cp_mv_stat(const char *fn, struct stat *fn_stat);
extern mode_t getopt_mk_fifo_nod(int argc, char **argv); extern mode_t getopt_mk_fifo_nod(int argc, char **argv);
extern FILE *xgetoptfile_sort_uniq(char **argv, const char *mode);
#endif #endif

16
coreutils/uniq.c
View File

@ -4,20 +4,7 @@
* *
* Copyright (C) 2005 Manuel Novoa III <mjn3@codepoet.org> * Copyright (C) 2005 Manuel Novoa III <mjn3@codepoet.org>
* *
* This program is free software; you can redistribute it and/or modify * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
* 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
*
*/ */
/* BB_AUDIT SUSv3 compliant */ /* BB_AUDIT SUSv3 compliant */
@ -29,7 +16,6 @@
#include <ctype.h> #include <ctype.h>
#include <unistd.h> #include <unistd.h>
#include "busybox.h" #include "busybox.h"
#include "libcoreutils/coreutils.h"
static const char uniq_opts[] = "f:s:" "cdu\0\1\2\4"; static const char uniq_opts[] = "f:s:" "cdu\0\1\2\4";

9
networking/ip.c
View File

@ -1,10 +1,7 @@
/* /*
* ip.c "ip" utility frontend. * ip.c "ip" utility frontend.
* *
* This program is free software; you can redistribute it and/or * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
* 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.
* *
* Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
* *
@ -23,8 +20,8 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <string.h> #include <string.h>
#include "./libiproute/utils.h" #include "libiproute/utils.h"
#include "./libiproute/ip_common.h" #include "libiproute/ip_common.h"
#include "busybox.h" #include "busybox.h"

9
networking/ipaddr.c
View File

@ -1,10 +1,7 @@
/* /*
* ip.c "ip" utility frontend. * ip.c "ip" utility frontend.
* *
* This program is free software; you can redistribute it and/or * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
* 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.
* *
* Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
* *
@ -14,8 +11,8 @@
* Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
*/ */
#include "./libiproute/utils.h" #include "libiproute/utils.h"
#include "./libiproute/ip_common.h" #include "libiproute/ip_common.h"
#include "busybox.h" #include "busybox.h"

9
networking/iplink.c
View File

@ -1,10 +1,7 @@
/* /*
* ip.c "ip" utility frontend. * ip.c "ip" utility frontend.
* *
* This program is free software; you can redistribute it and/or * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
* 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.
* *
* Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
* *
@ -14,8 +11,8 @@
* Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
*/ */
#include "./libiproute/utils.h" #include "libiproute/utils.h"
#include "./libiproute/ip_common.h" #include "libiproute/ip_common.h"
#include "busybox.h" #include "busybox.h"

9
networking/iproute.c
View File

@ -1,10 +1,7 @@
/* /*
* ip.c "ip" utility frontend. * ip.c "ip" utility frontend.
* *
* This program is free software; you can redistribute it and/or * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
* 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.
* *
* Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
* *
@ -14,8 +11,8 @@
* Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
*/ */
#include "./libiproute/utils.h" #include "libiproute/utils.h"
#include "./libiproute/ip_common.h" #include "libiproute/ip_common.h"
#include "busybox.h" #include "busybox.h"

9
networking/iptunnel.c
View File

@ -1,10 +1,7 @@
/* /*
* ip.c "ip" utility frontend. * ip.c "ip" utility frontend.
* *
* This program is free software; you can redistribute it and/or * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
* 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.
* *
* Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
* *
@ -14,8 +11,8 @@
* Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
*/ */
#include "./libiproute/utils.h" #include "libiproute/utils.h"
#include "./libiproute/ip_common.h" #include "libiproute/ip_common.h"
#include "busybox.h" #include "busybox.h"

11
networking/libiproute/iproute.c
View File

@ -1,10 +1,7 @@
/* /*
* iproute.c "ip route". * iproute.c "ip route".
* *
* This program is free software; you can redistribute it and/or * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
* 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.
* *
* Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
* *
@ -588,7 +585,7 @@ static int iproute_list_or_flush(int argc, char **argv, int flush)
} }
if (flush) { if (flush) {
int round = 0; int _round = 0;
char flushb[4096-512]; char flushb[4096-512];
if (filter.tb == -1) { if (filter.tb == -1) {
@ -614,14 +611,14 @@ static int iproute_list_or_flush(int argc, char **argv, int flush)
return -1; return -1;
} }
if (filter.flushed == 0) { if (filter.flushed == 0) {
if (round == 0) { if (_round == 0) {
if (filter.tb != -1 || do_ipv6 == AF_INET6) if (filter.tb != -1 || do_ipv6 == AF_INET6)
fprintf(stderr, "Nothing to flush.\n"); fprintf(stderr, "Nothing to flush.\n");
} }
fflush(stdout); fflush(stdout);
return 0; return 0;
} }
round++; _round++;
if (flush_update() < 0) if (flush_update() < 0)
exit(1); exit(1);
} }