Merge remote-tracking branch 'upstream/master'

8 files changed, 75 insertions, 198 deletions

diff --git a/scripts/Makefile.IMA b/scripts/Makefile.IMA
index 11ae39eae..a62618ae0 100644
--- a/scripts/Makefile.IMA
+++ b/scripts/Makefile.IMA
@@ -85,8 +85,8 @@ lib-y:=
 include archival/Kbuild
 lib-all-y += $(patsubst %,archival/%,$(sort $(lib-y)))
 lib-y:=
-include archival/libunarchive/Kbuild
-lib-all-y += $(patsubst %,archival/libunarchive/%,$(sort $(lib-y)))
+include archival/libarchive/Kbuild
+lib-all-y += $(patsubst %,archival/libarchive/%,$(sort $(lib-y)))
 lib-y:=
 include applets/Kbuild
 lib-all-y += $(patsubst %,applets/%,$(sort $(lib-y)))
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index 1a5b10f84..f27a17984 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -329,7 +329,7 @@ void parse_dep_file(void *map, size_t len)
         clear_config();
 
         while (m < end) {
-                while (m < end && (*m == ' ' || *m == '\\' || *m == '\n'))
+                while (m < end && (*m == ' ' || *m == '\\' || *m == '\n' || *m == '\r'))
                         m++;
                 p = m;
                 while (p < end && *p != ' ') p++;
diff --git a/scripts/bloat-o-meter b/scripts/bloat-o-meter
index 95cbbe6b8..91374c1ca 100755
--- a/scripts/bloat-o-meter
+++ b/scripts/bloat-o-meter
@@ -63,7 +63,7 @@ def getsizes(file):
         else:
             sym[name] = {"addr" : value, "size":  size}
             lut[(value, size)] = 0
-    for addr, sz in alias.iterkeys():
+    for addr, sz in iter(alias.keys()):
         # If the non-GLOBAL sym has an implementation elsewhere then
         # it's an alias, disregard it.
         if not (addr, sz) in lut:
@@ -92,7 +92,7 @@ if flag_timing:
 grow, shrink, add, remove, up, down = 0, 0, 0, 0, 0, 0
 delta, common = [], {}
 
-for name in old.iterkeys():
+for name in iter(old.keys()):
     if name in new:
         common[name] = 1
 
diff --git a/scripts/cleanup_printf2puts b/scripts/cleanup_printf2puts
index 446152e12..00193a842 100755
--- a/scripts/cleanup_printf2puts
+++ b/scripts/cleanup_printf2puts
@@ -3,7 +3,7 @@
 # Processes current directory recursively:
 # printf("abc\n") -> puts("abc"). Beware of fprintf etc...
 
-# BTW, gcc 4.1.2 already does tha same! Can't believe it...
+# BTW, gcc 4.1.2 already does the same! Can't believe it...
 
 grep -lr 'printf\([^%%]*\\n"\)' . | grep '.[ch]$' | xargs -n1 \
     sed -e 's/\([^A-Za-z0-9_]\)printf(\( *"[^%]*\)\\n")/\1puts(\2")/' -i
diff --git a/scripts/gen_build_files.sh b/scripts/gen_build_files.sh
index 09a95b507..03831f501 100755
--- a/scripts/gen_build_files.sh
+++ b/scripts/gen_build_files.sh
@@ -9,43 +9,58 @@ mkdir include 2>/dev/null
 
 srctree="$1"
 
+status() { printf '  %-8s%s\n' "$1" "$2"; }
+gen() { status "GEN" "$@"; }
+chk() { status "CHK" "$@"; }
+
+generate()
+{
+        local src="$1" dst="$2" header="$3" insert="$4"
+        #chk "${dst}"
+        (
+                # Need to use printf: different shells have inconsistent
+                # rules re handling of "\n" in echo params,
+                # and ${insert} definitely contains "\n".
+                # Therefore, echo "${header}" would not work:
+                printf "%s\n" "${header}"
+                if grep -qs '^INSERT$' "${src}"; then
+                        sed -n '1,/^INSERT$/p' "${src}"
+                        printf "%s\n" "${insert}"
+                        sed -n '/^INSERT$/,$p' "${src}"
+                else
+                        if [ -n "${insert}" ]; then
+                                printf "%s\n" "ERROR: INSERT line missing in: ${src}" 1>&2
+                        fi
+                        cat "${src}"
+                fi
+        ) | sed '/^INSERT$/d' > "${dst}.tmp"
+        if ! cmp -s "${dst}" "${dst}.tmp"; then
+                gen "${dst}"
+                mv "${dst}.tmp" "${dst}"
+        else
+                rm -f "${dst}.tmp"
+        fi
+}
+
 # (Re)generate include/applets.h
-src="$srctree/include/applets.src.h"
-dst="include/applets.h"
 s=`sed -n 's@^//applet:@@p' -- "$srctree"/*/*.c "$srctree"/*/*/*.c`
-old=`cat "$dst" 2>/dev/null`
-# Why "IFS='' read -r REPLY"??
-# This atrocity is needed to read lines without mangling.
-# IFS='' prevents whitespace trimming,
-# -r suppresses backslash handling.
-new=`echo "/* DO NOT EDIT. This file is generated from applets.src.h */"
-while IFS='' read -r REPLY; do
-        test x"$REPLY" = x"INSERT" && REPLY="$s"
-        printf "%s\n" "$REPLY"
-done <"$src"`
-if test x"$new" != x"$old"; then
-        echo "  GEN     $dst"
-        printf "%s\n" "$new" >"$dst"
-fi
+generate \
+        "$srctree/include/applets.src.h" \
+        "include/applets.h" \
+        "/* DO NOT EDIT. This file is generated from applets.src.h */" \
+        "${s}"
 
 # (Re)generate include/usage.h
-src="$srctree/include/usage.src.h"
-dst="include/usage.h"
 # We add line continuation backslash after each line,
 # and insert empty line before each line which doesn't start
 # with space or tab
 # (note: we need to use \\\\ because of ``)
 s=`sed -n -e 's@^//usage:\([ \t].*\)$@\1 \\\\@p' -e 's@^//usage:\([^ \t].*\)$@\n\1 \\\\@p' -- "$srctree"/*/*.c "$srctree"/*/*/*.c`
-old=`cat "$dst" 2>/dev/null`
-new=`echo "/* DO NOT EDIT. This file is generated from usage.src.h */"
-while IFS='' read -r REPLY; do
-        test x"$REPLY" = x"INSERT" && REPLY="$s"
-        printf "%s\n" "$REPLY"
-done <"$src"`
-if test x"$new" != x"$old"; then
-        echo "  GEN     $dst"
-        printf "%s\n" "$new" >"$dst"
-fi
+generate \
+        "$srctree/include/usage.src.h" \
+        "include/usage.h" \
+        "/* DO NOT EDIT. This file is generated from usage.src.h */" \
+        "${s}"
 
 # (Re)generate */Kbuild and */Config.in
 { cd -- "$srctree" && find . -type d; } | while read -r d; do
@@ -55,40 +70,24 @@ fi
         dst="$d/Kbuild"
         if test -f "$src"; then
                 mkdir -p -- "$d" 2>/dev/null
-                #echo "  CHK     $dst"
 
                 s=`sed -n 's@^//kbuild:@@p' -- "$srctree/$d"/*.c`
-
-                old=`cat "$dst" 2>/dev/null`
-                new=`echo "# DO NOT EDIT. This file is generated from Kbuild.src"
-                while IFS='' read -r REPLY; do
-                        test x"$REPLY" = x"INSERT" && REPLY="$s"
-                        printf "%s\n" "$REPLY"
-                done <"$src"`
-                if test x"$new" != x"$old"; then
-                        echo "  GEN     $dst"
-                        printf "%s\n" "$new" >"$dst"
-                fi
+                generate \
+                        "${src}" "${dst}" \
+                        "# DO NOT EDIT. This file is generated from Kbuild.src" \
+                        "${s}"
         fi
 
         src="$srctree/$d/Config.src"
         dst="$d/Config.in"
         if test -f "$src"; then
                 mkdir -p -- "$d" 2>/dev/null
-                #echo "  CHK     $dst"
 
                 s=`sed -n 's@^//config:@@p' -- "$srctree/$d"/*.c`
-
-                old=`cat "$dst" 2>/dev/null`
-                new=`echo "# DO NOT EDIT. This file is generated from Config.src"
-                while IFS='' read -r REPLY; do
-                        test x"$REPLY" = x"INSERT" && REPLY="$s"
-                        printf "%s\n" "$REPLY"
-                done <"$src"`
-                if test x"$new" != x"$old"; then
-                        echo "  GEN     $dst"
-                        printf "%s\n" "$new" >"$dst"
-                fi
+                generate \
+                        "${src}" "${dst}" \
+                        "# DO NOT EDIT. This file is generated from Config.src" \
+                        "${s}"
         fi
 done
 
diff --git a/scripts/individual b/scripts/individual
deleted file mode 100755
index e93ca5552..000000000
--- a/scripts/individual
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/bin/sh
-
-# Compile individual versions of each busybox applet.
-
-if [ $# -eq 0 ]
-then
-
-# Clear out the build directory.  (Make clean should do this instead of here.)
-
-rm -rf build
-mkdir build
-
-# Make our prerequisites.
-
-make busybox.links include/bb_config.h $(pwd)/{libbb/libbb.a,archival/libunarchive/libunarchive.a,coreutils/libcoreutils/libcoreutils.a,networking/libiproute/libiproute.a}
-
-else
-# Could very well be that we want to build an individual applet but have no
-# 'build' dir yet..
-
-test -d ./build || mkdir build
-
-fi
-
-# About 3/5 of the applets build from one .c file (with the same name as the
-# corresponding applet), and all it needs to link against.  However, to build
-# them all we need more than that.
-
-# Figure out which applets need extra libraries added to their command line.
-
-function substithing()
-{
-  if [ "${1/ $3 //}" != "$1" ]
-  then
-    echo $2
-  fi
-}
-
-function extra_libraries()
-{
-  # gzip needs gunzip.c (when gunzip is enabled, anyway).
-  substithing " gzip " "archival/gunzip.c archival/uncompress.c" "$1"
-
-  # init needs init_shared.c
-  substithing " init " "init/init_shared.c" "$1"
-
-  # ifconfig needs interface.c
-  substithing " ifconfig " "networking/interface.c" "$1"
-
-  # Applets that need libunarchive.a
-  substithing " ar bunzip2 unlzma cpio dpkg gunzip rpm2cpio rpm tar uncompress unzip dpkg_deb gzip " "archival/libunarchive/libunarchive.a" "$1"
-
-  # Applets that need libcoreutils.a
-  substithing " cp mv " "coreutils/libcoreutils/libcoreutils.a" "$1"
-
-  # Applets that need libiproute.a
-  substithing " ip " "networking/libiproute/libiproute.a" "$1"
-
-  # What needs -libm?
-  substithing " awk dc " "-lm" "$1"
-
-  # What needs -lcrypt?
-  substithing " httpd vlock " "-lcrypt" "$1"
-}
-
-# Query applets.h to figure out which applets need special treatment
-
-strange_names=`sed -rn -e 's/\#.*//' -e 's/.*APPLET_NOUSAGE\(([^,]*),([^,]*),.*/\1 \2/p' -e 's/.*APPLET_ODDNAME\(([^,]*),([^,]*),.*, *([^)]*).*/\1 \2@\3/p' include/applets.h`
-
-function bonkname()
-{
-  while [ $# -gt 0 ]
-  do
-    if [ "$APPLET" == "$1" ]
-    then
-      APPFILT="${2/@*/}"
-      if [ "${APPFILT}" == "$2" ]
-      then
-        HELPNAME='"nousage\n"'   # These should be _fixed_.
-      else
-        HELPNAME="${2/*@/}"_full_usage
-      fi
-      break
-    fi
-    shift 2
-  done
-#echo APPLET=${APPLET} APPFILT=${APPFILT} HELPNAME=${HELPNAME} 2=${2}
-}
-
-# Iterate through every name in busybox.links
-
-function buildit ()
-{
-  export APPLET="$1"
-  export APPFILT=${APPLET}
-  export HELPNAME=${APPLET}_full_usage
-
-  bonkname $strange_names
-
-  j=`find archival console-tools coreutils debianutils editors findutils init loginutils miscutils modutils networking procps shell sysklogd util-linux -name "${APPFILT}.c"`
-  if [ -z "$j" ]
-  then
-    echo no file for $APPLET
-  else
-    echo "Building $APPLET"
-    gcc -Os -o build/$APPLET applets/individual.c $j \
-        `extra_libraries $APPFILT` libbb/libbb.a -Iinclude \
-        -DBUILD_INDIVIDUAL \
-        '-Drun_applet_and_exit(...)' '-Dfind_applet_by_name(...)=0' \
-        -DAPPLET_main=${APPFILT}_main -DAPPLET_full_usage=${HELPNAME}
-    if [ $? -ne 0 ];
-    then
-      echo "Failed $APPLET"
-    fi
-  fi
-}
-
-if [ $# -eq 0 ]
-then
-  for APPLET in `sed 's .*/  ' busybox.links`
-  do
-    buildit "$APPLET"
-  done
-else
-  buildit "$1"
-fi
-
-
-strip build/*
diff --git a/scripts/mkdiff_obj b/scripts/mkdiff_obj
index a6ec5e602..307474874 100755
--- a/scripts/mkdiff_obj
+++ b/scripts/mkdiff_obj
@@ -1,28 +1,35 @@
 #!/bin/sh
 
+usage() {
+        echo "Usage: ${0##*/} DIR1 DIR2"
+        echo
+        echo "Compares all object files recursivelty found in DIR1 and DIR2."
+        echo "Prints diff of their disassembly."
+        echo
+        exit $1
+}
+
 filter() {
         # sed removes " address: " prefixes which mess up diff
         sed $'s/^\\(\t*\\)[ ]*[0-9a-f][0-9a-f]*:[ \t]*/\\1/' \
         | sed 's/__GI_//g'
 }
 
-test -d "$1" || exit 1
-test -d "$2" || exit 1
+test -d "$1" || usage 1
+test -d "$2" || usage 1
 
 {
         (
                 cd "$1" || exit 1
-                find -name '*.o' -o -name '*.os' # -o -name '*.so'
+                find -name '*.o' # -o -name '*.os' # -o -name '*.so'
         )
         (
                 cd "$2" || exit 1
-                find -name '*.o' -o -name '*.os' # -o -name '*.so'
+                find -name '*.o' # -o -name '*.os' # -o -name '*.so'
         )
 } | sed 's:^\./::' | sort | uniq | \
-tee LST | \
 (
-IFS=''
-while read -r oname; do
+while IFS='' read -r oname; do
         if ! test -f "$1/$oname"; then
                 echo "Only $2/$oname"
                 continue
@@ -32,8 +39,8 @@ while read -r oname; do
                 continue
         fi
         diff -q -- "$1/$oname" "$2/$oname" >/dev/null && continue
-        (cd "$1"; objdump -dr "$oname" | filter >"$oname.disasm")
-        (cd "$2"; objdump -dr "$oname" | filter >"$oname.disasm")
-        diff -u "$1/$oname.disasm" "$2/$oname.disasm"
+        (cd "$1" && { size "$oname"; objdump -dr "$oname" | filter; } >"$oname.disasm")
+        (cd "$2" && { size "$oname"; objdump -dr "$oname" | filter; } >"$oname.disasm")
+        diff -u -- "$1/$oname.disasm" "$2/$oname.disasm"
 done
 )
diff --git a/scripts/randomtest.loop b/scripts/randomtest.loop
index 311536df8..2c8a9bd35 100755
--- a/scripts/randomtest.loop
+++ b/scripts/randomtest.loop
@@ -4,7 +4,7 @@ test -d "$1" || { echo "'$1' is not a directory"; exit 1; }
 test -x "$1/scripts/randomtest" || { echo "No scripts/randomtest in '$1'"; exit 1; }
 
 export LIBC="uclibc"
-export CROSS_COMPILER_PREFIX="i486-linux-uclibc-"
+export CROSS_COMPILER_PREFIX="i686-"
 export MAKEOPTS="-j9"
 
 cnt=0