Merge commit '56a3b82e9692a25ef9c9269e88feac0d579ce8e8' into merge

Conflicts:
	coreutils/ls.c
	include/platform.h
	libbb/bb_basename.c

3 files changed, 33 insertions, 17 deletions

diff --git a/archival/dpkg.c b/archival/dpkg.c
index f8e349d09..8899d1719 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -702,28 +702,21 @@ static unsigned get_status(const unsigned status_node, const int num)
 
 static void set_status(const unsigned status_node_num, const char *new_value, const int position)
 {
-        const unsigned new_value_len = strlen(new_value);
         const unsigned new_value_num = search_name_hashtable(new_value);
         unsigned want = get_status(status_node_num, 1);
         unsigned flag = get_status(status_node_num, 2);
         unsigned status = get_status(status_node_num, 3);
-        int want_len = strlen(name_hashtable[want]);
-        int flag_len = strlen(name_hashtable[flag]);
-        int status_len = strlen(name_hashtable[status]);
         char *new_status;
 
         switch (position) {
                 case 1:
                         want = new_value_num;
-                        want_len = new_value_len;
                         break;
                 case 2:
                         flag = new_value_num;
-                        flag_len = new_value_len;
                         break;
                 case 3:
                         status = new_value_num;
-                        status_len = new_value_len;
                         break;
                 default:
                         bb_error_msg_and_die("DEBUG ONLY: this shouldnt happen");
diff --git a/archival/libarchive/bz/compress.c b/archival/libarchive/bz/compress.c
index 6f1c70a08..f93671742 100644
--- a/archival/libarchive/bz/compress.c
+++ b/archival/libarchive/bz/compress.c
@@ -251,7 +251,7 @@ void sendMTFValues(EState* s)
 {
         int32_t v, t, i, j, gs, ge, totc, bt, bc, iter;
         int32_t nSelectors, alphaSize, minLen, maxLen, selCtr;
-        int32_t nGroups, nBytes;
+        int32_t nGroups;
 
         /*
          * uint8_t len[BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
@@ -512,7 +512,6 @@ void sendMTFValues(EState* s)
                         }
                 }
 
-                nBytes = s->numZ;
                 bsW(s, 16, inUse16);
 
                 inUse16 <<= (sizeof(int)*8 - 16); /* move 15th bit into sign bit */
@@ -528,7 +527,6 @@ void sendMTFValues(EState* s)
         }
 
         /*--- Now the selectors. ---*/
-        nBytes = s->numZ;
         bsW(s, 3, nGroups);
         bsW(s, 15, nSelectors);
         for (i = 0; i < nSelectors; i++) {
@@ -538,8 +536,6 @@ void sendMTFValues(EState* s)
         }
 
         /*--- Now the coding tables. ---*/
-        nBytes = s->numZ;
-
         for (t = 0; t < nGroups; t++) {
                 int32_t curr = s->len[t][0];
                 bsW(s, 5, curr);
@@ -551,7 +547,6 @@ void sendMTFValues(EState* s)
         }
 
         /*--- And finally, the block data proper ---*/
-        nBytes = s->numZ;
         selCtr = 0;
         gs = 0;
         while (1) {
diff --git a/archival/tar.c b/archival/tar.c
index 52f3c364c..fca2d068b 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -264,7 +264,8 @@ static int writeTarHeader(struct TarBallInfo *tbInfo,
         PUT_OCTAL(header.uid, statbuf->st_uid);
         PUT_OCTAL(header.gid, statbuf->st_gid);
         memset(header.size, '0', sizeof(header.size)-1); /* Regular file size is handled later */
-        PUT_OCTAL(header.mtime, statbuf->st_mtime);
+        /* users report that files with negative st_mtime cause trouble, so: */
+        PUT_OCTAL(header.mtime, statbuf->st_mtime >= 0 ? statbuf->st_mtime : 0);
 
         /* Enter the user and group names */
         safe_strncpy(header.uname, get_cached_username(statbuf->st_uid), sizeof(header.uname));
@@ -316,15 +317,42 @@ static int writeTarHeader(struct TarBallInfo *tbInfo,
         } else if (S_ISFIFO(statbuf->st_mode)) {
                 header.typeflag = FIFOTYPE;
         } else if (S_ISREG(statbuf->st_mode)) {
-                if (sizeof(statbuf->st_size) > 4
-                 && statbuf->st_size > (off_t)0777777777777LL
+                /* header.size field is 12 bytes long */
+                /* Does octal-encoded size fit? */
+                uoff_t filesize = statbuf->st_size;
+                if (sizeof(filesize) <= 4
+                 || filesize <= (uoff_t)0777777777777LL
                 ) {
+                        PUT_OCTAL(header.size, filesize);
+                }
+                /* Does base256-encoded size fit?
+                 * It always does unless off_t is wider than 64 bits.
+                 */
+                else if (ENABLE_FEATURE_TAR_GNU_EXTENSIONS
+#if ULLONG_MAX > 0xffffffffffffffffLL /* 2^64-1 */
+                 && (filesize <= 0x3fffffffffffffffffffffffLL)
+#endif
+                ) {
+                        /* GNU tar uses "base-256 encoding" for very large numbers.
+                         * Encoding is binary, with highest bit always set as a marker
+                         * and sign in next-highest bit:
+                         * 80 00 .. 00 - zero
+                         * bf ff .. ff - largest positive number
+                         * ff ff .. ff - minus 1
+                         * c0 00 .. 00 - smallest negative number
+                         */
+                        char *p8 = header.size + sizeof(header.size);
+                        do {
+                                *--p8 = (uint8_t)filesize;
+                                filesize >>= 8;
+                        } while (p8 != header.size);
+                        *p8 |= 0x80;
+                } else {
                         bb_error_msg_and_die("can't store file '%s' "
                                 "of size %"OFF_FMT"u, aborting",
                                 fileName, statbuf->st_size);
                 }
                 header.typeflag = REGTYPE;
-                PUT_OCTAL(header.size, statbuf->st_size);
         } else {
                 bb_error_msg("%s: unknown file type", fileName);
                 return FALSE;