diff options
| -rw-r--r-- | applets/applet_tables.c | 10 | ||||
| -rw-r--r-- | include/applet_metadata.h | 30 | ||||
| -rw-r--r-- | include/busybox.h | 25 |
3 files changed, 40 insertions, 25 deletions
diff --git a/applets/applet_tables.c b/applets/applet_tables.c index 32dcdb73d..3859d7326 100644 --- a/applets/applet_tables.c +++ b/applets/applet_tables.c @@ -7,13 +7,19 @@ * * Licensed under GPLv2, see file LICENSE in this source tree. */ - +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> #include <stdlib.h> #include <string.h> #include <stdio.h> +#include <unistd.h> + +#undef ARRAY_SIZE +#define ARRAY_SIZE(x) ((unsigned)(sizeof(x) / sizeof((x)[0]))) #include "../include/autoconf.h" -#include "../include/busybox.h" +#include "../include/applet_metadata.h" struct bb_applet { const char *name; diff --git a/include/applet_metadata.h b/include/applet_metadata.h new file mode 100644 index 000000000..566ef3517 --- /dev/null +++ b/include/applet_metadata.h @@ -0,0 +1,30 @@ +/* vi: set sw=4 ts=4: */ +/* + * Licensed under GPLv2 or later, see file LICENSE in this source tree. + */ +#ifndef APPLET_METADATA_H +#define APPLET_METADATA_H 1 + +/* Note: can be included by both host and target builds! */ + +/* 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; + +#endif diff --git a/include/busybox.h b/include/busybox.h index be06817e3..315ef8f26 100644 --- a/include/busybox.h +++ b/include/busybox.h @@ -1,37 +1,16 @@ /* vi: set sw=4 ts=4: */ /* - * Busybox main internal header file - * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #ifndef BUSYBOX_H #define BUSYBOX_H 1 #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[]; |