Merge branch 'busybox' into merge

2 files changed, 70 insertions, 92 deletions

diff --git a/coreutils/fsync.c b/coreutils/fsync.c
deleted file mode 100644
index c7cba9f61..000000000
--- a/coreutils/fsync.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * Mini fsync implementation for busybox
- *
- * Copyright (C) 2008 Nokia Corporation. All rights reserved.
- *
- * Licensed under GPLv2 or later, see file LICENSE in this source tree.
- */
-//config:config FSYNC
-//config:       bool "fsync (3.6 kb)"
-//config:       default y
-//config:       help
-//config:       fsync is used to flush file-related cached blocks to disk.
-
-//applet:IF_FSYNC(APPLET_NOFORK(fsync, fsync, BB_DIR_BIN, BB_SUID_DROP, fsync))
-
-//kbuild:lib-$(CONFIG_FSYNC) += fsync.o
-
-//usage:#define fsync_trivial_usage
-//usage:       "[-d] FILE..."
-//usage:#define fsync_full_usage "\n\n"
-//usage:       "Write files' buffered blocks to disk\n"
-//usage:     "\n        -d      Avoid syncing metadata"
-
-#include "libbb.h"
-#ifndef O_NOATIME
-# define O_NOATIME 0
-#endif
-
-/* This is a NOFORK applet. Be very careful! */
-
-int fsync_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int fsync_main(int argc UNUSED_PARAM, char **argv)
-{
-        int status;
-        int opts;
-
-        opts = getopt32(argv, "d"); /* fdatasync */
-        argv += optind;
-        if (!*argv) {
-                bb_show_usage();
-        }
-
-        status = EXIT_SUCCESS;
-        do {
-                int fd = open_or_warn(*argv, O_NOATIME | O_NOCTTY | O_RDONLY);
-
-                if (fd == -1) {
-                        status = EXIT_FAILURE;
-                        continue;
-                }
-                if ((opts ? fdatasync(fd) : fsync(fd))) {
-                        //status = EXIT_FAILURE; - do we want this?
-                        bb_simple_perror_msg(*argv);
-                }
-                close(fd);
-        } while (*++argv);
-
-        return status;
-}
diff --git a/coreutils/sync.c b/coreutils/sync.c
index b93476aee..ea328a54c 100644
--- a/coreutils/sync.c
+++ b/coreutils/sync.c
@@ -20,6 +20,7 @@
 //config:       sync -d FILE... executes fdatasync() on each FILE.
 //config:       sync -f FILE... executes syncfs() on each FILE.
 
+//               APPLET_NOFORK:name  main  location    suid_type     help
 //applet:IF_SYNC(APPLET_NOFORK(sync, sync, BB_DIR_BIN, BB_SUID_DROP, sync))
 
 //kbuild:lib-$(CONFIG_SYNC) += sync.o
@@ -42,61 +43,98 @@
 
 /* This is a NOFORK applet. Be very careful! */
 
-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 || ENABLE_FSYNC
+static int sync_common(int opts, char **argv)
 {
-#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;
-
+        int ret;
         enum {
                 OPT_DATASYNC = (1 << 0),
                 OPT_SYNCFS   = (1 << 1),
         };
 
-        opts = getopt32(argv, "^" "df" "\0" "d--f:f--d");
-        argv += optind;
-
-        /* Handle the no-argument case. */
-        if (!argv[0])
-                sync();
-
-        while (*argv) {
-                int fd = open_or_warn(*argv, O_RDONLY);
+        ret = EXIT_SUCCESS;
+        do {
+                /* GNU "sync FILE" uses O_NONBLOCK open */
+                int fd = open_or_warn(*argv, /*O_NOATIME |*/ O_NOCTTY | O_RDONLY | O_NONBLOCK);
+                /* open(NOATIME) can only be used by owner or root, don't use NOATIME here */
 
                 if (fd < 0) {
                         ret = EXIT_FAILURE;
                         goto next;
                 }
-                if (opts & OPT_DATASYNC) {
-                        if (fdatasync(fd))
-                                goto err;
-                        goto do_close;
-                }
+# if ENABLE_FEATURE_SYNC_FANCY
                 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:
+                } else
+# endif
+                if (((opts & OPT_DATASYNC) ? fdatasync(fd) : fsync(fd)) != 0) {
                         bb_simple_perror_msg(*argv);
                         ret = EXIT_FAILURE;
                 }
- do_close:
                 close(fd);
  next:
-                ++argv;
-        }
+                argv++;
+        } while (*argv);
 
         return ret;
+}
+#endif
+
+#if ENABLE_SYNC
+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 = getopt32(argv, "^" "df" "\0" "d--f:f--d");
+        argv += optind;
+        if (!argv[0]) {
+                sync();
+                return EXIT_SUCCESS;
+        }
+        return sync_common(opts, argv);
+# endif
+}
 #endif
+
+/*
+ * Mini fsync implementation for busybox
+ *
+ * Copyright (C) 2008 Nokia Corporation. All rights reserved.
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+//config:config FSYNC
+//config:       bool "fsync (3.6 kb)"
+//config:       default y
+//config:       help
+//config:       fsync is used to flush file-related cached blocks to disk.
+
+//                APPLET_NOFORK:name   main   location    suid_type     help
+//applet:IF_FSYNC(APPLET_NOFORK(fsync, fsync, BB_DIR_BIN, BB_SUID_DROP, fsync))
+
+//kbuild:lib-$(CONFIG_FSYNC) += sync.o
+
+//usage:#define fsync_trivial_usage
+//usage:       "[-d] FILE..."
+//usage:#define fsync_full_usage "\n\n"
+//usage:       "Write all buffered blocks in FILEs to disk\n"
+//usage:     "\n        -d      Avoid syncing metadata"
+
+#if ENABLE_FSYNC
+int fsync_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int fsync_main(int argc UNUSED_PARAM, char **argv)
+{
+        int opts = getopt32(argv, "^" "d" "\0" "-1"/*min 1 arg*/);
+        argv += optind;
+        return sync_common(opts, argv);
 }
+#endif