d4cffd1cc
Bernhard Reutner-Fischer
2005-09-21
Subject
- make sure to include dmalloc.h at the very end of busybox.h or libbb.h.
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/busybox.h+4 -4
| @@ -44,10 +44,6 @@ | |
| #define BB_BANNER "BusyBox v" BB_VER " (" BB_EXTRA_VERSION ")" | |
| #endif | |
| - | #ifdef DMALLOC |
| - | #include <dmalloc.h> |
| - | #endif |
| - | |
| #include <features.h> | |
| /* Pull in the utility routines from libbb */ | |
| @@ -118,4 +114,8 @@ extern const struct BB_applet applets[]; | |
| #define PATH_MAX 256 | |
| #endif | |
| + | #ifdef DMALLOC |
| + | #include <dmalloc.h> |
| + | #endif |
| + | |
| #endif /* _BB_INTERNAL_H_ */ | |
include/libbb.h+11 -10
| @@ -34,15 +34,11 @@ | |
| #include <netdb.h> | |
| - | #ifdef DMALLOC |
| - | #include <dmalloc.h> |
| - | #endif |
| - | |
| #include <features.h> | |
| #include "bb_config.h" | |
| #ifdef CONFIG_SELINUX | |
| - | #include <selinux/selinux.h> |
| + | #include <selinux/selinux.h> |
| #endif | |
| #include "pwd_.h" | |
| @@ -178,12 +174,12 @@ extern const char *bb_skip_whitespace(const char *); | |
| extern struct BB_applet *find_applet_by_name(const char *name); | |
| void run_applet_by_name(const char *name, int argc, char **argv); | |
| - | //#warning is this needed anymore? |
| - | #ifndef DMALLOC |
| - | extern void *xmalloc (size_t size); |
| + | /* dmalloc will redefine these to it's own implementation. It is safe |
| + | * to have the prototypes here unconditionally. */ |
| + | extern void *xmalloc(size_t size); |
| extern void *xrealloc(void *old, size_t size); | |
| extern void *xcalloc(size_t nmemb, size_t size); | |
| - | #endif |
| + | |
| extern char *bb_xstrdup (const char *s); | |
| extern char *bb_xstrndup (const char *s, int n); | |
| extern char *safe_strncpy(char *dst, const char *src, size_t size); | |
| @@ -420,7 +416,7 @@ extern void run_shell ( const char *shell, int loginshell, const char *command, | |
| #ifdef CONFIG_SELINUX | |
| extern void renew_current_security_context(void); | |
| extern void set_current_security_context(security_context_t sid); | |
| - | #endif |
| + | #endif |
| extern int run_parts(char **args, const unsigned char test_mode, char **env); | |
| extern int restricted_shell ( const char *shell ); | |
| extern void setup_environment ( const char *shell, int loginshell, int changeenv, const struct passwd *pw ); | |
| @@ -475,4 +471,9 @@ extern unsigned long get_ug_id(const char *s, long (*__bb_getxxnam)(const char * | |
| #define HASH_MD5 2 | |
| extern int hash_fd(int fd, const size_t size, const uint8_t hash_algo, uint8_t *hashval); | |
| + | /* busybox.h will include dmalloc later for us, else include it here. */ |
| + | #if !defined _BB_INTERNAL_H_ && defined DMALLOC |
| + | #include <dmalloc.h> |
| + | #endif |
| + | |
| #endif /* __LIBCONFIG_H__ */ | |