Merge branch 'busybox' into merge

Conflicts:
	include/platform.h
	scripts/basic/fixdep.c

3 files changed, 14 insertions, 4 deletions

diff --git a/scripts/basic/docproc.c b/scripts/basic/docproc.c
index b12569832..7f21443c1 100644
--- a/scripts/basic/docproc.c
+++ b/scripts/basic/docproc.c
@@ -39,7 +39,7 @@
 #include <limits.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <alloca.h>
+//bbox disabled: #include <alloca.h>
 
 /* exitstatus is used to keep track of any failing calls to kernel-doc,
  * but execution continues. */
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index b7f9e0c2f..f012551af 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -117,7 +117,7 @@
 #ifndef __MINGW32__
 #include <arpa/inet.h>
 #endif
-#include <alloca.h>
+//bbox disabled: #include <alloca.h>
 
 /* bbox: not needed
 #define INT_CONF ntohl(0x434f4e46)
diff --git a/scripts/gen_build_files.sh b/scripts/gen_build_files.sh
index 0989b2fe5..e8fa831be 100755
--- a/scripts/gen_build_files.sh
+++ b/scripts/gen_build_files.sh
@@ -31,7 +31,12 @@ generate()
                 # copy stdin to stdout
                 cat
                 # print everything after INSERT line
-                sed -n '/^INSERT$/ { :l; n; p; bl }' "${src}"
+                sed -n '/^INSERT$/ {
+                :l
+                    n
+                    p
+                    bl
+                }' "${src}"
         } >"${dst}.tmp"
         if ! cmp -s "${dst}" "${dst}.tmp"; then
                 gen "${dst}"
@@ -52,7 +57,12 @@ sed -n 's@^//applet:@@p' "$srctree"/*/*.c "$srctree"/*/*/*.c \
 # We add line continuation backslash after each line,
 # and insert empty line before each line which doesn't start
 # with space or tab
-sed -n -e 's@^//usage:\([ \t].*\)$@\1 \\@p' -e 's@^//usage:\([^ \t].*\)$@\n\1 \\@p' \
+TAB="$(printf '\tX')"
+TAB="${TAB%X}"
+LF="$(printf '\nX')"
+LF="${LF%X}"
+sed -n -e 's@^//usage:\([ '"$TAB"'].*\)$@\1 \\@p' \
+       -e 's@^//usage:\([^ '"$TAB"'].*\)$@\'"$LF"'\1 \\@p' \
         "$srctree"/*/*.c "$srctree"/*/*/*.c \
 | generate \
         "$srctree/include/usage.src.h" \