ash: undo "tokname hack"

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

diff --git a/include/busybox.h b/include/busybox.h
index a1139b5aa8f0e57933615df38fc57be66a64e42d..6a003d544497ee6e8376abfd125fba9cd26b6514 100644 (file)
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -1,49 +1,58 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Busybox main internal header file
- *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-#ifndef        _BB_INTERNAL_H_
-#define        _BB_INTERNAL_H_    1
+#ifndef BUSYBOX_H
+#define BUSYBOX_H 1
 
 #include "libbb.h"
+/* BB_DIR_foo and BB_SUID_bar constants: */
+#include "applet_metadata.h"
 
-/* order matters: used as index into "install_dir[]" in busybox.c */
-enum Location {
-       _BB_DIR_ROOT = 0,
-       _BB_DIR_BIN,
-       _BB_DIR_SBIN,
-       _BB_DIR_USR_BIN,
-       _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);
-       __extension__ enum Location location:4;
-       __extension__ enum SUIDRoot need_suid:4;
-};
-
-/* From busybox.c and applet.c */
-extern int busybox_main(int argc, char **argv);
-extern const struct BB_applet applets[];
-extern const unsigned short NUM_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.
+PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
+
+/* Defined in appletlib.c (by including generated applet_tables.h) */
+/* Keep in sync with applets/applet_tables.c! */
+extern const char applet_names[] ALIGN1;
+extern int (*const applet_main[])(int argc, char **argv);
+extern const uint8_t applet_flags[] ALIGN1;
+extern const uint8_t applet_suid[] ALIGN1;
+extern const uint8_t applet_install_loc[] ALIGN1;
+
+#if ENABLE_FEATURE_PREFER_APPLETS \
+ || ENABLE_FEATURE_SH_STANDALONE \
+ || ENABLE_FEATURE_SH_NOFORK
+# define APPLET_IS_NOFORK(i) (applet_flags[(i)/4] & (1 << (2 * ((i)%4))))
+# define APPLET_IS_NOEXEC(i) (applet_flags[(i)/4] & (1 << ((2 * ((i)%4))+1)))
+#else
+# define APPLET_IS_NOFORK(i) 0
+# define APPLET_IS_NOEXEC(i) 0
+#endif
+
+#if ENABLE_FEATURE_SUID
+# define APPLET_SUID(i) ((applet_suid[(i)/4] >> (2 * ((i)%4)) & 3))
+#endif
+
+#if ENABLE_FEATURE_INSTALLER
+#define APPLET_INSTALL_LOC(i) ({ \
+       unsigned v = (i); \
+       if (v & 1) v = applet_install_loc[v/2] >> 4; \
+       else v = applet_install_loc[v/2] & 0xf; \
+       v; })
+#endif
+
+
+/* Length of these names has effect on size of libbusybox
+ * and "individual" binaries. Keep them short.
  */
-#define PROTOTYPES
-#include "applets.h"
-#undef PROTOTYPES
+#if ENABLE_BUILD_LIBBUSYBOX
+#if ENABLE_FEATURE_SHARED_BUSYBOX
+int lbb_main(char **argv) EXTERNALLY_VISIBLE;
+#else
+int lbb_main(char **argv);
+#endif
+#endif
+
+POP_SAVED_FUNCTION_VISIBILITY
 
-#endif                                                 /* _BB_INTERNAL_H_ */
+#endif