Merge branch 'busybox' into merge

17 files changed, 90 insertions, 55 deletions

diff --git a/coreutils/Config.src b/coreutils/Config.src
index 2ca71521f..8e43c38e1 100644
--- a/coreutils/Config.src
+++ b/coreutils/Config.src
@@ -517,6 +517,12 @@ config SHA512SUM
         help
           Compute and check SHA512 message digest
 
+config SHA3SUM
+        bool "sha3sum"
+        default y
+        help
+          Compute and check SHA3 (512-bit) message digest
+
 config SLEEP
         bool "sleep"
         default y
@@ -777,13 +783,13 @@ config FEATURE_HUMAN_READABLE
         help
           Allow df, du, and ls to have human readable output.
 
-comment "Common options for md5sum, sha1sum, sha256sum, sha512sum"
-        depends on MD5SUM || SHA1SUM || SHA256SUM || SHA512SUM
+comment "Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum"
+        depends on MD5SUM || SHA1SUM || SHA256SUM || SHA512SUM || SHA3SUM
 
 config FEATURE_MD5_SHA1_SUM_CHECK
         bool "Enable -c, -s and -w options"
         default y
-        depends on MD5SUM || SHA1SUM || SHA256SUM || SHA512SUM
+        depends on MD5SUM || SHA1SUM || SHA256SUM || SHA512SUM || SHA3SUM
         help
           Enabling the -c options allows files to be checked
           against pre-calculated hash values.
diff --git a/coreutils/Kbuild.src b/coreutils/Kbuild.src
index d6453f014..b715b9c47 100644
--- a/coreutils/Kbuild.src
+++ b/coreutils/Kbuild.src
@@ -62,6 +62,7 @@ lib-$(CONFIG_SEQ)       += seq.o
 lib-$(CONFIG_SHA1SUM)   += md5_sha1_sum.o
 lib-$(CONFIG_SHA256SUM) += md5_sha1_sum.o
 lib-$(CONFIG_SHA512SUM) += md5_sha1_sum.o
+lib-$(CONFIG_SHA3SUM)   += md5_sha1_sum.o
 lib-$(CONFIG_SLEEP)     += sleep.o
 lib-$(CONFIG_SPLIT)     += split.o
 lib-$(CONFIG_SORT)      += sort.o
diff --git a/coreutils/cal.c b/coreutils/cal.c
index b470ad968..0d388aa1c 100644
--- a/coreutils/cal.c
+++ b/coreutils/cal.c
@@ -43,7 +43,7 @@ static const unsigned char days_in_month[] ALIGN1 = {
 };
 
 static const unsigned char sep1752[] ALIGN1 = {
-                 1,     2,      14,     15,     16,
+                1,      2,      14,     15,     16,
         17,     18,     19,     20,     21,     22,     23,
         24,     25,     26,     27,     28,     29,     30
 };
@@ -167,8 +167,8 @@ int cal_main(int argc UNUSED_PARAM, char **argv)
                 day_array(month, year, dp);
                 len = sprintf(lineout, "%s %d", month_names[month - 1], year);
                 printf("%*s%s\n%s\n",
-                           ((7*julian + WEEK_LEN) - len) / 2, "",
-                           lineout, day_headings);
+                                ((7*julian + WEEK_LEN) - len) / 2, "",
+                                lineout, day_headings);
                 for (row = 0; row < 6; row++) {
                         build_row(lineout, dp)[0] = '\0';
                         dp += 7;
@@ -181,10 +181,11 @@ int cal_main(int argc UNUSED_PARAM, char **argv)
 
                 sprintf(lineout, "%u", year);
                 center(lineout,
-                           (WEEK_LEN * 3 + HEAD_SEP * 2)
-                           + julian * (J_WEEK_LEN * 2 + HEAD_SEP
-                                                   - (WEEK_LEN * 3 + HEAD_SEP * 2)),
-                           0);
+                                (WEEK_LEN * 3 + HEAD_SEP * 2)
+                                + julian * (J_WEEK_LEN * 2 + HEAD_SEP
+                                                - (WEEK_LEN * 3 + HEAD_SEP * 2)),
+                                0
+                );
                 puts("\n");             /* two \n's */
                 for (i = 0; i < 12; i++) {
                         day_array(i + 1, year, days[i]);
diff --git a/coreutils/chown.c b/coreutils/chown.c
index bb166d8fe..1a9127622 100644
--- a/coreutils/chown.c
+++ b/coreutils/chown.c
@@ -126,8 +126,8 @@ int chown_main(int argc UNUSED_PARAM, char **argv)
         /* This matches coreutils behavior (almost - see below) */
         param.chown_func = chown;
         if (OPT_NODEREF
-            /* || (OPT_RECURSE && !OPT_TRAVERSE_TOP): */
-            IF_DESKTOP( || (opt & (BIT_RECURSE|BIT_TRAVERSE_TOP)) == BIT_RECURSE)
+        /* || (OPT_RECURSE && !OPT_TRAVERSE_TOP): */
+        IF_DESKTOP( || (opt & (BIT_RECURSE|BIT_TRAVERSE_TOP)) == BIT_RECURSE)
         ) {
                 param.chown_func = lchown;
         }
diff --git a/coreutils/cut.c b/coreutils/cut.c
index 2c27b704f..84449c775 100644
--- a/coreutils/cut.c
+++ b/coreutils/cut.c
@@ -212,7 +212,7 @@ int cut_main(int argc UNUSED_PARAM, char **argv)
                 if (opt & CUT_OPT_SUPPRESS_FLGS) {
                         bb_error_msg_and_die
                                 ("suppressing non-delimited lines makes sense%s",
-                                 _op_on_field);
+                                _op_on_field);
                 }
                 if (delim != '\t') {
                         bb_error_msg_and_die
diff --git a/coreutils/df.c b/coreutils/df.c
index 63dbd61bd..5e9a8670f 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -110,9 +110,9 @@ int df_main(int argc UNUSED_PARAM, char **argv)
                 df_disp_hr = xatoul_range(chp, 1, ULONG_MAX); /* disallow 0 */
 
         /* From the manpage of df from coreutils-6.10:
-           Disk space is shown in 1K blocks by default, unless the environment
-           variable POSIXLY_CORRECT is set, in which case 512-byte blocks are used.
-        */
+         * Disk space is shown in 1K blocks by default, unless the environment
+         * variable POSIXLY_CORRECT is set, in which case 512-byte blocks are used.
+         */
         if (getenv("POSIXLY_CORRECT")) /* TODO - a new libbb function? */
                 df_disp_hr = 512;
 
@@ -221,7 +221,7 @@ int df_main(int argc UNUSED_PARAM, char **argv)
                         }
 #else
                         if (printf("\n%-20s" + 1, device) > 20 && !(opt & OPT_POSIX))
-                                    printf("\n%-20s", "");
+                                printf("\n%-20s", "");
 #endif
 
 #if ENABLE_FEATURE_HUMAN_READABLE
diff --git a/coreutils/du.c b/coreutils/du.c
index 04e78f982..05f114cc5 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -89,6 +89,10 @@ struct globals {
 #define INIT_G() do { } while (0)
 
 
+/* FIXME? coreutils' du rounds sizes up:
+ * for example,  1025k file is shown as "2" by du -m.
+ * We round to nearest.
+ */
 static void print(unsigned long long size, const char *filename)
 {
         /* TODO - May not want to defer error checking here. */
diff --git a/coreutils/id.c b/coreutils/id.c
index 399d25e34..1f20b755e 100644
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -174,7 +174,7 @@ int id_main(int argc UNUSED_PARAM, char **argv)
                 /* Don't allow -n -r -nr -ug -rug -nug -rnug -uZ -gZ -GZ*/
                 /* Don't allow more than one username */
                 opt_complementary = "?1:u--g:g--u:G--u:u--G:g--G:G--g:r?ugG:n?ugG"
-                         IF_SELINUX(":u--Z:Z--u:g--Z:Z--g:G--Z:Z--G");
+                        IF_SELINUX(":u--Z:Z--u:g--Z:Z--g:G--Z:Z--G");
                 opt = getopt32(argv, "rnugG" IF_SELINUX("Z"));
         }
 
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 4fe291d17..2c5fda96a 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -260,7 +260,7 @@ enum {
 
 /* TODO: simple toggles may be stored as OPT_xxx bits instead */
 static const uint32_t opt_flags[] = {
-        STYLE_COLUMNAR,              /* C */
+        STYLE_COLUMNAR,              /* C */
         DISP_HIDDEN | DISP_DOT,      /* a */
         DISP_NOLIST,                 /* d */
         LIST_INO,                    /* i */
@@ -720,7 +720,7 @@ static struct dnode *my_stat(const char *fullname, const char *name, int force_f
         if ((option_mask32 & OPT_L) || force_follow) {
 #if ENABLE_SELINUX
                 if (is_selinux_enabled())  {
-                         getfilecon(fullname, &cur->sid);
+                        getfilecon(fullname, &cur->sid);
                 }
 #endif
                 if (stat(fullname, &statbuf)) {
diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c
index 2cb6dd43c..92a4d4462 100644
--- a/coreutils/md5_sha1_sum.c
+++ b/coreutils/md5_sha1_sum.c
@@ -55,6 +55,16 @@
 //usage:     "\n        -s      Don't output anything, status code shows success"
 //usage:     "\n        -w      Warn about improperly formatted checksum lines"
 //usage:        )
+//usage:
+//usage:#define sha3sum_trivial_usage
+//usage:        IF_FEATURE_MD5_SHA1_SUM_CHECK("[-c[sw]] ")"[FILE]..."
+//usage:#define sha3sum_full_usage "\n\n"
+//usage:       "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA3-512 checksums"
+//usage:        IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n"
+//usage:     "\n        -c      Check sums against list in FILEs"
+//usage:     "\n        -s      Don't output anything, status code shows success"
+//usage:     "\n        -w      Warn about improperly formatted checksum lines"
+//usage:        )
 
 #include "libbb.h"
 
@@ -65,6 +75,7 @@ enum {
         HASH_MD5 = 's', /* "md5>s<um" */
         HASH_SHA1 = '1',
         HASH_SHA256 = '2',
+        HASH_SHA3 = '3',
         HASH_SHA512 = '5',
 };
 
@@ -86,6 +97,7 @@ static uint8_t *hash_file(const char *filename)
 {
         int src_fd, hash_len, count;
         union _ctx_ {
+                sha3_ctx_t sha3;
                 sha512_ctx_t sha512;
                 sha256_ctx_t sha256;
                 sha1_ctx_t sha1;
@@ -124,6 +136,11 @@ static uint8_t *hash_file(const char *filename)
                 update = (void*)sha512_hash;
                 final = (void*)sha512_end;
                 hash_len = 64;
+        } else if (ENABLE_SHA3SUM && hash_algo == HASH_SHA3) {
+                sha3_begin(&context.sha3);
+                update = (void*)sha3_hash;
+                final = (void*)sha3_end;
+                hash_len = 64;
         } else {
                 xfunc_die(); /* can't reach this */
         }
@@ -223,7 +240,7 @@ int md5_sha1_sum_main(int argc UNUSED_PARAM, char **argv)
                         }
                         if (count_failed && !(flags & FLAG_SILENT)) {
                                 bb_error_msg("WARNING: %d of %d computed checksums did NOT match",
-                                                         count_failed, count_total);
+                                                count_failed, count_total);
                         }
                         fclose_if_not_stdin(pre_computed_stream);
                 } else {
diff --git a/coreutils/mknod.c b/coreutils/mknod.c
index 32d3659ac..aa0450481 100644
--- a/coreutils/mknod.c
+++ b/coreutils/mknod.c
@@ -59,7 +59,7 @@ int mknod_main(int argc, char **argv)
                                         /* Autodetect what the system supports; these macros should
                                          * optimize out to two constants. */
                                         dev = makedev(xatoul_range(argv[2], 0, major(UINT_MAX)),
-                                                      xatoul_range(argv[3], 0, minor(UINT_MAX)));
+                                                        xatoul_range(argv[3], 0, minor(UINT_MAX)));
                                 }
                         }
 
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index 7a6f22b03..ee4f72ca1 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -1028,12 +1028,12 @@ dump(off_t current_offset, off_t end_offset)
                 l_c_m = get_lcm();
 
                 /* Make bytes_to_write the smallest multiple of l_c_m that
-                         is at least as large as n_bytes_read.  */
+                   is at least as large as n_bytes_read.  */
                 bytes_to_write = l_c_m * ((n_bytes_read + l_c_m - 1) / l_c_m);
 
                 memset(block[idx] + n_bytes_read, 0, bytes_to_write - n_bytes_read);
                 write_block(current_offset, bytes_to_write,
-                                   block[idx ^ 1], block[idx]);
+                                block[idx ^ 1], block[idx]);
                 current_offset += n_bytes_read;
         }
 
diff --git a/coreutils/sort.c b/coreutils/sort.c
index 1df07285c..a1625fc9c 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -219,7 +219,7 @@ static int compare_keys(const void *xarg, const void *yarg)
                 y = get_key(*(char **)yarg, key, flags);
 #else
         /* This curly bracket serves no purpose but to match the nesting
-           level of the for () loop we're not using */
+         * level of the for () loop we're not using */
         {
                 x = *(char **)xarg;
                 y = *(char **)yarg;
diff --git a/coreutils/stat.c b/coreutils/stat.c
index 259481750..69a8a1a36 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -611,37 +611,43 @@ static bool do_stat(const char *filename, const char *format)
 # else
                 if (option_mask32 & OPT_TERSE) {
                         format = (option_mask32 & OPT_SELINUX ?
-                                  "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o %C\n":
-                                  "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o\n");
+                                "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o %C\n"
+                                :
+                                "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o\n"
+                                );
                 } else {
                         if (S_ISBLK(statbuf.st_mode) || S_ISCHR(statbuf.st_mode)) {
                                 format = (option_mask32 & OPT_SELINUX ?
-                                          "  File: %N\n"
-                                          "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
-                                          "Device: %Dh/%dd\tInode: %-10i  Links: %-5h"
-                                          " Device type: %t,%T\n"
-                                          "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
-                                          "   S_Context: %C\n"
-                                          "Access: %x\n" "Modify: %y\n" "Change: %z\n":
-                                          "  File: %N\n"
-                                          "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
-                                          "Device: %Dh/%dd\tInode: %-10i  Links: %-5h"
-                                          " Device type: %t,%T\n"
-                                          "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
-                                          "Access: %x\n" "Modify: %y\n" "Change: %z\n");
+                                        "  File: %N\n"
+                                        "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
+                                        "Device: %Dh/%dd\tInode: %-10i  Links: %-5h"
+                                        " Device type: %t,%T\n"
+                                        "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
+                                        "   S_Context: %C\n"
+                                        "Access: %x\n" "Modify: %y\n" "Change: %z\n"
+                                        :
+                                        "  File: %N\n"
+                                        "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
+                                        "Device: %Dh/%dd\tInode: %-10i  Links: %-5h"
+                                        " Device type: %t,%T\n"
+                                        "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
+                                        "Access: %x\n" "Modify: %y\n" "Change: %z\n"
+                                        );
                         } else {
                                 format = (option_mask32 & OPT_SELINUX ?
-                                          "  File: %N\n"
-                                          "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
-                                          "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
-                                          "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
-                                          "S_Context: %C\n"
-                                          "Access: %x\n" "Modify: %y\n" "Change: %z\n":
-                                          "  File: %N\n"
-                                          "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
-                                          "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
-                                          "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
-                                          "Access: %x\n" "Modify: %y\n" "Change: %z\n");
+                                        "  File: %N\n"
+                                        "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
+                                        "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
+                                        "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
+                                        "S_Context: %C\n"
+                                        "Access: %x\n" "Modify: %y\n" "Change: %z\n"
+                                        :
+                                        "  File: %N\n"
+                                        "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
+                                        "Device: %Dh/%dd\tInode: %-10i  Links: %h\n"
+                                        "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"
+                                        "Access: %x\n" "Modify: %y\n" "Change: %z\n"
+                                        );
                         }
                 }
 # endif
diff --git a/coreutils/stty.c b/coreutils/stty.c
index 0668cf7be..96754dd84 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -1056,7 +1056,7 @@ static void do_display(const struct termios *mode, int all)
                 }
 #endif
                 wrapf("%s = %s;", nth_string(control_name, i),
-                          visible(mode->c_cc[control_info[i].offset]));
+                                visible(mode->c_cc[control_info[i].offset]));
         }
 #if VEOF == VMIN
         if ((mode->c_lflag & ICANON) == 0)
diff --git a/coreutils/sum.c b/coreutils/sum.c
index 95110a6da..75f6ef60a 100644
--- a/coreutils/sum.c
+++ b/coreutils/sum.c
@@ -94,8 +94,8 @@ int sum_main(int argc UNUSED_PARAM, char **argv)
                 n = sum_file("-", type);
         } else {
                 /* Need to print the name if either
-                   - more than one file given
-                   - doing sysv */
+                 * - more than one file given
+                 * - doing sysv */
                 type += (argv[1] || type == SUM_SYSV);
                 n = 1;
                 do {
diff --git a/coreutils/test.c b/coreutils/test.c
index 80f540c22..d8af4dcf3 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -610,7 +610,7 @@ static int test_eaccess(char *path, int mode)
                         return 0;
 
                 /* Root can execute any file that has any one of the execute
-                   bits set. */
+                 * bits set. */
                 if (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))
                         return 0;
         }