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
This commit is contained in:
Eric Andersen
2001-02-20 06:14:08 +00:00
parent 94456f5984
commit cbe31dace5
204 changed files with 362 additions and 378 deletions

View File

@@ -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 */

View File

@@ -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)
{

View File

@@ -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 $ */

View File

@@ -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

View File

@@ -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

View File

@@ -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;

View File

@@ -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 $
*/