Merge branch 'busybox' into merge

2 files changed, 17 insertions, 11 deletions

diff --git a/include/applets.h.sh b/include/applets.h.sh
index bab4e0d72..be117cf84 100755
--- a/include/applets.h.sh
+++ b/include/applets.h.sh
@@ -4,11 +4,7 @@
 # enabling it. Run it after applets.h is generated.
 
 # CONFIG_applet names
-grep ^IF_ applets.h | grep -v IF_FEATURE_ | sed 's/IF_\([A-Z0-9._-]*\)(.*/\1/' \
-| grep -v MODPROBE_SMALL \
-| sed 's/BB_SYSCTL/SYSCTL/' \
-| sed 's/TEST1/[/' \
-| sed 's/TEST2/[[/' \
+grep ^IF_ applets.h | grep -v ^IF_FEATURE_ | sed 's/IF_\([A-Z0-9._-]*\)(.*/\1/' \
 | sort | uniq \
 >applets_APP1
 
@@ -17,8 +13,11 @@ grep ^IF_ applets.h | sed -e's/ //g' -e's/.*(\([a-z[][^,]*\),.*/\1/' \
 | grep -v '^bash$' \
 | grep -v '^sh$' \
 | tr a-z A-Z \
+| sed 's/^SYSCTL$/BB_SYSCTL/' \
+| sed 's/^\[\[$/TEST1/' \
+| sed 's/^\[$/TEST2/' \
 | sort | uniq \
 >applets_APP2
 
 diff -u applets_APP1 applets_APP2 >applets_APP.diff
-rm applets_APP1 applets_APP2
+#rm applets_APP1 applets_APP2
diff --git a/include/libbb.h b/include/libbb.h
index a6de5e97b..0b9cfb585 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -45,7 +45,7 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#ifndef major
+#if !defined(major) || defined(__GLIBC__)
 # include <sys/sysmacros.h>
 #endif
 #include <sys/wait.h>
@@ -81,8 +81,6 @@
 #if ENABLE_SELINUX
 # include <selinux/selinux.h>
 # include <selinux/context.h>
-# include <selinux/flask.h>
-# include <selinux/av_permissions.h>
 #endif
 #if ENABLE_FEATURE_UTMP
 # if defined __UCLIBC__ && ( \
@@ -944,6 +942,7 @@ extern const struct suffix_mult bkm_suffixes[];
 #define km_suffixes (bkm_suffixes + 1)
 extern const struct suffix_mult cwbkMG_suffixes[];
 #define kMG_suffixes (cwbkMG_suffixes + 3)
+extern const struct suffix_mult kmg_i_suffixes[];
 
 #include "xatonum.h"
 /* Specialized: */
@@ -1210,8 +1209,16 @@ int bb_cat(char** argv);
 /* If shell needs them, they exist even if not enabled as applets */
 int echo_main(int argc, char** argv) IF_ECHO(MAIN_EXTERNALLY_VISIBLE);
 int printf_main(int argc, char **argv) IF_PRINTF(MAIN_EXTERNALLY_VISIBLE);
-int test_main(int argc, char **argv) IF_TEST(MAIN_EXTERNALLY_VISIBLE);
-int kill_main(int argc, char **argv) IF_KILL(MAIN_EXTERNALLY_VISIBLE);
+int test_main(int argc, char **argv)
+#if ENABLE_TEST || ENABLE_TEST1 || ENABLE_TEST2
+                MAIN_EXTERNALLY_VISIBLE
+#endif
+;
+int kill_main(int argc, char **argv)
+#if ENABLE_KILL || ENABLE_KILLALL || ENABLE_KILLALL5
+                MAIN_EXTERNALLY_VISIBLE
+#endif
+;
 /* Similar, but used by chgrp, not shell */
 int chown_main(int argc, char **argv) IF_CHOWN(MAIN_EXTERNALLY_VISIBLE);
 /* Used by ftpd */