11 files changed, 61 insertions, 58 deletions

diff --git a/archival/cpio.c b/archival/cpio.c
index 98cc18fa0..699c6dbb7 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -253,24 +253,24 @@ static NOINLINE int cpio_o(void)
                 }
 
                 bytes += printf("070701"
-                                "%08X%08X%08X%08X%08X%08X%08X"
-                                "%08X%08X%08X%08X" /* GNU cpio uses uppercase hex */
+                                "%08X%08X%08X%08X%08X%08X%08X"
+                                "%08X%08X%08X%08X" /* GNU cpio uses uppercase hex */
                                 /* strlen+1: */ "%08X"
                                 /* chksum: */   "00000000" /* (only for "070702" files) */
                                 /* name,NUL: */ "%s%c",
-                                (unsigned)(uint32_t) st.st_ino,
-                                (unsigned)(uint32_t) st.st_mode,
-                                (unsigned)(uint32_t) st.st_uid,
-                                (unsigned)(uint32_t) st.st_gid,
-                                (unsigned)(uint32_t) st.st_nlink,
-                                (unsigned)(uint32_t) st.st_mtime,
-                                (unsigned)(uint32_t) st.st_size,
-                                (unsigned)(uint32_t) major(st.st_dev),
-                                (unsigned)(uint32_t) minor(st.st_dev),
-                                (unsigned)(uint32_t) major(st.st_rdev),
-                                (unsigned)(uint32_t) minor(st.st_rdev),
-                                (unsigned)(strlen(name) + 1),
-                                name, '\0');
+                                (unsigned)(uint32_t) st.st_ino,
+                                (unsigned)(uint32_t) st.st_mode,
+                                (unsigned)(uint32_t) st.st_uid,
+                                (unsigned)(uint32_t) st.st_gid,
+                                (unsigned)(uint32_t) st.st_nlink,
+                                (unsigned)(uint32_t) st.st_mtime,
+                                (unsigned)(uint32_t) st.st_size,
+                                (unsigned)(uint32_t) major(st.st_dev),
+                                (unsigned)(uint32_t) minor(st.st_dev),
+                                (unsigned)(uint32_t) major(st.st_rdev),
+                                (unsigned)(uint32_t) minor(st.st_rdev),
+                                (unsigned)(strlen(name) + 1),
+                                name, '\0');
                 bytes = cpio_pad4(bytes);
 
                 if (st.st_size) {
diff --git a/archival/dpkg.c b/archival/dpkg.c
index dae8a9747..ed86f3355 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -1026,8 +1026,8 @@ static int check_deps(deb_file_t **deb_file, int deb_start /*, int dep_max_count
                         if (package_edge->type == EDGE_CONFLICTS) {
                                 const unsigned package_num =
                                         search_package_hashtable(package_edge->name,
-                                                                 package_edge->version,
-                                                                 package_edge->operator);
+                                                                package_edge->version,
+                                                                package_edge->operator);
                                 int result = 0;
                                 if (package_hashtable[package_num] != NULL) {
                                         status_num = search_status_hashtable(name_hashtable[package_hashtable[package_num]->name]);
@@ -1114,7 +1114,7 @@ static int check_deps(deb_file_t **deb_file, int deb_start /*, int dep_max_count
                                  */
                                 if (root_of_alternatives && package_edge->type != root_of_alternatives->type - 1)
                                         bb_error_msg_and_die("fatal error, package dependencies corrupt: %d != %d - 1",
-                                                             package_edge->type, root_of_alternatives->type);
+                                                        package_edge->type, root_of_alternatives->type);
 
                                 if (package_hashtable[package_num] != NULL)
                                         result = !package_satisfies_dependency(package_num, package_edge->type);
diff --git a/archival/gzip.c b/archival/gzip.c
index 80db4f969..31ccab3cd 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -1179,7 +1179,7 @@ static void gen_codes(ct_data * tree, int max_code)
          * must be all ones.
          */
         Assert(code + G2.bl_count[MAX_BITS] - 1 == (1 << MAX_BITS) - 1,
-                   "inconsistent bit counts");
+                        "inconsistent bit counts");
         Tracev((stderr, "\ngen_codes: max_code %d ", max_code));
 
         for (n = 0; n <= max_code; n++) {
@@ -1527,9 +1527,9 @@ static int ct_tally(int dist, int lc)
                 }
                 out_length >>= 3;
                 Trace((stderr,
-                           "\nlast_lit %u, last_dist %u, in %ld, out ~%ld(%ld%%) ",
-                           G2.last_lit, G2.last_dist, in_length, out_length,
-                           100L - out_length * 100L / in_length));
+                                "\nlast_lit %u, last_dist %u, in %ld, out ~%ld(%ld%%) ",
+                                G2.last_lit, G2.last_dist, in_length, out_length,
+                                100L - out_length * 100L / in_length));
                 if (G2.last_dist < G2.last_lit / 2 && out_length < in_length / 2)
                         return 1;
         }
@@ -1621,9 +1621,9 @@ static ulg flush_block(char *buf, ulg stored_len, int eof)
         static_lenb = (G2.static_len + 3 + 7) >> 3;
 
         Trace((stderr,
-                   "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u dist %u ",
-                   opt_lenb, G2.opt_len, static_lenb, G2.static_len, stored_len,
-                   G2.last_lit, G2.last_dist));
+                        "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u dist %u ",
+                        opt_lenb, G2.opt_len, static_lenb, G2.static_len, stored_len,
+                        G2.last_lit, G2.last_dist));
 
         if (static_lenb <= opt_lenb)
                 opt_lenb = static_lenb;
@@ -1661,7 +1661,7 @@ static ulg flush_block(char *buf, ulg stored_len, int eof)
         } else {
                 send_bits((DYN_TREES << 1) + eof, 3);
                 send_all_trees(G2.l_desc.max_code + 1, G2.d_desc.max_code + 1,
-                                           max_blindex + 1);
+                                        max_blindex + 1);
                 compress_block((ct_data *) G2.dyn_ltree, (ct_data *) G2.dyn_dtree);
                 G2.compressed_len += 3 + G2.opt_len;
         }
diff --git a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c
index 2d5ab3eb3..4e6b138c3 100644
--- a/archival/libarchive/decompress_gunzip.c
+++ b/archival/libarchive/decompress_gunzip.c
@@ -293,8 +293,8 @@ static unsigned fill_bitbuffer(STATE_PARAM unsigned bitbuffer, unsigned *current
  * m:   maximum lookup bits, returns actual
  */
 static int huft_build(const unsigned *b, const unsigned n,
-                           const unsigned s, const unsigned short *d,
-                           const unsigned char *e, huft_t **t, unsigned *m)
+                        const unsigned s, const unsigned short *d,
+                        const unsigned char *e, huft_t **t, unsigned *m)
 {
         unsigned a;             /* counter for codes of length k */
         unsigned c[BMAX + 1];   /* bit length count table */
diff --git a/archival/libarchive/decompress_uncompress.c b/archival/libarchive/decompress_uncompress.c
index 3826a65ea..53c27080f 100644
--- a/archival/libarchive/decompress_uncompress.c
+++ b/archival/libarchive/decompress_uncompress.c
@@ -235,8 +235,8 @@ unpack_Z_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd)
                                         p = &inbuf[posbits >> 3];
                                         bb_error_msg
                                                 ("insize:%d posbits:%d inbuf:%02X %02X %02X %02X %02X (%d)",
-                                                 insize, posbits, p[-1], p[0], p[1], p[2], p[3],
-                                                 (posbits & 07));
+                                                insize, posbits, p[-1], p[0], p[1], p[2], p[3],
+                                                (posbits & 07));
 */
                                         bb_error_msg("corrupted data");
                                         goto err;
diff --git a/archival/libarchive/lzo1x_9x.c b/archival/libarchive/lzo1x_9x.c
index 483205155..897132987 100644
--- a/archival/libarchive/lzo1x_9x.c
+++ b/archival/libarchive/lzo1x_9x.c
@@ -644,7 +644,7 @@ static int len_of_coded_match(unsigned m_len, unsigned m_off, unsigned lit)
 
 
 static int min_gain(unsigned ahead, unsigned lit1,
-                    unsigned lit2, int l1, int l2, int l3)
+                        unsigned lit2, int l1, int l2, int l3)
 {
         int lazy_match_min_gain = 0;
 
@@ -673,7 +673,7 @@ static int min_gain(unsigned ahead, unsigned lit1,
 #if defined(SWD_BEST_OFF)
 
 static void better_match(const lzo_swd_p swd,
-                           unsigned *m_len, unsigned *m_off)
+                        unsigned *m_len, unsigned *m_off)
 {
         if (*m_len <= M2_MIN_LEN)
                 return;
@@ -914,8 +914,8 @@ int lzo1x_999_compress_level(const uint8_t *in, unsigned in_len,
 
         compression_level -= 7;
         return lzo1x_999_compress_internal(in, in_len, out, out_len, wrkmem,
-                                           c[compression_level].good_length,
-                                           c[compression_level].max_lazy,
-                                           c[compression_level].max_chain,
-                                           c[compression_level].use_best_off);
+                                        c[compression_level].good_length,
+                                        c[compression_level].max_lazy,
+                                        c[compression_level].max_chain,
+                                        c[compression_level].use_best_off);
 }
diff --git a/archival/libarchive/lzo1x_c.c b/archival/libarchive/lzo1x_c.c
index cc86f74b1..8c77072ab 100644
--- a/archival/libarchive/lzo1x_c.c
+++ b/archival/libarchive/lzo1x_c.c
@@ -15,7 +15,7 @@
 
    The LZO library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
diff --git a/archival/libarchive/lzo1x_d.c b/archival/libarchive/lzo1x_d.c
index 348a85510..9bc1270da 100644
--- a/archival/libarchive/lzo1x_d.c
+++ b/archival/libarchive/lzo1x_d.c
@@ -15,7 +15,7 @@
 
    The LZO library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
diff --git a/archival/lzop.c b/archival/lzop.c
index fbe08417d..56003d421 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -14,7 +14,7 @@
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
@@ -116,7 +116,7 @@ static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len,
         unsigned nl;
         unsigned long o_m1_a = 0, o_m1_b = 0, o_m2 = 0, o_m3_a = 0, o_m3_b = 0;
 
-//        LZO_UNUSED(wrkmem);
+//      LZO_UNUSED(wrkmem);
 
         *out_len = 0;
 
@@ -346,11 +346,11 @@ static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len,
         return LZO_E_EOF_NOT_FOUND;
 
  eof_found:
-//        LZO_UNUSED(o_m1_a); LZO_UNUSED(o_m1_b); LZO_UNUSED(o_m2);
-//        LZO_UNUSED(o_m3_a); LZO_UNUSED(o_m3_b);
+//      LZO_UNUSED(o_m1_a); LZO_UNUSED(o_m1_b); LZO_UNUSED(o_m2);
+//      LZO_UNUSED(o_m3_a); LZO_UNUSED(o_m3_b);
         *out_len = pd(op, out);
         return (ip == ip_end ? LZO_E_OK :
-                   (ip < ip_end  ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN));
+                (ip < ip_end ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN));
 }
 
 /**********************************************************************/
diff --git a/archival/tar.c b/archival/tar.c
index e27950b6c..648d1256d 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -333,13 +333,13 @@ static int writeTarHeader(struct TarBallInfo *tbInfo,
                  && (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
+                        /* 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 {
diff --git a/archival/unzip.c b/archival/unzip.c
index 046027cc6..e4c824850 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -267,6 +267,14 @@ static void unzip_extract(zip_header_t *zip_header, int dst_fd)
         }
 }
 
+static void my_fgets80(char *buf80)
+{
+        fflush_all();
+        if (!fgets(buf80, 80, stdin)) {
+                bb_perror_msg_and_die("can't read standard input");
+        }
+}
+
 int unzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int unzip_main(int argc, char **argv)
 {
@@ -291,7 +299,7 @@ int unzip_main(int argc, char **argv)
         llist_t *zreject = NULL;
         char *base_dir = NULL;
         int i, opt;
-        char key_buf[80];
+        char key_buf[80]; /* must match size used by my_fgets80 */
         struct stat stat_buf;
 
 /* -q, -l and -v: UnZip 5.52 of 28 February 2005, by Info-ZIP:
@@ -624,10 +632,7 @@ int unzip_main(int argc, char **argv)
                                                         i = 'y';
                                                 } else {
                                                         printf("replace %s? [y]es, [n]o, [A]ll, [N]one, [r]ename: ", dst_fn);
-                                                        fflush_all();
-                                                        if (!fgets(key_buf, sizeof(key_buf), stdin)) {
-                                                                bb_perror_msg_and_die("can't read input");
-                                                        }
+                                                        my_fgets80(key_buf);
                                                         i = key_buf[0];
                                                 }
                                         } else { /* File is not regular file */
@@ -668,9 +673,7 @@ int unzip_main(int argc, char **argv)
                 case 'r':
                         /* Prompt for new name */
                         printf("new name: ");
-                        if (!fgets(key_buf, sizeof(key_buf), stdin)) {
-                                bb_perror_msg_and_die("can't read input");
-                        }
+                        my_fgets80(key_buf);
                         free(dst_fn);
                         dst_fn = xstrdup(key_buf);
                         chomp(dst_fn);