projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rewrote mkdir (and touched lots of things in the process).
[oweals/busybox.git]
/
include
/
busybox.h
diff --git
a/include/busybox.h
b/include/busybox.h
index 9414234c7a26053484ff6d7cc61361e5b6e3493d..e8055b06c0545b5b996b33d6f83cb2281b9bc637 100644
(file)
--- a/
include/busybox.h
+++ b/
include/busybox.h
@@
-31,17
+31,13
@@
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/types.h>
+#define BB_BANNER "BusyBox v" BB_VER " (" BB_BT ")"
+
#ifdef DMALLOC
#include "dmalloc.h"
#endif
#include <features.h>
#ifdef DMALLOC
#include "dmalloc.h"
#endif
#include <features.h>
-/* Stupid libc doesn't have a reliable way for use to know
- * that libc5 is being used. Assume this is good enough */
-#if ! defined __GLIBC__ && ! defined __UCLIBC__
-/* libc5 doesn't define socklen_t */
-typedef unsigned int socklen_t;
-#endif
enum Location {
enum Location {
@@
-70,15
+66,18
@@
extern const struct BB_applet applets[];
#include "applets.h"
#undef PROTOTYPES
#include "applets.h"
#undef PROTOTYPES
-extern const char *applet_name;
-
#ifdef BB_FEATURE_BUFFERS_GO_ON_STACK
#define RESERVE_BB_BUFFER(buffer,len) char buffer[len]
#define RESERVE_BB_UBUFFER(buffer,len) unsigned char buffer[len]
#else
#ifdef BB_FEATURE_BUFFERS_GO_ON_STACK
#define RESERVE_BB_BUFFER(buffer,len) char buffer[len]
#define RESERVE_BB_UBUFFER(buffer,len) unsigned char buffer[len]
#else
+#ifdef BB_FEATURE_BUFFERS_GO_IN_BSS
+#define RESERVE_BB_BUFFER(buffer,len) static char buffer[len]
+#define RESERVE_BB_UBUFFER(buffer,len) static unsigned char buffer[len]
+#else
#define RESERVE_BB_BUFFER(buffer,len) char *buffer=xmalloc(len)
#define RESERVE_BB_UBUFFER(buffer,len) unsigned char *buffer=xmalloc(len)
#endif
#define RESERVE_BB_BUFFER(buffer,len) char *buffer=xmalloc(len)
#define RESERVE_BB_UBUFFER(buffer,len) unsigned char *buffer=xmalloc(len)
#endif
+#endif
/* Bit map related macros -- libc5 doens't provide these... sigh. */
/* Bit map related macros -- libc5 doens't provide these... sigh. */