Merge branch 'busybox' into merge

7 files changed, 48 insertions, 37 deletions

diff --git a/include/applets.src.h b/include/applets.src.h
index 597b1c9a6..29ab16706 100644
--- a/include/applets.src.h
+++ b/include/applets.src.h
@@ -328,6 +328,7 @@ IF_SETSEBOOL(APPLET(setsebool, BB_DIR_USR_SBIN, BB_SUID_DROP))
 IF_SETSID(APPLET(setsid, BB_DIR_USR_BIN, BB_SUID_DROP))
 IF_SETUIDGID(APPLET_ODDNAME(setuidgid, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, setuidgid))
 IF_SHA1SUM(APPLET_NOEXEC(sha1sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, sha1sum))
+IF_SHA3SUM(APPLET_NOEXEC(sha3sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, sha3sum))
 IF_SHA256SUM(APPLET_NOEXEC(sha256sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, sha256sum))
 IF_SHA512SUM(APPLET_NOEXEC(sha512sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, sha512sum))
 IF_SHOWKEY(APPLET(showkey, BB_DIR_USR_BIN, BB_SUID_DROP))
diff --git a/include/bb_archive.h b/include/bb_archive.h
index 7bb5615da..a7a2a1135 100644
--- a/include/bb_archive.h
+++ b/include/bb_archive.h
@@ -220,9 +220,9 @@ IF_DESKTOP(long long) int unpack_xz_stream(transformer_aux_data_t *aux, int src_
 
 char* append_ext(char *filename, const char *expected_ext) FAST_FUNC;
 int bbunpack(char **argv,
-            IF_DESKTOP(long long) int FAST_FUNC (*unpacker)(transformer_aux_data_t *aux),
-            char* FAST_FUNC (*make_new_name)(char *filename, const char *expected_ext),
-            const char *expected_ext
+                IF_DESKTOP(long long) int FAST_FUNC (*unpacker)(transformer_aux_data_t *aux),
+                char* FAST_FUNC (*make_new_name)(char *filename, const char *expected_ext),
+                const char *expected_ext
 ) FAST_FUNC;
 
 void check_errors_in_children(int signo);
diff --git a/include/grp_.h b/include/grp_.h
index 82ad90492..e5075e5a0 100644
--- a/include/grp_.h
+++ b/include/grp_.h
@@ -64,7 +64,7 @@ extern struct group *fgetgrent(FILE *__stream);
 
 /* Write the given entry onto the given stream.  */
 extern int putgrent(const struct group *__restrict __p,
-                     FILE *__restrict __f);
+                FILE *__restrict __f);
 #endif
 
 /* Search for an entry with a matching group ID.  */
@@ -82,32 +82,32 @@ extern struct group *getgrnam(const char *__name);
    POSIX people would choose.  */
 
 extern int getgrent_r(struct group *__restrict __resultbuf,
-                       char *__restrict __buffer, size_t __buflen,
-                       struct group **__restrict __result);
+                char *__restrict __buffer, size_t __buflen,
+                struct group **__restrict __result);
 
 /* Search for an entry with a matching group ID.  */
 extern int getgrgid_r(gid_t __gid, struct group *__restrict __resultbuf,
-                       char *__restrict __buffer, size_t __buflen,
-                       struct group **__restrict __result);
+                char *__restrict __buffer, size_t __buflen,
+                struct group **__restrict __result);
 
 /* Search for an entry with a matching group name.  */
 extern int getgrnam_r(const char *__restrict __name,
-                       struct group *__restrict __resultbuf,
-                       char *__restrict __buffer, size_t __buflen,
-                       struct group **__restrict __result);
+                struct group *__restrict __resultbuf,
+                char *__restrict __buffer, size_t __buflen,
+                struct group **__restrict __result);
 
 /* Read a group entry from STREAM.  This function is not standardized
    an probably never will.  */
 extern int fgetgrent_r(FILE *__restrict __stream,
-                        struct group *__restrict __resultbuf,
-                        char *__restrict __buffer, size_t __buflen,
-                        struct group **__restrict __result);
+                struct group *__restrict __resultbuf,
+                char *__restrict __buffer, size_t __buflen,
+                struct group **__restrict __result);
 
 /* Store at most *NGROUPS members of the group set for USER into
    *GROUPS.  Also include GROUP.  The actual number of groups found is
    returned in *NGROUPS.  Return -1 if the if *NGROUPS is too small.  */
 extern int getgrouplist(const char *__user, gid_t __group,
-                         gid_t *__groups, int *__ngroups);
+                gid_t *__groups, int *__ngroups);
 
 /* Initialize the group set for the current user
    by reading the group database and using all groups
diff --git a/include/libbb.h b/include/libbb.h
index a749c0b92..c5ff51398 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1532,7 +1532,7 @@ struct smaprec {
         procps_read_smaps(pid, total)
 #endif
 int FAST_FUNC procps_read_smaps(pid_t pid, struct smaprec *total,
-                      void (*cb)(struct smaprec *, void *), void *data);
+                void (*cb)(struct smaprec *, void *), void *data);
 
 typedef struct procps_status_t {
         DIR *dir;
@@ -1655,8 +1655,12 @@ typedef struct sha512_ctx_t {
         uint64_t hash[8];
         uint8_t wbuffer[128]; /* always correctly aligned for uint64_t */
 } sha512_ctx_t;
+typedef struct sha3_ctx_t {
+        uint64_t state[25];
+        unsigned bytes_queued;
+} sha3_ctx_t;
 void md5_begin(md5_ctx_t *ctx) FAST_FUNC;
-void md5_hash(md5_ctx_t *ctx, const void *data, size_t length) FAST_FUNC;
+void md5_hash(md5_ctx_t *ctx, const void *buffer, size_t len) FAST_FUNC;
 void md5_end(md5_ctx_t *ctx, void *resbuf) FAST_FUNC;
 void sha1_begin(sha1_ctx_t *ctx) FAST_FUNC;
 #define sha1_hash md5_hash
@@ -1667,6 +1671,9 @@ void sha256_begin(sha256_ctx_t *ctx) FAST_FUNC;
 void sha512_begin(sha512_ctx_t *ctx) FAST_FUNC;
 void sha512_hash(sha512_ctx_t *ctx, const void *buffer, size_t len) FAST_FUNC;
 void sha512_end(sha512_ctx_t *ctx, void *resbuf) FAST_FUNC;
+void sha3_begin(sha3_ctx_t *ctx) FAST_FUNC;
+void sha3_hash(sha3_ctx_t *ctx, const void *buffer, size_t len) FAST_FUNC;
+void sha3_end(sha3_ctx_t *ctx, void *resbuf) FAST_FUNC;
 
 extern uint32_t *global_crc32_table;
 uint32_t *crc32_filltable(uint32_t *tbl256, int endian) FAST_FUNC;
diff --git a/include/platform.h b/include/platform.h
index 78d42fed9..b3eee55ee 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -222,6 +222,7 @@
 
 #include <stdint.h>
 typedef int      bb__aliased_int      FIX_ALIASING;
+typedef long     bb__aliased_long     FIX_ALIASING;
 typedef uint16_t bb__aliased_uint16_t FIX_ALIASING;
 typedef uint32_t bb__aliased_uint32_t FIX_ALIASING;
 
@@ -229,7 +230,8 @@ typedef uint32_t bb__aliased_uint32_t FIX_ALIASING;
  * a lvalue. This makes it more likely to not swap them by mistake
  */
 #if defined(i386) || defined(__x86_64__) || defined(__powerpc__)
-# define move_from_unaligned_int(v, intp) ((v) = *(bb__aliased_int*)(intp))
+# define move_from_unaligned_int(v, intp)  ((v) = *(bb__aliased_int*)(intp))
+# define move_from_unaligned_long(v, longp) ((v) = *(bb__aliased_long*)(longp))
 # define move_from_unaligned16(v, u16p) ((v) = *(bb__aliased_uint16_t*)(u16p))
 # define move_from_unaligned32(v, u32p) ((v) = *(bb__aliased_uint32_t*)(u32p))
 # define move_to_unaligned16(u16p, v)   (*(bb__aliased_uint16_t*)(u16p) = (v))
@@ -238,6 +240,7 @@ typedef uint32_t bb__aliased_uint32_t FIX_ALIASING;
 #else
 /* performs reasonably well (gcc usually inlines memcpy here) */
 # define move_from_unaligned_int(v, intp) (memcpy(&(v), (intp), sizeof(int)))
+# define move_from_unaligned_long(v, longp) (memcpy(&(v), (longp), sizeof(long)))
 # define move_from_unaligned16(v, u16p) (memcpy(&(v), (u16p), 2))
 # define move_from_unaligned32(v, u32p) (memcpy(&(v), (u32p), 4))
 # define move_to_unaligned16(u16p, v) do { \
diff --git a/include/pwd_.h b/include/pwd_.h
index ea158da45..625b6f5a2 100644
--- a/include/pwd_.h
+++ b/include/pwd_.h
@@ -63,7 +63,7 @@ extern struct passwd *fgetpwent(FILE *__stream);
 
 /* Write the given entry onto the given stream.  */
 extern int putpwent(const struct passwd *__restrict __p,
-                     FILE *__restrict __f);
+                FILE *__restrict __f);
 #endif
 
 /* Search for an entry with a matching user ID.  */
@@ -81,25 +81,25 @@ extern struct passwd *getpwnam(const char *__name);
    POSIX people would choose.  */
 
 extern int getpwent_r(struct passwd *__restrict __resultbuf,
-                       char *__restrict __buffer, size_t __buflen,
-                       struct passwd **__restrict __result);
+                char *__restrict __buffer, size_t __buflen,
+                struct passwd **__restrict __result);
 
 extern int getpwuid_r(uid_t __uid,
-                       struct passwd *__restrict __resultbuf,
-                       char *__restrict __buffer, size_t __buflen,
-                       struct passwd **__restrict __result);
+                struct passwd *__restrict __resultbuf,
+                char *__restrict __buffer, size_t __buflen,
+                struct passwd **__restrict __result);
 
 extern int getpwnam_r(const char *__restrict __name,
-                       struct passwd *__restrict __resultbuf,
-                       char *__restrict __buffer, size_t __buflen,
-                       struct passwd **__restrict __result);
+                struct passwd *__restrict __resultbuf,
+                char *__restrict __buffer, size_t __buflen,
+                struct passwd **__restrict __result);
 
 /* Read an entry from STREAM.  This function is not standardized and
    probably never will.  */
 extern int fgetpwent_r(FILE *__restrict __stream,
-                        struct passwd *__restrict __resultbuf,
-                        char *__restrict __buffer, size_t __buflen,
-                        struct passwd **__restrict __result);
+                struct passwd *__restrict __resultbuf,
+                char *__restrict __buffer, size_t __buflen,
+                struct passwd **__restrict __result);
 
 POP_SAVED_FUNCTION_VISIBILITY
 
diff --git a/include/shadow_.h b/include/shadow_.h
index 648a62ab3..7babe4f30 100644
--- a/include/shadow_.h
+++ b/include/shadow_.h
@@ -79,21 +79,21 @@ extern int putspent(const struct spwd *__p, FILE *__stream);
 
 /* Reentrant versions of some of the functions above */
 extern int getspent_r(struct spwd *__result_buf, char *__buffer,
-                       size_t __buflen, struct spwd **__result);
+                size_t __buflen, struct spwd **__result);
 #endif
 
 extern int getspnam_r(const char *__name, struct spwd *__result_buf,
-                       char *__buffer, size_t __buflen,
-                       struct spwd **__result);
+                char *__buffer, size_t __buflen,
+                struct spwd **__result);
 
 #ifdef UNUSED_FOR_NOW
 extern int sgetspent_r(const char *__string, struct spwd *__result_buf,
-                        char *__buffer, size_t __buflen,
-                        struct spwd **__result);
+                char *__buffer, size_t __buflen,
+                struct spwd **__result);
 
 extern int fgetspent_r(FILE *__stream, struct spwd *__result_buf,
-                        char *__buffer, size_t __buflen,
-                        struct spwd **__result);
+                char *__buffer, size_t __buflen,
+                struct spwd **__result);
 /* Protect password file against multi writers */
 extern int lckpwdf(void);