rework long option handling. saves ~1.2k

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

diff --git a/include/busybox.h b/include/busybox.h
index d20337ff15e07313007f63c3c742ee43ffadbd5d..8b3647f57c593a9c342da19b9a6b266c7221d51e 100644 (file)
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -9,39 +9,47 @@
 
 #include "libbb.h"
 
-/* order matters:  used as index into "install_dir[]" in busybox.c */
-enum Location {
+#if ENABLE_FEATURE_INSTALLER
+/* order matters: used as index into "install_dir[]" in busybox.c */
+typedef enum bb_install_loc_t {
        _BB_DIR_ROOT = 0,
        _BB_DIR_BIN,
        _BB_DIR_SBIN,
        _BB_DIR_USR_BIN,
        _BB_DIR_USR_SBIN
-};
+} bb_install_loc_t;
+#endif
 
-enum SUIDRoot {
+#if ENABLE_FEATURE_SUID
+typedef enum bb_suid_t {
        _BB_SUID_NEVER = 0,
        _BB_SUID_MAYBE,
        _BB_SUID_ALWAYS
-};
+} bb_suid_t;
+#endif
 
-struct BB_applet {
+struct bb_applet {
        const char *name;
        int (*main) (int argc, char **argv);
-       __extension__ enum Location location:4;
-       __extension__ enum SUIDRoot need_suid:4;
+#if ENABLE_FEATURE_INSTALLER
+       __extension__ enum bb_install_loc_t install_loc:8;
+#endif
+#if ENABLE_FEATURE_SUID
+       __extension__ enum bb_suid_t need_suid:8;
+#endif
+#if ENABLE_FEATURE_PREFER_APPLETS
+       /* true if instead of fork(); exec("applet"); waitpid();
+        * one can do fork(); exit(applet_main(argc,argv)); waitpid(); */
+       unsigned char noexec;
+       /* Even nicer */
+       /* true if instead of fork(); exec("applet"); waitpid();
+        * one can simply call applet_main(argc,argv); */
+       unsigned char nofork;
+#endif
 };
 
-/* From busybox.c */
-extern const struct BB_applet applets[];
-
-/* Automagically pull in all the applet function prototypes and
- * 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.
- */
-#define PROTOTYPES
-#include "applets.h"
-#undef PROTOTYPES
+/* Defined in applet.c */
+extern const struct bb_applet applets[];
+extern const unsigned short NUM_APPLETS;
 
-#endif                                                 /* _BB_INTERNAL_H_ */
+#endif /* _BB_INTERNAL_H_ */