Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/include/busybox.h

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/include/busybox.h (modified) (1 diff)

branches/2.2.9/mindi-busybox/include/busybox.h

@@ -3 +3 @@
  * 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"
 
-#if ENABLE_FEATURE_INSTALLER
-/* order matters: used as index into "install_dir[]" in busybox.c */
+PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
+
+/* 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,
+#if ENABLE_INSTALL_NO_USR
+    _BB_DIR_USR_BIN  = _BB_DIR_BIN,
+    _BB_DIR_USR_SBIN = _BB_DIR_SBIN,
+#else
     _BB_DIR_USR_BIN,
-    _BB_DIR_USR_SBIN
+    _BB_DIR_USR_SBIN,
+#endif
 } bb_install_loc_t;
+
+typedef enum bb_suid_t {
+    _BB_SUID_DROP = 0,
+    _BB_SUID_MAYBE,
+    _BB_SUID_REQUIRE
+} 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))
+#else
+# define APPLET_IS_NOFORK(i) 0
+# define APPLET_IS_NOEXEC(i) 0
 #endif
 
 #if ENABLE_FEATURE_SUID
-typedef enum bb_suid_t {
-    _BB_SUID_NEVER = 0,
-    _BB_SUID_MAYBE,
-    _BB_SUID_ALWAYS
-} bb_suid_t;
+# define APPLET_SUID(i) ((applet_nameofs[i] >> 14) & 0x3)
 #endif
 
-struct bb_applet {
-    const char *name;
-    int (*main) (int argc, char **argv);
 #if ENABLE_FEATURE_INSTALLER
-    __extension__ enum bb_install_loc_t install_loc:8;
+#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
-#if ENABLE_FEATURE_SUID
-    __extension__ enum bb_suid_t need_suid:8;
+
+
+/* Length of these names has effect on size of libbusybox
+ * and "individual" binaries. Keep them short.
+ */
+#if ENABLE_BUILD_LIBBUSYBOX
+#if ENABLE_FEATURE_SHARED_BUSYBOX
+int lbb_main(char **argv) EXTERNALLY_VISIBLE;
+#else
+int lbb_main(char **argv);
 #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
-};
 
-/* Defined in applet.c */
-extern const struct bb_applet applets[];
-extern const unsigned short NUM_APPLETS;
+POP_SAVED_FUNCTION_VISIBILITY
 
-#endif  /* _BB_INTERNAL_H_ */
+#endif