Make the loop support stuff be much less evil, and make it cope

[oweals/busybox.git] / include / busybox.h

diff --git a/include/busybox.h b/include/busybox.h
index ea58c0c2843a5b575f6acea0565b37fea60586b4..ba4edcabaf9d7d7e33a602955e23d771376c2e59 100644 (file)
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -27,11 +27,22 @@
 #include "config.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <stdarg.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#if __GNU_LIBRARY__ < 5
+#ifndef __dietlibc__
+#error "Sorry, libc5 is not supported"
+#endif
+#endif
+
+#ifndef BB_EXTRA_VERSION
 #define BB_BANNER "BusyBox v" BB_VER " (" BB_BT ")"
+#else
+#define BB_BANNER "BusyBox v" BB_VER " (" BB_EXTRA_VERSION ")"
+#endif
 
 #ifdef DMALLOC
 #include <dmalloc.h>
@@ -39,6 +50,8 @@
 
 #include <features.h>
 
+/* Pull in the utility routines from libbb */
+#include "libbb.h"
 
 enum Location {
        _BB_DIR_ROOT = 0,
@@ -48,11 +61,19 @@ enum Location {
        _BB_DIR_USR_SBIN
 };
 
+enum SUIDRoot {
+       _BB_SUID_NEVER = 0,
+       _BB_SUID_MAYBE,
+       _BB_SUID_ALWAYS
+};
+
 struct BB_applet {
-       const   char*   name;
-       int     (*main)(int argc, char** argv);
-       enum    Location        location;
+       const char *name;
+       int (*main) (int argc, char **argv);
+       enum Location location:4;
+       enum SUIDRoot need_suid:4;
 };
+
 /* From busybox.c */
 extern const struct BB_applet applets[];
 
@@ -83,30 +104,18 @@ extern const struct BB_applet applets[];
 #endif
 
 
-/* Bit map related macros -- libc5 doens't provide these... sigh.  */
-#ifndef setbit
-#define NBBY            CHAR_BIT
-#define setbit(a,i)     ((a)[(i)/NBBY] |= 1<<((i)%NBBY))
-#define clrbit(a,i)     ((a)[(i)/NBBY] &= ~(1<<((i)%NBBY)))
-#define isset(a,i)      ((a)[(i)/NBBY] & (1<<((i)%NBBY)))
-#define isclr(a,i)      (((a)[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
-#endif
-
 #ifndef RB_POWER_OFF
 /* Stop system and switch power off if possible.  */
 #define RB_POWER_OFF   0x4321fedc
 #endif
 
-
-/* Pull in the utility routines from libbb */
-#include "libbb.h"
-
 /* Try to pull in PATH_MAX */
 #include <limits.h>
+
 /* for PATH_MAX on systems that don't have it in limits.h */
-#include <sys/param.h> 
-#ifndef PATH_MAX 
+#include <sys/param.h>
+#ifndef PATH_MAX
 #define  PATH_MAX         256
 #endif
 
-#endif /* _BB_INTERNAL_H_ */
+#endif                                                 /* _BB_INTERNAL_H_ */