Merge branch 'busybox' into merge

3 files changed, 18 insertions, 20 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"