Merge branch 'busybox' into merge

5 files changed, 86 insertions, 19 deletions

diff --git a/coreutils/Config.src b/coreutils/Config.src
index 68857b2cc..21b97d382 100644
--- a/coreutils/Config.src
+++ b/coreutils/Config.src
@@ -570,12 +570,6 @@ config SUM
         help
           checksum and count the blocks in a file
 
-config SYNC
-        bool "sync"
-        default y
-        help
-          sync is used to flush filesystem buffers.
-
 config TAC
         bool "tac"
         default y
@@ -635,6 +629,14 @@ config UNAME
         help
           uname is used to print system information.
 
+config UNAME_OSNAME
+        string "Operating system name"
+        default "GNU/Linux"
+        depends on UNAME
+        help
+          Sets the operating system name reported by uname -o.  The
+          default is "GNU/Linux".
+
 config UNEXPAND
         bool "unexpand"
         default y
diff --git a/coreutils/Kbuild.src b/coreutils/Kbuild.src
index ec4ef7df2..4ec075ac6 100644
--- a/coreutils/Kbuild.src
+++ b/coreutils/Kbuild.src
@@ -68,7 +68,6 @@ lib-$(CONFIG_SORT)      += sort.o
 lib-$(CONFIG_STAT)      += stat.o
 lib-$(CONFIG_STTY)      += stty.o
 lib-$(CONFIG_SUM)       += sum.o
-lib-$(CONFIG_SYNC)      += sync.o
 lib-$(CONFIG_TAC)       += tac.o
 lib-$(CONFIG_TEE)       += tee.o
 lib-$(CONFIG_TRUE)      += true.o
diff --git a/coreutils/echo.c b/coreutils/echo.c
index 9663894ec..1c4174559 100644
--- a/coreutils/echo.c
+++ b/coreutils/echo.c
@@ -72,7 +72,7 @@ int echo_main(int argc UNUSED_PARAM, char **argv)
         unsigned buflen;
 #if !ENABLE_FEATURE_FANCY_ECHO
         enum {
-                eflag = '\\',
+                eflag = 0,  /* 0 -- disable escape sequences */
                 nflag = 1,  /* 1 -- print '\n' */
         };
 
diff --git a/coreutils/sync.c b/coreutils/sync.c
index 7d98a1e30..974e90452 100644
--- a/coreutils/sync.c
+++ b/coreutils/sync.c
@@ -3,16 +3,39 @@
  * Mini sync implementation for busybox
  *
  * Copyright (C) 1995, 1996 by Bruce Perens <bruce@pixar.com>.
+ * Copyright (C) 2015 by Ari Sundholm <ari@tuxera.com>
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
+//config:config SYNC
+//config:       bool "sync"
+//config:       default y
+//config:       help
+//config:         sync is used to flush filesystem buffers.
+//config:config FEATURE_SYNC_FANCY
+//config:       bool "Enable -d and -f flags (requres syncfs(2) in libc)"
+//config:       default y
+//config:       depends on SYNC
+//config:       help
+//config:         sync -d FILE... executes fdatasync() on each FILE.
+//config:         sync -f FILE... executes syncfs() on each FILE.
+
+//kbuild:lib-$(CONFIG_SYNC) += sync.o
+//applet:IF_SYNC(APPLET_NOFORK(sync, sync, BB_DIR_BIN, BB_SUID_DROP, sync))
 
 //usage:#define sync_trivial_usage
-//usage:       ""
+//usage:       ""IF_FEATURE_SYNC_FANCY("[-df] [FILE]...")
 //usage:#define sync_full_usage "\n\n"
+//usage:    IF_NOT_FEATURE_SYNC_FANCY(
 //usage:       "Write all buffered blocks to disk"
+//usage:    )
+//usage:    IF_FEATURE_SYNC_FANCY(
+//usage:       "Write all buffered blocks (in FILEs) to disk"
+//usage:     "\n        -d      Avoid syncing metadata"
+//usage:     "\n        -f      Sync filesystems underlying FILEs"
+//usage:    )
 
 #include "libbb.h"
 
@@ -21,10 +44,59 @@
 int sync_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int sync_main(int argc UNUSED_PARAM, char **argv IF_NOT_DESKTOP(UNUSED_PARAM))
 {
+#if !ENABLE_FEATURE_SYNC_FANCY
         /* coreutils-6.9 compat */
         bb_warn_ignoring_args(argv[1]);
-
         sync();
-
         return EXIT_SUCCESS;
+#else
+        unsigned opts;
+        int ret = EXIT_SUCCESS;
+
+        enum {
+                OPT_DATASYNC = (1 << 0),
+                OPT_SYNCFS   = (1 << 1),
+        };
+
+        opt_complementary = "d--f:f--d";
+        opts = getopt32(argv, "df");
+        argv += optind;
+
+        /* Handle the no-argument case. */
+        if (!argv[0])
+                sync();
+
+        while (*argv) {
+                int fd = open_or_warn(*argv, O_RDONLY);
+
+                if (fd < 0) {
+                        ret = EXIT_FAILURE;
+                        goto next;
+                }
+                if (opts & OPT_DATASYNC) {
+                        if (fdatasync(fd))
+                                goto err;
+                        goto do_close;
+                }
+                if (opts & OPT_SYNCFS) {
+                        /*
+                         * syncfs is documented to only fail with EBADF,
+                         * which can't happen here. So, no error checks.
+                         */
+                        syncfs(fd);
+                        goto do_close;
+                }
+                if (fsync(fd)) {
+ err:
+                        bb_simple_perror_msg(*argv);
+                        ret = EXIT_FAILURE;
+                }
+ do_close:
+                close(fd);
+ next:
+                ++argv;
+        }
+
+        return ret;
+#endif
 }
diff --git a/coreutils/uname.c b/coreutils/uname.c
index 56d985eb0..fd677d27c 100644
--- a/coreutils/uname.c
+++ b/coreutils/uname.c
@@ -70,17 +70,11 @@
 /* After libbb.h, since it needs sys/types.h on some systems */
 #include <sys/utsname.h>
 
-#if ENABLE_PLATFORM_MINGW32
-# define OSNAME "MS/Windows"
-#else
-# define OSNAME "GNU/Linux"
-#endif
-
 typedef struct {
         struct utsname name;
         char processor[sizeof(((struct utsname*)NULL)->machine)];
         char platform[sizeof(((struct utsname*)NULL)->machine)];
-        char os[sizeof(OSNAME)];
+        char os[sizeof(CONFIG_UNAME_OSNAME)];
 } uname_info_t;
 
 static const char options[] ALIGN1 = "snrvmpioa";
@@ -147,7 +141,7 @@ int uname_main(int argc UNUSED_PARAM, char **argv)
 #endif
         strcpy(uname_info.processor, unknown_str);
         strcpy(uname_info.platform, unknown_str);
-        strcpy(uname_info.os, OSNAME);
+        strcpy(uname_info.os, CONFIG_UNAME_OSNAME);
 #if 0
         /* Fedora does something like this */
         strcpy(uname_info.processor, uname_info.name.machine);