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

These were broken when using dmalloc due to include file ordering

Browse Source 
problems.  busybox.h must be last.
 -Erik
This commit is contained in:
Eric Andersen 2001-06-23 13:49:14 +00:00
parent d9c8acec37
commit e0c0757d09
6 changed files with 26 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
coreutils/md5sum.c
View File

@ -24,6 +24,13 @@
#include <errno.h> #include <errno.h>
#include <ctype.h> #include <ctype.h>
#include <getopt.h> #include <getopt.h>
#include <stdlib.h>
#include <string.h>
#include <endian.h>
#include <sys/types.h>
#if defined HAVE_LIMITS_H
# include <limits.h>
#endif
#include "busybox.h" #include "busybox.h"
/* For some silly reason, this file uses backwards TRUE and FALSE conventions */ /* For some silly reason, this file uses backwards TRUE and FALSE conventions */
@ -60,12 +67,6 @@
/* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. */ /* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. */
#include <sys/types.h>
#include <stdlib.h>
#include <string.h>
#include <endian.h>
#include "busybox.h"
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
//--------md5.h //--------md5.h
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@ -93,12 +94,6 @@
#ifndef _MD5_H #ifndef _MD5_H
static const int _MD5_H = 1; static const int _MD5_H = 1;
#include <stdio.h>
#if defined HAVE_LIMITS_H || defined _LIBC
# include <limits.h>
#endif
/* The following contortions are an attempt to use the C preprocessor /* The following contortions are an attempt to use the C preprocessor
to determine an unsigned integral type that is 32 bits wide. An to determine an unsigned integral type that is 32 bits wide. An
alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
@ -106,7 +101,6 @@ static const int _MD5_H = 1;
the resulting executable. Locally running cross-compiled executables the resulting executable. Locally running cross-compiled executables
is usually not possible. */ is usually not possible. */
# include <sys/types.h>
typedef u_int32_t md5_uint32; typedef u_int32_t md5_uint32;
/* Structure to save state of computation between the single steps. */ /* Structure to save state of computation between the single steps. */

8
editors/vi.c
View File

@ -19,7 +19,7 @@
*/ */
char *vi_Version = char *vi_Version =
"$Id: vi.c,v 1.8 2001/05/13 00:48:09 andersen Exp $"; "$Id: vi.c,v 1.9 2001/06/23 13:49:14 andersen Exp $";
/* /*
* To compile for standalone use: * To compile for standalone use:
@ -65,9 +65,6 @@ char *vi_Version =
//#define BB_FEATURE_VI_CRASHME // randomly pick commands to execute //#define BB_FEATURE_VI_CRASHME // randomly pick commands to execute
#endif /* STANDALONE */ #endif /* STANDALONE */
#ifndef STANDALONE
#include "busybox.h"
#endif /* STANDALONE */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -86,6 +83,9 @@ char *vi_Version =
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <stdarg.h> #include <stdarg.h>
#ifndef STANDALONE
#include "busybox.h"
#endif /* STANDALONE */
#ifndef TRUE #ifndef TRUE
#define TRUE ((int)1) #define TRUE ((int)1)

4
hostname.c
View File

@ -1,6 +1,6 @@
/* vi: set sw=4 ts=4: */ /* vi: set sw=4 ts=4: */
/* /*
* $Id: hostname.c,v 1.28 2001/05/16 15:40:48 kraai Exp $ * $Id: hostname.c,v 1.29 2001/06/23 13:49:14 andersen Exp $
* Mini hostname implementation for busybox * Mini hostname implementation for busybox
* *
* Copyright (C) 1999 by Randolph Chung <tausq@debian.org> * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@ -23,7 +23,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "busybox.h"
#include <errno.h> #include <errno.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netdb.h> #include <netdb.h>
@ -31,6 +30,7 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "busybox.h"
static void do_sethostname(char *s, int isfile) static void do_sethostname(char *s, int isfile)
{ {

20
md5sum.c
View File

@ -24,6 +24,13 @@
#include <errno.h> #include <errno.h>
#include <ctype.h> #include <ctype.h>
#include <getopt.h> #include <getopt.h>
#include <stdlib.h>
#include <string.h>
#include <endian.h>
#include <sys/types.h>
#if defined HAVE_LIMITS_H
# include <limits.h>
#endif
#include "busybox.h" #include "busybox.h"
/* For some silly reason, this file uses backwards TRUE and FALSE conventions */ /* For some silly reason, this file uses backwards TRUE and FALSE conventions */
@ -60,12 +67,6 @@
/* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. */ /* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. */
#include <sys/types.h>
#include <stdlib.h>
#include <string.h>
#include <endian.h>
#include "busybox.h"
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
//--------md5.h //--------md5.h
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@ -93,12 +94,6 @@
#ifndef _MD5_H #ifndef _MD5_H
static const int _MD5_H = 1; static const int _MD5_H = 1;
#include <stdio.h>
#if defined HAVE_LIMITS_H || defined _LIBC
# include <limits.h>
#endif
/* The following contortions are an attempt to use the C preprocessor /* The following contortions are an attempt to use the C preprocessor
to determine an unsigned integral type that is 32 bits wide. An to determine an unsigned integral type that is 32 bits wide. An
alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
@ -106,7 +101,6 @@ static const int _MD5_H = 1;
the resulting executable. Locally running cross-compiled executables the resulting executable. Locally running cross-compiled executables
is usually not possible. */ is usually not possible. */
# include <sys/types.h>
typedef u_int32_t md5_uint32; typedef u_int32_t md5_uint32;
/* Structure to save state of computation between the single steps. */ /* Structure to save state of computation between the single steps. */

4
networking/hostname.c
View File

@ -1,6 +1,6 @@
/* vi: set sw=4 ts=4: */ /* vi: set sw=4 ts=4: */
/* /*
* $Id: hostname.c,v 1.28 2001/05/16 15:40:48 kraai Exp $ * $Id: hostname.c,v 1.29 2001/06/23 13:49:14 andersen Exp $
* Mini hostname implementation for busybox * Mini hostname implementation for busybox
* *
* Copyright (C) 1999 by Randolph Chung <tausq@debian.org> * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@ -23,7 +23,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "busybox.h"
#include <errno.h> #include <errno.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netdb.h> #include <netdb.h>
@ -31,6 +30,7 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "busybox.h"
static void do_sethostname(char *s, int isfile) static void do_sethostname(char *s, int isfile)
{ {

8
vi.c
View File

@ -19,7 +19,7 @@
*/ */
char *vi_Version = char *vi_Version =
"$Id: vi.c,v 1.8 2001/05/13 00:48:09 andersen Exp $"; "$Id: vi.c,v 1.9 2001/06/23 13:49:14 andersen Exp $";
/* /*
* To compile for standalone use: * To compile for standalone use:
@ -65,9 +65,6 @@ char *vi_Version =
//#define BB_FEATURE_VI_CRASHME // randomly pick commands to execute //#define BB_FEATURE_VI_CRASHME // randomly pick commands to execute
#endif /* STANDALONE */ #endif /* STANDALONE */
#ifndef STANDALONE
#include "busybox.h"
#endif /* STANDALONE */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -86,6 +83,9 @@ char *vi_Version =
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <stdarg.h> #include <stdarg.h>
#ifndef STANDALONE
#include "busybox.h"
#endif /* STANDALONE */
#ifndef TRUE #ifndef TRUE
#define TRUE ((int)1) #define TRUE ((int)1)