Merge busybox into merge

Fix merge conflict in miscutils/less.c.

Use exit_SUCCESS() where possible.

4 files changed, 41 insertions, 17 deletions

diff --git a/scripts/bb_release b/scripts/bb_release
index 545440d3a..180ad8f2e 100755
--- a/scripts/bb_release
+++ b/scripts/bb_release
@@ -17,7 +17,7 @@ VERSION=`ls busybox-*.tar.gz | sed 's/busybox-\(.*\)\.tar\.gz/\1/'`
 zcat busybox-$VERSION.tar.gz | bzip2 > busybox-$VERSION.tar.bz2
 
 for releasefile in busybox-$VERSION.tar.gz busybox-$VERSION.tar.bz2; do
-    test -f $releasefile || { echo "no $releasefile"; exit 1; }
-    gpg --detach-sign $releasefile
-    sha256sum $releasefile > $releasefile.sha256
+        test -f $releasefile || { echo "no $releasefile"; exit 1; }
+        gpg --detach-sign $releasefile
+        sha256sum $releasefile > $releasefile.sha256
 done
diff --git a/scripts/echo.c b/scripts/echo.c
index 7474ccdd4..e3a07adf0 100644
--- a/scripts/echo.c
+++ b/scripts/echo.c
@@ -153,25 +153,32 @@ int main(int argc, char **argv)
                 if (!eflag) {
                         /* optimization for very common case */
                         fputs(arg, stdout);
-                } else while ((c = *arg++)) {
-                        if (c == eflag) {       /* Check for escape seq. */
+                } else
+                while ((c = *arg++) != '\0') {
+                        if (c == eflag) {
+                                /* This is an "\x" sequence */
+
                                 if (*arg == 'c') {
-                                        /* '\c' means cancel newline and
+                                        /* "\c" means cancel newline and
                                          * ignore all subsequent chars. */
                                         goto ret;
                                 }
-                                {
-                                        /* Since SUSv3 mandates a first digit of 0, 4-digit octals
-                                        * of the form \0### are accepted. */
-                                        if (*arg == '0') {
-                                                /* NB: don't turn "...\0" into "...\" */
-                                                if (arg[1] && ((unsigned char)(arg[1]) - '0') < 8) {
-                                                        arg++;
-                                                }
+                                /* Since SUSv3 mandates a first digit of 0, 4-digit octals
+                                * of the form \0### are accepted. */
+                                if (*arg == '0') {
+                                        if ((unsigned char)(arg[1] - '0') < 8) {
+                                                /* 2nd char is 0..7: skip leading '0' */
+                                                arg++;
                                         }
-                                        /* bb_process_escape_sequence handles NUL correctly
-                                         * ("...\" case. */
-                                        c = bb_process_escape_sequence(&arg);
+                                }
+                                /* bb_process_escape_sequence handles NUL correctly
+                                 * ("...\" case). */
+                                {
+                                        /* optimization: don't force arg to be on-stack,
+                                         * use another variable for that. ~30 bytes win */
+                                        const char *z = arg;
+                                        c = bb_process_escape_sequence(&z);
+                                        arg = z;
                                 }
                         }
                         putchar(c);
diff --git a/scripts/embedded_scripts b/scripts/embedded_scripts
index aa7bf3e8a..205ac591a 100755
--- a/scripts/embedded_scripts
+++ b/scripts/embedded_scripts
@@ -23,6 +23,12 @@ if test $? != 0; then
         exit 1
 fi
 
+bzip2 </dev/null >/dev/null
+if test $? != 0; then
+        echo 'bzip2 is not installed'
+        exit 1
+fi
+
 custom_scripts=""
 if [ -d "$custom_loc" ]
 then
diff --git a/scripts/mkconfigs b/scripts/mkconfigs
index 6a26fe1dd..1bbf10c3a 100755
--- a/scripts/mkconfigs
+++ b/scripts/mkconfigs
@@ -28,6 +28,17 @@
 
 config=.config
 
+od -v -b </dev/null >/dev/null
+if test $? != 0; then
+        echo 'od tool is not installed or cannot accept "-v -b" options'
+        exit 1
+fi
+bzip2 </dev/null >/dev/null
+if test $? != 0; then
+        echo 'bzip2 is not installed'
+        exit 1
+fi
+
 {
 echo "\
 #ifndef _BBCONFIGOPTS_H