aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-06-23 13:49:14 +0000
committerEric Andersen <andersen@codepoet.org>2001-06-23 13:49:14 +0000
commite0c0757d0925d7f83e2e107861c4e3ec8f525108 (patch)
tree806346c72b573fa64f1c381ea49853fcf15a2964
parentd9c8acec373213fb4c1778ab03364372fdf7a63b (diff)
downloadbusybox-w32-e0c0757d0925d7f83e2e107861c4e3ec8f525108.tar.gz
busybox-w32-e0c0757d0925d7f83e2e107861c4e3ec8f525108.tar.bz2
busybox-w32-e0c0757d0925d7f83e2e107861c4e3ec8f525108.zip
These were broken when using dmalloc due to include file ordering
problems. busybox.h must be last. -Erik
Diffstat
-rw-r--r--coreutils/md5sum.c20
-rw-r--r--editors/vi.c8
-rw-r--r--hostname.c4
-rw-r--r--md5sum.c20
-rw-r--r--networking/hostname.c4
-rw-r--r--vi.c8
6 files changed, 26 insertions, 38 deletions
diff --git a/coreutils/md5sum.c b/coreutils/md5sum.c
index e5a2abe78..dcb05c156 100644
--- a/coreutils/md5sum.c
+++ b/coreutils/md5sum.c
@@ -24,6 +24,13 @@
24#include <errno.h> 24#include <errno.h>
25#include <ctype.h> 25#include <ctype.h>
26#include <getopt.h> 26#include <getopt.h>
27#include <stdlib.h>
28#include <string.h>
29#include <endian.h>
30#include <sys/types.h>
31#if defined HAVE_LIMITS_H
32# include <limits.h>
33#endif
27#include "busybox.h" 34#include "busybox.h"
28 35
29/* For some silly reason, this file uses backwards TRUE and FALSE conventions */ 36/* For some silly reason, this file uses backwards TRUE and FALSE conventions */
@@ -60,12 +67,6 @@
60 67
61/* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. */ 68/* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. */
62 69
63#include <sys/types.h>
64#include <stdlib.h>
65#include <string.h>
66#include <endian.h>
67
68#include "busybox.h"
69//---------------------------------------------------------------------------- 70//----------------------------------------------------------------------------
70//--------md5.h 71//--------md5.h
71//---------------------------------------------------------------------------- 72//----------------------------------------------------------------------------
@@ -93,12 +94,6 @@
93#ifndef _MD5_H 94#ifndef _MD5_H
94static const int _MD5_H = 1; 95static const int _MD5_H = 1;
95 96
96#include <stdio.h>
97
98#if defined HAVE_LIMITS_H || defined _LIBC
99# include <limits.h>
100#endif
101
102/* The following contortions are an attempt to use the C preprocessor 97/* The following contortions are an attempt to use the C preprocessor
103 to determine an unsigned integral type that is 32 bits wide. An 98 to determine an unsigned integral type that is 32 bits wide. An
104 alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but 99 alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
@@ -106,7 +101,6 @@ static const int _MD5_H = 1;
106 the resulting executable. Locally running cross-compiled executables 101 the resulting executable. Locally running cross-compiled executables
107 is usually not possible. */ 102 is usually not possible. */
108 103
109# include <sys/types.h>
110typedef u_int32_t md5_uint32; 104typedef u_int32_t md5_uint32;
111 105
112/* Structure to save state of computation between the single steps. */ 106/* Structure to save state of computation between the single steps. */
diff --git a/editors/vi.c b/editors/vi.c
index 6d1502966..bd183e8b0 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -19,7 +19,7 @@
19 */ 19 */
20 20
21char *vi_Version = 21char *vi_Version =
22 "$Id: vi.c,v 1.8 2001/05/13 00:48:09 andersen Exp $"; 22 "$Id: vi.c,v 1.9 2001/06/23 13:49:14 andersen Exp $";
23 23
24/* 24/*
25 * To compile for standalone use: 25 * To compile for standalone use:
@@ -65,9 +65,6 @@ char *vi_Version =
65//#define BB_FEATURE_VI_CRASHME // randomly pick commands to execute 65//#define BB_FEATURE_VI_CRASHME // randomly pick commands to execute
66#endif /* STANDALONE */ 66#endif /* STANDALONE */
67 67
68#ifndef STANDALONE
69#include "busybox.h"
70#endif /* STANDALONE */
71#include <stdio.h> 68#include <stdio.h>
72#include <stdlib.h> 69#include <stdlib.h>
73#include <string.h> 70#include <string.h>
@@ -86,6 +83,9 @@ char *vi_Version =
86#include <assert.h> 83#include <assert.h>
87#include <errno.h> 84#include <errno.h>
88#include <stdarg.h> 85#include <stdarg.h>
86#ifndef STANDALONE
87#include "busybox.h"
88#endif /* STANDALONE */
89 89
90#ifndef TRUE 90#ifndef TRUE
91#define TRUE ((int)1) 91#define TRUE ((int)1)
diff --git a/hostname.c b/hostname.c
index 75e4d2e57..573c8cece 100644
--- a/hostname.c
+++ b/hostname.c
@@ -1,6 +1,6 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* 2/*
3 * $Id: hostname.c,v 1.28 2001/05/16 15:40:48 kraai Exp $ 3 * $Id: hostname.c,v 1.29 2001/06/23 13:49:14 andersen Exp $
4 * Mini hostname implementation for busybox 4 * Mini hostname implementation for busybox
5 * 5 *
6 * Copyright (C) 1999 by Randolph Chung <tausq@debian.org> 6 * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -23,7 +23,6 @@
23 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 23 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
24 */ 24 */
25 25
26#include "busybox.h"
27#include <errno.h> 26#include <errno.h>
28#include <arpa/inet.h> 27#include <arpa/inet.h>
29#include <netdb.h> 28#include <netdb.h>
@@ -31,6 +30,7 @@
31#include <string.h> 30#include <string.h>
32#include <stdio.h> 31#include <stdio.h>
33#include <stdlib.h> 32#include <stdlib.h>
33#include "busybox.h"
34 34
35static void do_sethostname(char *s, int isfile) 35static void do_sethostname(char *s, int isfile)
36{ 36{
diff --git a/md5sum.c b/md5sum.c
index e5a2abe78..dcb05c156 100644
--- a/md5sum.c
+++ b/md5sum.c
@@ -24,6 +24,13 @@
24#include <errno.h> 24#include <errno.h>
25#include <ctype.h> 25#include <ctype.h>
26#include <getopt.h> 26#include <getopt.h>
27#include <stdlib.h>
28#include <string.h>
29#include <endian.h>
30#include <sys/types.h>
31#if defined HAVE_LIMITS_H
32# include <limits.h>
33#endif
27#include "busybox.h" 34#include "busybox.h"
28 35
29/* For some silly reason, this file uses backwards TRUE and FALSE conventions */ 36/* For some silly reason, this file uses backwards TRUE and FALSE conventions */
@@ -60,12 +67,6 @@
60 67
61/* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. */ 68/* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. */
62 69
63#include <sys/types.h>
64#include <stdlib.h>
65#include <string.h>
66#include <endian.h>
67
68#include "busybox.h"
69//---------------------------------------------------------------------------- 70//----------------------------------------------------------------------------
70//--------md5.h 71//--------md5.h
71//---------------------------------------------------------------------------- 72//----------------------------------------------------------------------------
@@ -93,12 +94,6 @@
93#ifndef _MD5_H 94#ifndef _MD5_H
94static const int _MD5_H = 1; 95static const int _MD5_H = 1;
95 96
96#include <stdio.h>
97
98#if defined HAVE_LIMITS_H || defined _LIBC
99# include <limits.h>
100#endif
101
102/* The following contortions are an attempt to use the C preprocessor 97/* The following contortions are an attempt to use the C preprocessor
103 to determine an unsigned integral type that is 32 bits wide. An 98 to determine an unsigned integral type that is 32 bits wide. An
104 alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but 99 alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
@@ -106,7 +101,6 @@ static const int _MD5_H = 1;
106 the resulting executable. Locally running cross-compiled executables 101 the resulting executable. Locally running cross-compiled executables
107 is usually not possible. */ 102 is usually not possible. */
108 103
109# include <sys/types.h>
110typedef u_int32_t md5_uint32; 104typedef u_int32_t md5_uint32;
111 105
112/* Structure to save state of computation between the single steps. */ 106/* Structure to save state of computation between the single steps. */
diff --git a/networking/hostname.c b/networking/hostname.c
index 75e4d2e57..573c8cece 100644
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -1,6 +1,6 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* 2/*
3 * $Id: hostname.c,v 1.28 2001/05/16 15:40:48 kraai Exp $ 3 * $Id: hostname.c,v 1.29 2001/06/23 13:49:14 andersen Exp $
4 * Mini hostname implementation for busybox 4 * Mini hostname implementation for busybox
5 * 5 *
6 * Copyright (C) 1999 by Randolph Chung <tausq@debian.org> 6 * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -23,7 +23,6 @@
23 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 23 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
24 */ 24 */
25 25
26#include "busybox.h"
27#include <errno.h> 26#include <errno.h>
28#include <arpa/inet.h> 27#include <arpa/inet.h>
29#include <netdb.h> 28#include <netdb.h>
@@ -31,6 +30,7 @@
31#include <string.h> 30#include <string.h>
32#include <stdio.h> 31#include <stdio.h>
33#include <stdlib.h> 32#include <stdlib.h>
33#include "busybox.h"
34 34
35static void do_sethostname(char *s, int isfile) 35static void do_sethostname(char *s, int isfile)
36{ 36{
diff --git a/vi.c b/vi.c
index 6d1502966..bd183e8b0 100644
--- a/vi.c
+++ b/vi.c
@@ -19,7 +19,7 @@
19 */ 19 */
20 20
21char *vi_Version = 21char *vi_Version =
22 "$Id: vi.c,v 1.8 2001/05/13 00:48:09 andersen Exp $"; 22 "$Id: vi.c,v 1.9 2001/06/23 13:49:14 andersen Exp $";
23 23
24/* 24/*
25 * To compile for standalone use: 25 * To compile for standalone use:
@@ -65,9 +65,6 @@ char *vi_Version =
65//#define BB_FEATURE_VI_CRASHME // randomly pick commands to execute 65//#define BB_FEATURE_VI_CRASHME // randomly pick commands to execute
66#endif /* STANDALONE */ 66#endif /* STANDALONE */
67 67
68#ifndef STANDALONE
69#include "busybox.h"
70#endif /* STANDALONE */
71#include <stdio.h> 68#include <stdio.h>
72#include <stdlib.h> 69#include <stdlib.h>
73#include <string.h> 70#include <string.h>
@@ -86,6 +83,9 @@ char *vi_Version =
86#include <assert.h> 83#include <assert.h>
87#include <errno.h> 84#include <errno.h>
88#include <stdarg.h> 85#include <stdarg.h>
86#ifndef STANDALONE
87#include "busybox.h"
88#endif /* STANDALONE */
89 89
90#ifndef TRUE 90#ifndef TRUE
91#define TRUE ((int)1) 91#define TRUE ((int)1)
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-22 15:48:19 +0000