Merge branch 'busybox' into merge

12 files changed, 55 insertions, 51 deletions

diff --git a/coreutils/dd.c b/coreutils/dd.c
index e0af8f4a3..2d91f77ef 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -59,7 +59,7 @@
 //usage:       "[if=FILE] [of=FILE] [" IF_FEATURE_DD_IBS_OBS("ibs=N obs=N/") "bs=N] [count=N] [skip=N] [seek=N]\n"
 //usage:        IF_FEATURE_DD_IBS_OBS(
 //usage:       "        [conv=notrunc|noerror|sync|fsync]\n"
-//usage:       "        [iflag=skip_bytes|fullblock] [oflag=seek_bytes]"
+//usage:       "        [iflag=skip_bytes|fullblock] [oflag=seek_bytes|append]"
 //usage:        )
 //usage:#define dd_full_usage "\n\n"
 //usage:       "Copy a file with converting and formatting\n"
@@ -84,6 +84,7 @@
 //usage:     "\n        iflag=skip_bytes        skip=N is in bytes"
 //usage:     "\n        iflag=fullblock Read full blocks"
 //usage:     "\n        oflag=seek_bytes        seek=N is in bytes"
+//usage:     "\n        oflag=append    Open output file in append mode"
 //usage:        )
 //usage:        IF_FEATURE_DD_STATUS(
 //usage:     "\n        status=noxfer   Suppress rate output"
@@ -143,11 +144,12 @@ enum {
         /* start of output flags */
         FLAG_OFLAG_SHIFT = 7,
         FLAG_SEEK_BYTES = (1 << 7) * ENABLE_FEATURE_DD_IBS_OBS,
+        FLAG_APPEND = (1 << 8) * ENABLE_FEATURE_DD_IBS_OBS,
         /* end of output flags */
-        FLAG_TWOBUFS = (1 << 8) * ENABLE_FEATURE_DD_IBS_OBS,
-        FLAG_COUNT   = 1 << 9,
-        FLAG_STATUS_NONE = 1 << 10,
-        FLAG_STATUS_NOXFER = 1 << 11,
+        FLAG_TWOBUFS = (1 << 9) * ENABLE_FEATURE_DD_IBS_OBS,
+        FLAG_COUNT   = 1 << 10,
+        FLAG_STATUS_NONE = 1 << 11,
+        FLAG_STATUS_NOXFER = 1 << 12,
 };
 
 static void dd_output_status(int UNUSED_PARAM cur_signal)
@@ -270,7 +272,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
         static const char iflag_words[] ALIGN1 =
                 "skip_bytes\0""fullblock\0";
         static const char oflag_words[] ALIGN1 =
-                "seek_bytes\0";
+                "seek_bytes\0append\0";
 #endif
 #if ENABLE_FEATURE_DD_STATUS
         static const char status_words[] ALIGN1 =
@@ -459,6 +461,8 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
 
                 if (!seek && !(G.flags & FLAG_NOTRUNC))
                         oflag |= O_TRUNC;
+                if (G.flags & FLAG_APPEND)
+                        oflag |= O_APPEND;
 
                 xmove_fd(xopen(outfile, oflag), ofd);
 
diff --git a/coreutils/du.c b/coreutils/du.c
index 0615a6e49..4fd09a8ee 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -290,11 +290,11 @@ int du_main(int argc UNUSED_PARAM, char **argv)
         total = 0;
         do {
                 total += du(*argv);
-                /* otherwise du /dir /dir won't show /dir twice: */
-                reset_ino_dev_hashtable();
                 G.slink_depth = slink_depth_save;
         } while (*++argv);
 
+        if (ENABLE_FEATURE_CLEAN_UP)
+                reset_ino_dev_hashtable();
         if (opt & OPT_c_total)
                 print(total, "total");
 
diff --git a/coreutils/stty.c b/coreutils/stty.c
index 6251f2aef..d1309f9aa 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -5,18 +5,7 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-/* Usage: stty [-ag] [-F device] [setting...]
- *
- * Options:
- * -a Write all current settings to stdout in human-readable form.
- * -g Write all current settings to stdout in stty-readable form.
- * -F Open and use the specified device instead of stdin
- *
- * If no args are given, write to stdout the baud rate and settings that
- * have been changed from their defaults.  Mode reading and changes
- * are done on the specified device, or stdin if none was specified.
- *
- * David MacKenzie <djm@gnu.ai.mit.edu>
+/* David MacKenzie <djm@gnu.ai.mit.edu>
  *
  * Special for busybox ported by Vladimir Oleynik <dzo@simtreas.ru> 2001
  */
@@ -40,6 +29,11 @@
 //usage:     "\n        -g              Print in stty-readable form"
 //usage:     "\n        [SETTING]       See manpage"
 
+/* If no args are given, write to stdout the baud rate and settings that
+ * have been changed from their defaults.  Mode reading and changes
+ * are done on the specified device, or stdin if none was specified.
+ */
+
 #include "libbb.h"
 #include "common_bufsiz.h"
 
diff --git a/docs/posix_conformance.txt b/docs/posix_conformance.txt
index 0e6f4a317..f6e8858cc 100644
--- a/docs/posix_conformance.txt
+++ b/docs/posix_conformance.txt
@@ -183,6 +183,7 @@ dd compatibility options:
   iflag=skip_bytes|  yes   |           |
   iflag=fullblock |  yes   |           |
   oflag=seek_bytes|  yes   |           |
+  oflag=append    |  yes   |           |
 
 df POSIX options
  option           | exists | compliant | remarks
diff --git a/findutils/xargs.c b/findutils/xargs.c
index d014669bd..8331931bc 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -602,23 +602,23 @@ static int xargs_ask_confirmation(void)
 //usage:       "[OPTIONS] [PROG ARGS]"
 //usage:#define xargs_full_usage "\n\n"
 //usage:       "Run PROG on every item given by stdin\n"
-//usage:        IF_FEATURE_XARGS_SUPPORT_CONFIRMATION(
-//usage:     "\n        -p      Ask user whether to run each command"
-//usage:        )
-//usage:     "\n        -r      Don't run command if input is empty"
 //usage:        IF_FEATURE_XARGS_SUPPORT_ZERO_TERM(
 //usage:     "\n        -0      Input is separated by NULs"
 //usage:        )
 //usage:        IF_FEATURE_XARGS_SUPPORT_ARGS_FILE(
 //usage:     "\n        -a FILE Read from FILE instead of stdin"
 //usage:        )
+//usage:     "\n        -r      Don't run command if input is empty"
 //usage:     "\n        -t      Print the command on stderr before execution"
-//usage:     "\n        -e[STR] STR stops input processing"
-//usage:     "\n        -n N    Pass no more than N args to PROG"
-//usage:     "\n        -s N    Pass command line of no more than N bytes"
+//usage:        IF_FEATURE_XARGS_SUPPORT_CONFIRMATION(
+//usage:     "\n        -p      Ask user whether to run each command"
+//usage:        )
+//usage:     "\n        -E STR,-e[STR]  STR stops input processing"
 //usage:        IF_FEATURE_XARGS_SUPPORT_REPL_STR(
 //usage:     "\n        -I STR  Replace STR within PROG ARGS with input line"
 //usage:        )
+//usage:     "\n        -n N    Pass no more than N args to PROG"
+//usage:     "\n        -s N    Pass command line of no more than N bytes"
 //usage:        IF_FEATURE_XARGS_SUPPORT_PARALLEL(
 //usage:     "\n        -P N    Run up to N PROGs in parallel"
 //usage:        )
diff --git a/libbb/inode_hash.c b/libbb/inode_hash.c
index 37fed9c82..f2cc417bc 100644
--- a/libbb/inode_hash.c
+++ b/libbb/inode_hash.c
@@ -82,7 +82,7 @@ void FAST_FUNC add_to_ino_dev_hashtable(const struct stat *statbuf, const char *
         ino_dev_hashtable[i] = bucket;
 }
 
-#if ENABLE_DU || ENABLE_FEATURE_CLEAN_UP
+#if ENABLE_FEATURE_CLEAN_UP
 /* Clear statbuf hash table */
 void FAST_FUNC reset_ino_dev_hashtable(void)
 {
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 855815ece..0f474bc09 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -177,12 +177,11 @@
  */
 #define STEP_THRESHOLD     1
 /* Slew threshold (sec): adjtimex() won't accept offsets larger than this.
- * Using exact power of 2 (1/8) results in smaller code
+ * Using exact power of 2 (1/8, 1/2 etc) results in smaller code
  */
-#define SLEW_THRESHOLD 0.125
-//^^^^^^^^^^^^^^^^^^^^^^^^^^ TODO: man adjtimex about tmx.offset:
-// "Since Linux 2.6.26, the supplied value is clamped to the range (-0.5s, +0.5s)"
-// - can use this larger value instead?
+#define SLEW_THRESHOLD   0.5
+// ^^^^ used to be 0.125.
+// Since Linux 2.6.26 (circa 2006), kernel accepts (-0.5s, +0.5s) range
 
 /* Stepout threshold (sec). std ntpd uses 900 (11 mins (!)) */
 //UNUSED: #define WATCH_THRESHOLD  128
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index 38c91cbb4..8a4a4b7a5 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -1370,7 +1370,13 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                         bb_error_msg("no lease, forking to background");
                                         client_background();
                                         /* do not background again! */
-                                        opt = ((opt & ~OPT_b) | OPT_f);
+                                        opt = ((opt & ~(OPT_b|OPT_n)) | OPT_f);
+                                        /* ^^^ also disables -n (-b takes priority over -n):
+                                         * ifup's default udhcpc options are -R -n,
+                                         * and users want to be able to add -b
+                                         * (in a config file) to make it background
+                                         * _and not exit_.
+                                         */
                                 } else
 #endif
                                 if (opt & OPT_n) { /* abort if no lease */
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index dcec8cdfd..e2fb18aba 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -1209,13 +1209,13 @@ static void client_background(void)
 //usage:     "\n        -t N            Send up to N discover packets (default 3)"
 //usage:     "\n        -T SEC          Pause between packets (default 3)"
 //usage:     "\n        -A SEC          Wait if lease is not obtained (default 20)"
+//usage:        USE_FOR_MMU(
+//usage:     "\n        -b              Background if lease is not obtained"
+//usage:        )
 //usage:     "\n        -n              Exit if lease is not obtained"
 //usage:     "\n        -q              Exit after obtaining lease"
 //usage:     "\n        -R              Release IP on exit"
 //usage:     "\n        -f              Run in foreground"
-//usage:        USE_FOR_MMU(
-//usage:     "\n        -b              Background if lease is not obtained"
-//usage:        )
 //usage:     "\n        -S              Log to syslog too"
 //usage:        IF_FEATURE_UDHCPC_ARPING(
 //usage:     "\n        -a[MSEC]        Validate offered address with ARP ping"
@@ -1484,7 +1484,13 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                         bb_error_msg("no lease, forking to background");
                                         client_background();
                                         /* do not background again! */
-                                        opt = ((opt & ~OPT_b) | OPT_f);
+                                        opt = ((opt & ~(OPT_b|OPT_n)) | OPT_f);
+                                        /* ^^^ also disables -n (-b takes priority over -n):
+                                         * ifup's default udhcpc options are -R -n,
+                                         * and users want to be able to add -b
+                                         * (in a config file) to make it background
+                                         * _and not exit_.
+                                         */
                                 } else
 #endif
                                 if (opt & OPT_n) { /* abort if no lease */
diff --git a/procps/top.c b/procps/top.c
index 3db077060..625409755 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -1043,7 +1043,7 @@ static unsigned handle_input(unsigned scan_mask, duration_t interval)
 //usage:# define IF_SHOW_THREADS_OR_TOP_SMP(...)
 //usage:#endif
 //usage:#define top_trivial_usage
-//usage:       "[-b] [-nCOUNT] [-dSECONDS]" IF_FEATURE_TOPMEM(" [-m]")
+//usage:       "[-b"IF_FEATURE_TOPMEM("m")"] [-n COUNT] [-d SECONDS]"
 //usage:#define top_full_usage "\n\n"
 //usage:       "Provide a view of process activity in real time."
 //usage:   "\n""Read the status of all processes from /proc each SECONDS"
@@ -1068,12 +1068,11 @@ static unsigned handle_input(unsigned scan_mask, duration_t interval)
 //usage:                IF_FEATURE_TOP_SMP_CPU("1: toggle SMP")
 //usage:        )
 //usage:   "\n""        Q,^C: exit"
-//usage:   "\n"
 //usage:   "\n""Options:"
 //usage:        )
 //usage:   "\n""        -b      Batch mode"
 //usage:   "\n""        -n N    Exit after N iterations"
-//usage:   "\n""        -d N    Delay between updates"
+//usage:   "\n""        -d SEC  Delay between updates"
 //usage:        IF_FEATURE_TOPMEM(
 //usage:   "\n""        -m      Same as 's' key"
 //usage:        )
diff --git a/scripts/echo.c b/scripts/echo.c
index 8c6b409d3..7474ccdd4 100644
--- a/scripts/echo.c
+++ b/scripts/echo.c
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <limits.h>
+#include <unistd.h>
 
 #define WANT_HEX_ESCAPES 1
 
diff --git a/shell/ash.c b/shell/ash.c
index 8ed0f19f3..8daf263dc 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -9631,8 +9631,11 @@ evaltree(union node *n, int flags)
 {
         int checkexit = 0;
         int (*evalfn)(union node *, int);
+        struct stackmark smark;
         int status = 0;
 
+        setstackmark(&smark);
+
         if (n == NULL) {
                 TRACE(("evaltree(NULL) called\n"));
                 goto out;
@@ -9746,6 +9749,7 @@ evaltree(union node *n, int flags)
         if (flags & EV_EXIT)
                 raise_exception(EXEXIT);
 
+        popstackmark(&smark);
         TRACE(("leaving evaltree (no interrupts)\n"));
         return exitstatus;
 }
@@ -9806,14 +9810,12 @@ evalfor(union node *n, int flags)
         struct arglist arglist;
         union node *argp;
         struct strlist *sp;
-        struct stackmark smark;
         int status = 0;
 
         errlinno = lineno = n->ncase.linno;
         if (funcline)
                 lineno -= funcline - 1;
 
-        setstackmark(&smark);
         arglist.list = NULL;
         arglist.lastp = &arglist.list;
         for (argp = n->nfor.args; argp; argp = argp->narg.next) {
@@ -9830,7 +9832,6 @@ evalfor(union node *n, int flags)
                         break;
         }
         loopnest--;
-        popstackmark(&smark);
 
         return status;
 }
@@ -9841,14 +9842,12 @@ evalcase(union node *n, int flags)
         union node *cp;
         union node *patp;
         struct arglist arglist;
-        struct stackmark smark;
         int status = 0;
 
         errlinno = lineno = n->ncase.linno;
         if (funcline)
                 lineno -= funcline - 1;
 
-        setstackmark(&smark);
         arglist.list = NULL;
         arglist.lastp = &arglist.list;
         expandarg(n->ncase.expr, &arglist, EXP_TILDE);
@@ -9867,8 +9866,6 @@ evalcase(union node *n, int flags)
                 }
         }
  out:
-        popstackmark(&smark);
-
         return status;
 }
 
@@ -10590,7 +10587,6 @@ evalcommand(union node *cmd, int flags)
         struct localvar_list *localvar_stop;
         struct parsefile *file_stop;
         struct redirtab *redir_stop;
-        struct stackmark smark;
         union node *argp;
         struct arglist arglist;
         struct arglist varlist;
@@ -10615,7 +10611,6 @@ evalcommand(union node *cmd, int flags)
 
         /* First expand the arguments. */
         TRACE(("evalcommand(0x%lx, %d) called\n", (long)cmd, flags));
-        setstackmark(&smark);
         localvar_stop = pushlocalvars();
         file_stop = g_parsefile;
         back_exitstatus = 0;
@@ -10936,7 +10931,6 @@ evalcommand(union node *cmd, int flags)
                  */
                 setvar0("_", lastarg);
         }
-        popstackmark(&smark);
 
         return status;
 }