fix printf warning

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

diff --git a/include/busybox.h b/include/busybox.h
index 87cebc3d1ee4365923e556483ede59342aba5163..3ff3d8a37ac0f005a3ba32cfb3dc3c6ae52ff584 100644 (file)
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
- * Based in part on code from sash, Copyright (c) 1999 by David I. Bell 
+ * Based in part on code from sash, Copyright (c) 1999 by David I. Bell
  * Permission has been granted to redistribute this code under the GPL.
  *
  */
@@ -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 && \
+    !defined(__dietlibc__) && \
+    !defined(_NEWLIB_VERSION)
+#error "Sorry, this libc version is not supported :("
+#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[];
 
@@ -60,7 +81,7 @@ extern const struct BB_applet applets[];
  * applet usage strings.  These are all of the form:
  *             extern int foo_main(int argc, char **argv);
  *             extern const char foo_usage[];
- * These are all autogenerated from the set of currently defined applets. 
+ * These are all autogenerated from the set of currently defined applets.
  */
 #define PROTOTYPES
 #include "applets.h"
@@ -83,24 +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
 
+/* Try to pull in PATH_MAX */
+#include <limits.h>
 
-/* Pull in the utility routines from libbb */
-#include "libbb.h"
-
-
+/* for PATH_MAX on systems that don't have it in limits.h */
+#include <sys/param.h>
+#ifndef PATH_MAX
+#define  PATH_MAX         256
+#endif
 
-#endif /* _BB_INTERNAL_H_ */
+#endif                                                 /* _BB_INTERNAL_H_ */