diff options
author | Eric Andersen <andersen@codepoet.org> | 2001-02-20 06:14:08 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2001-02-20 06:14:08 +0000 |
commit | cbe31dace5fb24304694d399b9eb267fbe752516 (patch) | |
tree | 49d1bb722d95eb1aded6b5d354ac86e56c481c10 /archival | |
parent | 94456f598417f2f61edb97b5ab67ddfdc408ad10 (diff) | |
download | busybox-w32-cbe31dace5fb24304694d399b9eb267fbe752516.tar.gz busybox-w32-cbe31dace5fb24304694d399b9eb267fbe752516.tar.bz2 busybox-w32-cbe31dace5fb24304694d399b9eb267fbe752516.zip |
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 'archival')
-rw-r--r-- | archival/gunzip.c | 2 | ||||
-rw-r--r-- | archival/gzip.c | 23 | ||||
-rw-r--r-- | archival/tar.c | 10 |
3 files changed, 12 insertions, 23 deletions
diff --git a/archival/gunzip.c b/archival/gunzip.c index bf8812dbd..8100003ec 100644 --- a/archival/gunzip.c +++ b/archival/gunzip.c | |||
@@ -57,7 +57,6 @@ static char *license_msg[] = { | |||
57 | }; | 57 | }; |
58 | #endif | 58 | #endif |
59 | 59 | ||
60 | #include "busybox.h" | ||
61 | #include <getopt.h> | 60 | #include <getopt.h> |
62 | #include <ctype.h> | 61 | #include <ctype.h> |
63 | #include <sys/types.h> | 62 | #include <sys/types.h> |
@@ -71,6 +70,7 @@ static char *license_msg[] = { | |||
71 | #include <stdlib.h> | 70 | #include <stdlib.h> |
72 | #include <time.h> | 71 | #include <time.h> |
73 | #include <dirent.h> | 72 | #include <dirent.h> |
73 | #include "busybox.h" | ||
74 | #define BB_DECLARE_EXTERN | 74 | #define BB_DECLARE_EXTERN |
75 | #define bb_need_memory_exhausted | 75 | #define bb_need_memory_exhausted |
76 | #define bb_need_name_too_long | 76 | #define bb_need_name_too_long |
diff --git a/archival/gzip.c b/archival/gzip.c index 3cbef4ec1..6c058d2b6 100644 --- a/archival/gzip.c +++ b/archival/gzip.c | |||
@@ -29,11 +29,6 @@ | |||
29 | * | 29 | * |
30 | */ | 30 | */ |
31 | 31 | ||
32 | #include "busybox.h" | ||
33 | #define BB_DECLARE_EXTERN | ||
34 | #define bb_need_memory_exhausted | ||
35 | #include "messages.c" | ||
36 | |||
37 | /* These defines are very important for BusyBox. Without these, | 32 | /* These defines are very important for BusyBox. Without these, |
38 | * huge chunks of ram are pre-allocated making the BusyBox bss | 33 | * huge chunks of ram are pre-allocated making the BusyBox bss |
39 | * size Freaking Huge(tm), which is a bad thing.*/ | 34 | * size Freaking Huge(tm), which is a bad thing.*/ |
@@ -43,9 +38,15 @@ | |||
43 | /* I don't like nested includes, but the string and io functions are used | 38 | /* I don't like nested includes, but the string and io functions are used |
44 | * too often | 39 | * too often |
45 | */ | 40 | */ |
41 | #include <stdlib.h> | ||
46 | #include <stdio.h> | 42 | #include <stdio.h> |
47 | #include <string.h> | 43 | #include <string.h> |
48 | #include <unistd.h> | 44 | #include <unistd.h> |
45 | #include "busybox.h" | ||
46 | #define BB_DECLARE_EXTERN | ||
47 | #define bb_need_memory_exhausted | ||
48 | #include "messages.c" | ||
49 | |||
49 | #define memzero(s, n) memset ((void *)(s), 0, (n)) | 50 | #define memzero(s, n) memset ((void *)(s), 0, (n)) |
50 | 51 | ||
51 | #ifndef RETSIGTYPE | 52 | #ifndef RETSIGTYPE |
@@ -1628,12 +1629,6 @@ ulg deflate() | |||
1628 | # include <unistd.h> | 1629 | # include <unistd.h> |
1629 | #endif | 1630 | #endif |
1630 | 1631 | ||
1631 | #if defined(STDC_HEADERS) || !defined(NO_STDLIB_H) | ||
1632 | # include <stdlib.h> | ||
1633 | #else | ||
1634 | extern int errno; | ||
1635 | #endif | ||
1636 | |||
1637 | #if defined(DIRENT) | 1632 | #if defined(DIRENT) |
1638 | # include <dirent.h> | 1633 | # include <dirent.h> |
1639 | typedef struct dirent dir_type; | 1634 | typedef struct dirent dir_type; |
@@ -3098,12 +3093,6 @@ local void set_file_type() | |||
3098 | # include <fcntl.h> | 3093 | # include <fcntl.h> |
3099 | #endif | 3094 | #endif |
3100 | 3095 | ||
3101 | #if defined(STDC_HEADERS) || !defined(NO_STDLIB_H) | ||
3102 | # include <stdlib.h> | ||
3103 | #else | ||
3104 | extern int errno; | ||
3105 | #endif | ||
3106 | |||
3107 | /* =========================================================================== | 3096 | /* =========================================================================== |
3108 | * Copy input to output unchanged: zcat == cat with --force. | 3097 | * Copy input to output unchanged: zcat == cat with --force. |
3109 | * IN assertion: insize bytes have already been read in inbuf. | 3098 | * IN assertion: insize bytes have already been read in inbuf. |
diff --git a/archival/tar.c b/archival/tar.c index 62f1b1d35..a9363d5ad 100644 --- a/archival/tar.c +++ b/archival/tar.c | |||
@@ -36,11 +36,6 @@ | |||
36 | */ | 36 | */ |
37 | 37 | ||
38 | 38 | ||
39 | #include "busybox.h" | ||
40 | #define BB_DECLARE_EXTERN | ||
41 | #define bb_need_io_error | ||
42 | #define bb_need_name_longer_than_foo | ||
43 | #include "messages.c" | ||
44 | #include <stdio.h> | 39 | #include <stdio.h> |
45 | #include <dirent.h> | 40 | #include <dirent.h> |
46 | #include <errno.h> | 41 | #include <errno.h> |
@@ -55,6 +50,11 @@ | |||
55 | #include <string.h> | 50 | #include <string.h> |
56 | #include <stdlib.h> | 51 | #include <stdlib.h> |
57 | #include <unistd.h> | 52 | #include <unistd.h> |
53 | #include "busybox.h" | ||
54 | #define BB_DECLARE_EXTERN | ||
55 | #define bb_need_io_error | ||
56 | #define bb_need_name_longer_than_foo | ||
57 | #include "messages.c" | ||
58 | 58 | ||
59 | #ifdef BB_FEATURE_TAR_GZIP | 59 | #ifdef BB_FEATURE_TAR_GZIP |
60 | extern int unzip(int in, int out); | 60 | extern int unzip(int in, int out); |