X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fbusybox.h;h=6a003d544497ee6e8376abfd125fba9cd26b6514;hb=888527cceec2f58f1eae3acceddee928b5cb647a;hp=f99901aa3696c8c5436dcb6a1263eb45527b6a98;hpb=1aa7e477b1b727db77cac2d717f0fcca40587f78;p=oweals%2Fbusybox.git

diff --git a/include/busybox.h b/include/busybox.h
index f99901aa3..6a003d544 100644
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -1,69 +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 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;
-
-typedef enum bb_suid_t {
-	_BB_SUID_NEVER = 0,
-	_BB_SUID_MAYBE,
-	_BB_SUID_ALWAYS
-} bb_suid_t;
-
+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[];
-extern int (*const applet_mains[])(int argc, char **argv);
-
-#if ENABLE_FEATURE_INSTALLER || ENABLE_FEATURE_PREFER_APPLETS
-extern const uint32_t applet_nameofs[];
+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
-extern const uint16_t applet_nameofs[];
+# define APPLET_IS_NOFORK(i) 0
+# define APPLET_IS_NOEXEC(i) 0
 #endif
 
 #if ENABLE_FEATURE_SUID
-#define APPLET_NAME(i) (applet_names + (applet_nameofs[i] & 0x3fff))
-#define APPLET_SUID(i) ((applet_nameofs[i] >> 14) & 0x3)
-#else
-#define APPLET_NAME(i) (applet_names + (applet_nameofs[i] & 0xffff))
+# define APPLET_SUID(i) ((applet_suid[(i)/4] >> (2 * ((i)%4)) & 3))
 #endif
 
 #if ENABLE_FEATURE_INSTALLER
-#define APPLET_INSTALL_LOC(i) ((applet_nameofs[i] >> 16) & 0x7)
-#endif
-
-#if ENABLE_FEATURE_PREFER_APPLETS
-#define APPLET_IS_NOFORK(i) (applet_nameofs[i] & (1 << 19))
-#define APPLET_IS_NOEXEC(i) (applet_nameofs[i] & (1 << 20))
+#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.
  */
-void lbb_prepare(const char *applet, char **argv) MAIN_EXTERNALLY_VISIBLE;
 #if ENABLE_BUILD_LIBBUSYBOX
 #if ENABLE_FEATURE_SHARED_BUSYBOX
-int lbb_main(int argc, char **argv) EXTERNALLY_VISIBLE;
+int lbb_main(char **argv) EXTERNALLY_VISIBLE;
 #else
-int lbb_main(int argc, char **argv);
+int lbb_main(char **argv);
 #endif
 #endif
 
+POP_SAVED_FUNCTION_VISIBILITY
 
-#endif	/* _BB_INTERNAL_H_ */
+#endif