--- trunk/mkinitrd-magellan/busybox/include/busybox.h	2009/04/24 18:32:46	815
+++ trunk/mkinitrd-magellan/busybox/include/busybox.h	2009/04/24 18:33:46	816
@@ -9,41 +9,70 @@
 
 #include "libbb.h"
 
-/* order matters: used as index into "install_dir[]" in busybox.c */
-enum Location {
+#if __GNUC_PREREQ(4,1)
+# pragma GCC visibility push(hidden)
+#endif
+
+/* order matters: used as index into "install_dir[]" in appletlib.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;
 
-enum SUIDRoot {
+typedef enum bb_suid_t {
 	_BB_SUID_NEVER = 0,
 	_BB_SUID_MAYBE,
 	_BB_SUID_ALWAYS
-};
+} bb_suid_t;
+
+
+/* Defined in appletlib.c (by including generated applet_tables.h) */
+/* Keep in sync with applets/applet_tables.c! */
+extern const char applet_names[];
+extern int (*const applet_main[])(int argc, char **argv);
+extern const uint16_t applet_nameofs[];
+extern const uint8_t applet_install_loc[];
+
+#if ENABLE_FEATURE_SUID || ENABLE_FEATURE_PREFER_APPLETS
+#define APPLET_NAME(i) (applet_names + (applet_nameofs[i] & 0x0fff))
+#else
+#define APPLET_NAME(i) (applet_names + applet_nameofs[i])
+#endif
+
+#if ENABLE_FEATURE_PREFER_APPLETS
+#define APPLET_IS_NOFORK(i) (applet_nameofs[i] & (1 << 12))
+#define APPLET_IS_NOEXEC(i) (applet_nameofs[i] & (1 << 13))
+#endif
+
+#if ENABLE_FEATURE_SUID
+#define APPLET_SUID(i) ((applet_nameofs[i] >> 14) & 0x3)
+#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
+
 
-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.
+/* 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
+
+#if __GNUC_PREREQ(4,1)
+# pragma GCC visibility pop
+#endif
 
-#endif							/* _BB_INTERNAL_H_ */
+#endif	/* _BB_INTERNAL_H_ */