summaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
authorEric Andersen2001-02-20 06:14:08 +0000
committerEric Andersen2001-02-20 06:14:08 +0000
commitcbe31dace5fb24304694d399b9eb267fbe752516 (patch)
tree49d1bb722d95eb1aded6b5d354ac86e56c481c10 /networking
parent94456f598417f2f61edb97b5ab67ddfdc408ad10 (diff)
downloadbusybox-cbe31dace5fb24304694d399b9eb267fbe752516.zip
busybox-cbe31dace5fb24304694d399b9eb267fbe752516.tar.gz
It turns out that DODMALLOC was broken when I reorganized busybox.h
header file usage before the 0.49 release. To fix it, I had to move the '#include "busybox.h"' to the end of the list of #include files. -Erik
Diffstat (limited to 'networking')
-rw-r--r--networking/ifconfig.c6
-rw-r--r--networking/nc.c2
-rw-r--r--networking/nslookup.c4
-rw-r--r--networking/ping.c4
-rw-r--r--networking/route.c4
-rw-r--r--networking/telnet.c2
-rw-r--r--networking/wget.c5
7 files changed, 14 insertions, 13 deletions
diff --git a/networking/ifconfig.c b/networking/ifconfig.c
index 66615a2..a3e2c0f 100644
--- a/networking/ifconfig.c
+++ b/networking/ifconfig.c
@@ -15,17 +15,16 @@
* Foundation; either version 2 of the License, or (at
* your option) any later version.
*
- * $Id: ifconfig.c,v 1.2 2001/02/14 21:23:06 andersen Exp $
+ * $Id: ifconfig.c,v 1.3 2001/02/20 06:14:07 andersen Exp $
*
*/
-#include "busybox.h"
-#include <sys/types.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <string.h> // strcmp and friends
#include <ctype.h> // isdigit and friends
+#include <sys/types.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <netinet/in.h>
@@ -33,6 +32,7 @@
#include <net/if.h>
#include <net/if_arp.h>
#include <linux/if_ether.h>
+#include "busybox.h"
static int sockfd; /* socket fd we use to manipulate stuff with */
diff --git a/networking/nc.c b/networking/nc.c
index 8927103..e40d4b4 100644
--- a/networking/nc.c
+++ b/networking/nc.c
@@ -26,7 +26,6 @@
*/
-#include "busybox.h"
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -38,6 +37,7 @@
#include <netdb.h>
#include <sys/time.h>
#include <sys/ioctl.h>
+#include "busybox.h"
int nc_main(int argc, char **argv)
{
diff --git a/networking/nslookup.c b/networking/nslookup.c
index 33732de..8791b5e 100644
--- a/networking/nslookup.c
+++ b/networking/nslookup.c
@@ -21,7 +21,6 @@
*
*/
-#include "busybox.h"
#include <ctype.h>
#include <errno.h>
#include <stdio.h>
@@ -32,6 +31,7 @@
#include <sys/socket.h>
#include <sys/types.h>
#include <netinet/in.h>
+#include "busybox.h"
/*
| I'm only implementing non-interactive mode;
@@ -170,4 +170,4 @@ int nslookup_main(int argc, char **argv)
return EXIT_SUCCESS;
}
-/* $Id: nslookup.c,v 1.21 2001/02/14 21:23:06 andersen Exp $ */
+/* $Id: nslookup.c,v 1.22 2001/02/20 06:14:08 andersen Exp $ */
diff --git a/networking/ping.c b/networking/ping.c
index c114fb0..50c7ce6 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -1,6 +1,6 @@
/* vi: set sw=4 ts=4: */
/*
- * $Id: ping.c,v 1.37 2001/02/14 21:23:06 andersen Exp $
+ * $Id: ping.c,v 1.38 2001/02/20 06:14:08 andersen Exp $
* Mini ping implementation for busybox
*
* Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -31,7 +31,6 @@
* Original copyright notice is retained at the end of this file.
*/
-#include "busybox.h"
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/file.h>
@@ -50,6 +49,7 @@
#include <unistd.h>
#include <string.h>
#include <stdlib.h>
+#include "busybox.h"
/* It turns out that libc5 doesn't have proper icmp support
diff --git a/networking/route.c b/networking/route.c
index d98d9a0..9be0027 100644
--- a/networking/route.c
+++ b/networking/route.c
@@ -15,14 +15,13 @@
* Foundation; either version 2 of the License, or (at
* your option) any later version.
*
- * $Id: route.c,v 1.6 2001/02/18 20:12:25 andersen Exp $
+ * $Id: route.c,v 1.7 2001/02/20 06:14:08 andersen Exp $
*
* displayroute() code added by Vladimir N. Oleynik <dzo@simtreas.ru>
* busybox style adjustments by Larry Doolittle <LRDoolittle@lbl.gov>
* displayroute() format now matches net-tools-1.57/lib/inet_gr.c line 173.
*/
-#include "busybox.h"
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
@@ -38,6 +37,7 @@
#include <getopt.h>
#include <unistd.h>
#include <ctype.h>
+#include "busybox.h"
#define _(x) x
diff --git a/networking/telnet.c b/networking/telnet.c
index ed92a84..fd1ace4 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -30,7 +30,6 @@
*
*/
-#include "busybox.h"
#include <termios.h>
#include <unistd.h>
#include <errno.h>
@@ -43,6 +42,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
+#include "busybox.h"
#if 0
static const int DOTRACE = 1;
diff --git a/networking/wget.c b/networking/wget.c
index d1aacef..4b8392b 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -14,7 +14,6 @@
*
*/
-#include "busybox.h"
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
@@ -33,6 +32,8 @@
#include <arpa/inet.h>
#include <netdb.h>
+#include "busybox.h"
+
/* Stupid libc5 doesn't define this... */
#ifndef timersub
#define timersub(a, b, result) \
@@ -533,7 +534,7 @@ progressmeter(int flag)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: wget.c,v 1.27 2001/02/14 21:23:06 andersen Exp $
+ * $Id: wget.c,v 1.28 2001/02/20 06:14:08 andersen Exp $
*/