Merge branch 'busybox' into merge

Conflicts:
	archival/Config.src
	shell/ash.c

7 files changed, 60 insertions, 42 deletions

diff --git a/archival/libarchive/bz/compress.c b/archival/libarchive/bz/compress.c
index e9f1afdaf..23de9d3f5 100644
--- a/archival/libarchive/bz/compress.c
+++ b/archival/libarchive/bz/compress.c
@@ -249,7 +249,7 @@ void generateMTFValues(EState* s)
 static NOINLINE
 void sendMTFValues(EState* s)
 {
-        int32_t v, t, i, j, gs, ge, totc, bt, bc, iter;
+        int32_t v, t, i, j, gs, ge, bt, bc, iter;
         int32_t nSelectors, alphaSize, minLen, maxLen, selCtr;
         int32_t nGroups;
 
@@ -345,7 +345,6 @@ void sendMTFValues(EState* s)
                 }
 #endif
                 nSelectors = 0;
-                totc = 0;
                 gs = 0;
                 while (1) {
                         /*--- Set group start & end marks. --*/
@@ -411,7 +410,6 @@ void sendMTFValues(EState* s)
                                         bt = t;
                                 }
                         }
-                        totc += bc;
                         fave[bt]++;
                         s->selector[nSelectors] = bt;
                         nSelectors++;
@@ -501,14 +499,14 @@ void sendMTFValues(EState* s)
                 for (i = 0; i < 16; i++) {
                         if (sizeof(long) <= 4) {
                                 inUse16 = inUse16*2 +
-                                        ((*(uint32_t*)&(s->inUse[i * 16 + 0])
-                                        | *(uint32_t*)&(s->inUse[i * 16 + 4])
-                                        | *(uint32_t*)&(s->inUse[i * 16 + 8])
-                                        | *(uint32_t*)&(s->inUse[i * 16 + 12])) != 0);
+                                        ((*(bb__aliased_uint32_t*)&(s->inUse[i * 16 + 0])
+                                        | *(bb__aliased_uint32_t*)&(s->inUse[i * 16 + 4])
+                                        | *(bb__aliased_uint32_t*)&(s->inUse[i * 16 + 8])
+                                        | *(bb__aliased_uint32_t*)&(s->inUse[i * 16 + 12])) != 0);
                         } else { /* Our CPU can do better */
                                 inUse16 = inUse16*2 +
-                                        ((*(uint64_t*)&(s->inUse[i * 16 + 0])
-                                        | *(uint64_t*)&(s->inUse[i * 16 + 8])) != 0);
+                                        ((*(bb__aliased_uint64_t*)&(s->inUse[i * 16 + 0])
+                                        | *(bb__aliased_uint64_t*)&(s->inUse[i * 16 + 8])) != 0);
                         }
                 }
 
diff --git a/archival/libarchive/decompress_bunzip2.c b/archival/libarchive/decompress_bunzip2.c
index dc252bb82..6396fe40d 100644
--- a/archival/libarchive/decompress_bunzip2.c
+++ b/archival/libarchive/decompress_bunzip2.c
@@ -42,6 +42,12 @@
 #include "libbb.h"
 #include "bb_archive.h"
 
+#if 0
+# define dbg(...) bb_error_msg(__VA_ARGS__)
+#else
+# define dbg(...) ((void)0)
+#endif
+
 /* Constants for Huffman coding */
 #define MAX_GROUPS          6
 #define GROUP_SIZE          50      /* 64 would have been more efficient */
@@ -52,13 +58,13 @@
 
 /* Status return values */
 #define RETVAL_OK                       0
-#define RETVAL_LAST_BLOCK               (-1)
-#define RETVAL_NOT_BZIP_DATA            (-2)
-#define RETVAL_UNEXPECTED_INPUT_EOF     (-3)
-#define RETVAL_SHORT_WRITE              (-4)
-#define RETVAL_DATA_ERROR               (-5)
-#define RETVAL_OUT_OF_MEMORY            (-6)
-#define RETVAL_OBSOLETE_INPUT           (-7)
+#define RETVAL_LAST_BLOCK               (dbg("%d", __LINE__), -1)
+#define RETVAL_NOT_BZIP_DATA            (dbg("%d", __LINE__), -2)
+#define RETVAL_UNEXPECTED_INPUT_EOF     (dbg("%d", __LINE__), -3)
+#define RETVAL_SHORT_WRITE              (dbg("%d", __LINE__), -4)
+#define RETVAL_DATA_ERROR               (dbg("%d", __LINE__), -5)
+#define RETVAL_OUT_OF_MEMORY            (dbg("%d", __LINE__), -6)
+#define RETVAL_OBSOLETE_INPUT           (dbg("%d", __LINE__), -7)
 
 /* Other housekeeping constants */
 #define IOBUF_SIZE          4096
@@ -440,7 +446,11 @@ static int get_next_block(bunzip_data *bd)
                    literal used is the one at the head of the mtfSymbol array.) */
                 if (runPos != 0) {
                         uint8_t tmp_byte;
-                        if (dbufCount + runCnt >= dbufSize) return RETVAL_DATA_ERROR;
+                        if (dbufCount + runCnt > dbufSize) {
+                                dbg("dbufCount:%d+runCnt:%d %d > dbufSize:%d RETVAL_DATA_ERROR",
+                                                dbufCount, runCnt, dbufCount + runCnt, dbufSize);
+                                return RETVAL_DATA_ERROR;
+                        }
                         tmp_byte = symToByte[mtfSymbol[0]];
                         byteCount[tmp_byte] += runCnt;
                         while (--runCnt >= 0) dbuf[dbufCount++] = (uint32_t)tmp_byte;
@@ -808,7 +818,6 @@ static char *const bunzip_errors[] = {
 /* Dumb little test thing, decompress stdin to stdout */
 int main(int argc, char **argv)
 {
-        int i;
         char c;
 
         int i = unpack_bz2_stream(0, 1);
diff --git a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c
index 4e6b138c3..7c6f38ec3 100644
--- a/archival/libarchive/decompress_gunzip.c
+++ b/archival/libarchive/decompress_gunzip.c
@@ -336,7 +336,7 @@ static int huft_build(const unsigned *b, const unsigned n,
         }
 
         /* Find minimum and maximum length, bound *m by those */
-        for (j = 1; (c[j] == 0) && (j <= BMAX); j++)
+        for (j = 1; (j <= BMAX) && (c[j] == 0); j++)
                 continue;
         k = j; /* minimum code length */
         for (i = BMAX; (c[i] == 0) && i; i--)
diff --git a/archival/libarchive/get_header_ar.c b/archival/libarchive/get_header_ar.c
index 23c412496..c66bb3ee7 100644
--- a/archival/libarchive/get_header_ar.c
+++ b/archival/libarchive/get_header_ar.c
@@ -8,11 +8,19 @@
 #include "bb_archive.h"
 #include "ar.h"
 
-static unsigned read_num(const char *str, int base)
+/* WARNING: Clobbers str[len], so fields must be read in reverse order! */
+static unsigned read_num(char *str, int base, int len)
 {
+        int err;
+
+        /* ar fields are fixed length text strings (padded with spaces).
+         * Ensure bb_strtou doesn't read past the field in case the full
+         * width is used. */
+        str[len] = 0;
+
         /* This code works because
          * on misformatted numbers bb_strtou returns all-ones */
-        int err = bb_strtou(str, NULL, base);
+        err = bb_strtou(str, NULL, base);
         if (err == -1)
                 bb_error_msg_and_die("invalid ar header");
         return err;
@@ -51,11 +59,13 @@ char FAST_FUNC get_header_ar(archive_handle_t *archive_handle)
         if (ar.formatted.magic[0] != '`' || ar.formatted.magic[1] != '\n')
                 bb_error_msg_and_die("invalid ar header");
 
-        /* FIXME: more thorough routine would be in order here
-         * (we have something like that in tar)
-         * but for now we are lax. */
-        ar.formatted.magic[0] = '\0'; /* else 4G-2 file will have size="4294967294`\n..." */
-        typed->size = size = read_num(ar.formatted.size, 10);
+        /*
+         * Note that the fields MUST be read in reverse order as
+         * read_num() clobbers the next byte after the field!
+         * Order is: name, date, uid, gid, mode, size, magic.
+         */
+        typed->size = size = read_num(ar.formatted.size, 10,
+                                      sizeof(ar.formatted.size));
 
         /* special filenames have '/' as the first character */
         if (ar.formatted.name[0] == '/') {
@@ -87,10 +97,10 @@ char FAST_FUNC get_header_ar(archive_handle_t *archive_handle)
          * long filename pseudo file. Thus we decode the rest
          * after dealing with long filename pseudo file.
          */
-        typed->mode = read_num(ar.formatted.mode, 8);
-        typed->mtime = read_num(ar.formatted.date, 10);
-        typed->uid = read_num(ar.formatted.uid, 10);
-        typed->gid = read_num(ar.formatted.gid, 10);
+        typed->mode = read_num(ar.formatted.mode, 8, sizeof(ar.formatted.mode));
+        typed->gid = read_num(ar.formatted.gid, 10, sizeof(ar.formatted.gid));
+        typed->uid = read_num(ar.formatted.uid, 10, sizeof(ar.formatted.uid));
+        typed->mtime = read_num(ar.formatted.date, 10, sizeof(ar.formatted.date));
 
 #if ENABLE_FEATURE_AR_LONG_FILENAMES
         if (ar.formatted.name[0] == '/') {
@@ -98,7 +108,8 @@ char FAST_FUNC get_header_ar(archive_handle_t *archive_handle)
 
                 /* The number after the '/' indicates the offset in the ar data section
                  * (saved in ar_long_names) that conatains the real filename */
-                long_offset = read_num(&ar.formatted.name[1], 10);
+                long_offset = read_num(&ar.formatted.name[1], 10,
+                                       sizeof(ar.formatted.name) - 1);
                 if (long_offset >= ar_long_name_size) {
                         bb_error_msg_and_die("can't resolve long filename");
                 }
diff --git a/archival/libarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
index bc09756ba..32f842095 100644
--- a/archival/libarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -198,13 +198,13 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
          * the message and we don't check whether we indeed
          * saw zero block directly before this. */
         if (i == 0) {
-                xfunc_error_retval = 0;
- short_read:
-                bb_error_msg_and_die("short read");
+                bb_error_msg("short read");
+                /* this merely signals end of archive, not exit(1): */
+                return EXIT_FAILURE;
         }
         if (i != 512) {
                 IF_FEATURE_TAR_AUTODETECT(goto autodetect;)
-                goto short_read;
+                bb_error_msg_and_die("short read");
         }
 
 #else
@@ -221,10 +221,10 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
                          */
                         while (full_read(archive_handle->src_fd, &tar, 512) == 512)
                                 continue;
-                        return EXIT_FAILURE;
+                        return EXIT_FAILURE; /* "end of archive" */
                 }
                 archive_handle->tar__end = 1;
-                return EXIT_SUCCESS;
+                return EXIT_SUCCESS; /* "decoded one header" */
         }
         archive_handle->tar__end = 0;
 
@@ -471,5 +471,5 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
         free(file_header->tar__uname);
         free(file_header->tar__gname);
 #endif
-        return EXIT_SUCCESS;
+        return EXIT_SUCCESS; /* "decoded one header" */
 }
diff --git a/archival/libarchive/lzo1x_9x.c b/archival/libarchive/lzo1x_9x.c
index 897132987..2b490ae83 100644
--- a/archival/libarchive/lzo1x_9x.c
+++ b/archival/libarchive/lzo1x_9x.c
@@ -94,7 +94,7 @@ typedef struct {
         ( ((0x9f5f * ((((b[p]<<5)^b[p+1])<<5) ^ b[p+2])) >> 5) & (SWD_HSIZE-1) )
 
 #if defined(LZO_UNALIGNED_OK_2)
-#  define HEAD2(b,p)      (* (uint16_t *) &(b[p]))
+#  define HEAD2(b,p)      (* (bb__aliased_uint16_t *) &(b[p]))
 #else
 #  define HEAD2(b,p)      (b[p] ^ ((unsigned)b[p+1]<<8))
 #endif
@@ -466,7 +466,6 @@ static int find_match(lzo1x_999_t *c, lzo_swd_p s,
         }
 
         s->m_len = 1;
-        s->m_len = 1;
 #ifdef SWD_BEST_OFF
         if (s->use_best_off)
                 memset(s->best_pos, 0, sizeof(s->best_pos));
diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c
index 841e9dce9..c4e02f0f7 100644
--- a/archival/libarchive/open_transformer.c
+++ b/archival/libarchive/open_transformer.c
@@ -81,16 +81,17 @@ void FAST_FUNC open_transformer(int fd, const char *transform_prog)
                 // FIXME: error check?
 #if BB_MMU
                 {
+                        IF_DESKTOP(long long) int r;
                         transformer_aux_data_t aux;
                         init_transformer_aux_data(&aux);
                         aux.check_signature = check_signature;
-                        transformer(&aux, fd, fd_pipe.wr);
+                        r = transformer(&aux, fd, fd_pipe.wr);
                         if (ENABLE_FEATURE_CLEAN_UP) {
                                 close(fd_pipe.wr); /* send EOF */
                                 close(fd);
                         }
                         /* must be _exit! bug was actually seen here */
-                        _exit(EXIT_SUCCESS);
+                        _exit(/*error if:*/ r < 0);
                 }
 #else
                 {