Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/include/busybox.h

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/include/busybox.h (modified) (2 diffs)

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

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Busybox main internal header file
- *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
@@ -9 +7 @@
 
 #include "libbb.h"
+/* BB_DIR_foo and BB_SUID_bar constants: */
+#include "applet_metadata.h"
 
 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,
-#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 const char applet_names[] ALIGN1;
 extern int (*const applet_main[])(int argc, char **argv);
 extern const uint16_t applet_nameofs[];
-extern const uint8_t applet_install_loc[];
+extern const uint8_t applet_install_loc[] ALIGN1;
 
 #if ENABLE_FEATURE_SUID || ENABLE_FEATURE_PREFER_APPLETS