svn commit: trunk/busybox: coreutils coreutils/libcoreutils network etc...
aldot at busybox.net
aldot at busybox.net
Wed Oct 26 10:47:28 UTC 2005
Author: aldot
Date: 2005-10-26 03:47:26 -0700 (Wed, 26 Oct 2005)
New Revision: 11924
Log:
* 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 clashes with older
SuSE gcc and use short boilerplate.
Modified:
trunk/busybox/coreutils/libcoreutils/coreutils.h
trunk/busybox/coreutils/uniq.c
trunk/busybox/networking/ip.c
trunk/busybox/networking/ipaddr.c
trunk/busybox/networking/iplink.c
trunk/busybox/networking/iproute.c
trunk/busybox/networking/iptunnel.c
trunk/busybox/networking/libiproute/iproute.c
Changeset:
Modified: trunk/busybox/coreutils/libcoreutils/coreutils.h
===================================================================
--- trunk/busybox/coreutils/libcoreutils/coreutils.h 2005-10-26 10:15:05 UTC (rev 11923)
+++ trunk/busybox/coreutils/libcoreutils/coreutils.h 2005-10-26 10:47:26 UTC (rev 11924)
@@ -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_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
Modified: trunk/busybox/coreutils/uniq.c
===================================================================
--- trunk/busybox/coreutils/uniq.c 2005-10-26 10:15:05 UTC (rev 11923)
+++ trunk/busybox/coreutils/uniq.c 2005-10-26 10:47:26 UTC (rev 11924)
@@ -4,20 +4,7 @@
*
* Copyright (C) 2005 Manuel Novoa III <mjn3 at codepoet.org>
*
- * 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";
Modified: trunk/busybox/networking/ip.c
===================================================================
--- trunk/busybox/networking/ip.c 2005-10-26 10:15:05 UTC (rev 11923)
+++ trunk/busybox/networking/ip.c 2005-10-26 10:47:26 UTC (rev 11924)
@@ -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, <kuznet at ms2.inr.ac.ru>
*
@@ -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"
Modified: trunk/busybox/networking/ipaddr.c
===================================================================
--- trunk/busybox/networking/ipaddr.c 2005-10-26 10:15:05 UTC (rev 11923)
+++ trunk/busybox/networking/ipaddr.c 2005-10-26 10:47:26 UTC (rev 11924)
@@ -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, <kuznet at ms2.inr.ac.ru>
*
@@ -14,8 +11,8 @@
* Rani Assaf <rani at magic.metawire.com> 980929: resolve addresses
*/
-#include "./libiproute/utils.h"
-#include "./libiproute/ip_common.h"
+#include "libiproute/utils.h"
+#include "libiproute/ip_common.h"
#include "busybox.h"
Modified: trunk/busybox/networking/iplink.c
===================================================================
--- trunk/busybox/networking/iplink.c 2005-10-26 10:15:05 UTC (rev 11923)
+++ trunk/busybox/networking/iplink.c 2005-10-26 10:47:26 UTC (rev 11924)
@@ -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, <kuznet at ms2.inr.ac.ru>
*
@@ -14,8 +11,8 @@
* Rani Assaf <rani at magic.metawire.com> 980929: resolve addresses
*/
-#include "./libiproute/utils.h"
-#include "./libiproute/ip_common.h"
+#include "libiproute/utils.h"
+#include "libiproute/ip_common.h"
#include "busybox.h"
Modified: trunk/busybox/networking/iproute.c
===================================================================
--- trunk/busybox/networking/iproute.c 2005-10-26 10:15:05 UTC (rev 11923)
+++ trunk/busybox/networking/iproute.c 2005-10-26 10:47:26 UTC (rev 11924)
@@ -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, <kuznet at ms2.inr.ac.ru>
*
@@ -14,8 +11,8 @@
* Rani Assaf <rani at magic.metawire.com> 980929: resolve addresses
*/
-#include "./libiproute/utils.h"
-#include "./libiproute/ip_common.h"
+#include "libiproute/utils.h"
+#include "libiproute/ip_common.h"
#include "busybox.h"
Modified: trunk/busybox/networking/iptunnel.c
===================================================================
--- trunk/busybox/networking/iptunnel.c 2005-10-26 10:15:05 UTC (rev 11923)
+++ trunk/busybox/networking/iptunnel.c 2005-10-26 10:47:26 UTC (rev 11924)
@@ -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, <kuznet at ms2.inr.ac.ru>
*
@@ -14,8 +11,8 @@
* Rani Assaf <rani at magic.metawire.com> 980929: resolve addresses
*/
-#include "./libiproute/utils.h"
-#include "./libiproute/ip_common.h"
+#include "libiproute/utils.h"
+#include "libiproute/ip_common.h"
#include "busybox.h"
Modified: trunk/busybox/networking/libiproute/iproute.c
===================================================================
--- trunk/busybox/networking/libiproute/iproute.c 2005-10-26 10:15:05 UTC (rev 11923)
+++ trunk/busybox/networking/libiproute/iproute.c 2005-10-26 10:47:26 UTC (rev 11924)
@@ -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, <kuznet at ms2.inr.ac.ru>
*
@@ -588,7 +585,7 @@
}
if (flush) {
- int round = 0;
+ int _round = 0;
char flushb[4096-512];
if (filter.tb == -1) {
@@ -614,14 +611,14 @@
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);
}
More information about the busybox-cvs
mailing list