2 files changed, 29 insertions, 119 deletions

diff --git a/include/libbb.h b/include/libbb.h
index 0ea7700f2..99bfe085c 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1532,47 +1532,31 @@ enum {
 };
 void FAST_FUNC read_base64(FILE *src_stream, FILE *dst_stream, int flags);
 
-typedef struct sha1_ctx_t {
-        uint32_t hash[8];    /* 5, +3 elements for sha256 */
-        uint64_t total64;    /* must be directly after hash[] */
-        uint8_t wbuffer[64]; /* NB: always correctly aligned for uint64_t */
-        void (*process_block)(struct sha1_ctx_t*) FAST_FUNC;
-} sha1_ctx_t;
-void sha1_begin(sha1_ctx_t *ctx) FAST_FUNC;
-void sha1_hash(sha1_ctx_t *ctx, const void *data, size_t length) FAST_FUNC;
-void sha1_end(sha1_ctx_t *ctx, void *resbuf) FAST_FUNC;
-typedef struct sha1_ctx_t sha256_ctx_t;
-void sha256_begin(sha256_ctx_t *ctx) FAST_FUNC;
-#define sha256_hash sha1_hash
-#define sha256_end sha1_end
+typedef struct md5_ctx_t {
+        uint8_t wbuffer[64]; /* always correctly aligned for uint64_t */
+        void (*process_block)(struct md5_ctx_t*) FAST_FUNC;
+        uint64_t total64;    /* must be directly before hash[] */
+        uint32_t hash[8];    /* 4 elements for md5, 5 for sha1, 8 for sha256 */
+} md5_ctx_t;
+typedef struct md5_ctx_t sha1_ctx_t;
+typedef struct md5_ctx_t sha256_ctx_t;
 typedef struct sha512_ctx_t {
+        uint64_t total64[2];  /* must be directly before hash[] */
         uint64_t hash[8];
-        uint64_t total64[2];  /* must be directly after hash[] */
-        uint8_t wbuffer[128]; /* NB: always correctly aligned for uint64_t */
+        uint8_t wbuffer[128]; /* always correctly aligned for uint64_t */
 } sha512_ctx_t;
-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;
-#if 1
-typedef struct md5_ctx_t {
-        uint32_t A;
-        uint32_t B;
-        uint32_t C;
-        uint32_t D;
-        uint64_t total64;
-        char wbuffer[64]; /* NB: always correctly aligned for uint64_t */
-} md5_ctx_t;
-#else
-/* libbb/md5prime.c uses a bit different one: */
-typedef struct md5_ctx_t {
-        uint32_t state[4];      /* state (ABCD) */
-        uint32_t count[2];      /* number of bits, modulo 2^64 (lsb first) */
-        unsigned char buffer[64];       /* input buffer */
-} md5_ctx_t;
-#endif
 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_end(md5_ctx_t *ctx, void *resbuf) FAST_FUNC;
+void sha1_begin(sha1_ctx_t *ctx) FAST_FUNC;
+#define sha1_hash md5_hash
+void sha1_end(sha1_ctx_t *ctx, void *resbuf) FAST_FUNC;
+void sha256_begin(sha256_ctx_t *ctx) FAST_FUNC;
+#define sha256_hash md5_hash
+#define sha256_end  sha1_end
+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;
 
 
 uint32_t *crc32_filltable(uint32_t *tbl256, int endian) FAST_FUNC;
diff --git a/include/usage.src.h b/include/usage.src.h
index 5d7767bb4..f5ddd7ba5 100644
--- a/include/usage.src.h
+++ b/include/usage.src.h
@@ -2788,7 +2788,7 @@ INSERT
        "Address:    127.0.0.1\n"
 
 #define ntpd_trivial_usage \
-        "[-dnqwl] [-S PROG] [-p PEER]..."
+        "[-dnqNw"IF_FEATURE_NTPD_SERVER("l")"] [-S PROG] [-p PEER]..."
 #define ntpd_full_usage "\n\n" \
        "NTP client/server\n" \
      "\nOptions:" \
@@ -2797,7 +2797,9 @@ INSERT
      "\n        -q      Quit after clock is set" \
      "\n        -N      Run at high priority" \
      "\n        -w      Do not set time (only query peers), implies -n" \
+        IF_FEATURE_NTPD_SERVER( \
      "\n        -l      Run as server on port 123" \
+        ) \
      "\n        -S PROG Run PROG after stepping time, stratum change, and every 11 mins" \
      "\n        -p PEER Obtain time from PEER (may be repeated)" \
 
@@ -2855,17 +2857,19 @@ INSERT
        "[OPTIONS] [ORIGFILE [PATCHFILE]]"
 #define patch_full_usage "\n\n" \
         IF_LONG_OPTS( \
-       "        -p,--strip N    Strip N leading components from file names" \
-     "\n        -i,--input DIFF Read DIFF instead of stdin" \
-     "\n        -R,--reverse    Reverse patch" \
-     "\n        -N,--forward    Ignore already applied patches" \
-     "\n        --dry-run       Don't actually change files" \
+       "        -p,--strip N            Strip N leading components from file names" \
+     "\n        -i,--input DIFF         Read DIFF instead of stdin" \
+     "\n        -R,--reverse            Reverse patch" \
+     "\n        -N,--forward            Ignore already applied patches" \
+     "\n        --dry-run               Don't actually change files" \
+     "\n        -E,--remove-empty-files Remove output files if they become empty" \
         ) \
         IF_NOT_LONG_OPTS( \
        "        -p N    Strip N leading components from file names" \
      "\n        -i DIFF Read DIFF instead of stdin" \
      "\n        -R      Reverse patch" \
      "\n        -N      Ignore already applied patches" \
+     "\n        -E      Remove output files if they become empty" \
         )
 
 #define patch_example_usage \
@@ -4232,84 +4236,6 @@ INSERT
        "# tunctl\n" \
        "# tunctl -d tun0\n"
 
-#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1
-# define IF_UDHCP_VERBOSE(...) __VA_ARGS__
-#else
-# define IF_UDHCP_VERBOSE(...)
-#endif
-#define udhcpc_trivial_usage \
-       "[-fbnq"IF_UDHCP_VERBOSE("v")"oCR] [-i IFACE] [-r IP] [-s PROG] [-p PIDFILE]\n" \
-       "        [-H HOSTNAME] [-c CID] [-V VENDOR] [-O DHCP_OPT]..." IF_FEATURE_UDHCP_PORT(" [-P N]")
-#define udhcpc_full_usage "\n" \
-        IF_LONG_OPTS( \
-     "\n        -i,--interface IFACE    Interface to use (default eth0)" \
-     "\n        -p,--pidfile FILE       Create pidfile" \
-     "\n        -r,--request IP         IP address to request" \
-     "\n        -s,--script PROG        Run PROG at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")" \
-     "\n        -t,--retries N          Send up to N discover packets" \
-     "\n        -T,--timeout N          Pause between packets (default 3 seconds)" \
-     "\n        -A,--tryagain N         Wait N seconds after failure (default 20)" \
-     "\n        -f,--foreground         Run in foreground" \
-        USE_FOR_MMU( \
-     "\n        -b,--background         Background if lease is not obtained" \
-        ) \
-     "\n        -S,--syslog             Log to syslog too" \
-     "\n        -n,--now                Exit if lease is not obtained" \
-     "\n        -q,--quit               Exit after obtaining lease" \
-     "\n        -R,--release            Release IP on exit" \
-        IF_FEATURE_UDHCP_PORT( \
-     "\n        -P,--client-port N      Use port N (default 68)" \
-        ) \
-        IF_FEATURE_UDHCPC_ARPING( \
-     "\n        -a,--arping             Use arping to validate offered address" \
-        ) \
-     "\n        -O,--request-option OPT Request DHCP option OPT (cumulative)" \
-     "\n        -o,--no-default-options Don't request any options (unless -O is given)" \
-     "\n        -x OPT:VAL              Include option OPT in sent packets (cumulative)" \
-     "\n        -F,--fqdn NAME          Ask server to update DNS mapping for NAME" \
-     "\n        -H,-h,--hostname NAME   Send NAME as client hostname (default none)" \
-     "\n        -V,--vendorclass VENDOR Vendor identifier (default 'udhcp VERSION')" \
-     "\n        -c,--clientid CLIENTID  Client identifier (default own MAC)" \
-     "\n        -C,--clientid-none      Don't send client identifier" \
-        IF_UDHCP_VERBOSE( \
-     "\n        -v                      Verbose" \
-        ) \
-        ) \
-        IF_NOT_LONG_OPTS( \
-     "\n        -i IFACE        Interface to use (default eth0)" \
-     "\n        -p FILE         Create pidfile" \
-     "\n        -r IP           IP address to request" \
-     "\n        -s PROG         Run PROG at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")" \
-     "\n        -t N            Send up to N discover packets" \
-     "\n        -T N            Pause between packets (default 3 seconds)" \
-     "\n        -A N            Wait N seconds (default 20) after failure" \
-     "\n        -x OPT:VAL      Include option OPT in sent packets" \
-     "\n        -O OPT          Request DHCP option OPT (cumulative)" \
-     "\n        -o              Don't request any options (unless -O is given)" \
-     "\n        -f              Run in foreground" \
-        USE_FOR_MMU( \
-     "\n        -b              Background if lease is not obtained" \
-        ) \
-     "\n        -S              Log to syslog too" \
-     "\n        -n              Exit if lease is not obtained" \
-     "\n        -q              Exit after obtaining lease" \
-     "\n        -R              Release IP on exit" \
-        IF_FEATURE_UDHCP_PORT( \
-     "\n        -P N            Use port N (default 68)" \
-        ) \
-        IF_FEATURE_UDHCPC_ARPING( \
-     "\n        -a              Use arping to validate offered address" \
-        ) \
-     "\n        -F NAME         Ask server to update DNS mapping for NAME" \
-     "\n        -H,-h NAME      Send NAME as client hostname (default none)" \
-     "\n        -V VENDOR       Vendor identifier (default 'udhcp VERSION')" \
-     "\n        -c CLIENTID     Client identifier (default own MAC)" \
-     "\n        -C              Don't send client identifier" \
-        IF_UDHCP_VERBOSE( \
-     "\n        -v              Verbose" \
-        ) \
-        ) \
-
 #define udhcpd_trivial_usage \
        "[-fS]" IF_FEATURE_UDHCP_PORT(" [-P N]") " [CONFFILE]" \