Merge branch 'origin/master' (early part)

3 files changed, 13 insertions, 17 deletions

diff --git a/debianutils/Config.in b/debianutils/Config.src
index 9146f3ef4..9bce0498c 100644
--- a/debianutils/Config.in
+++ b/debianutils/Config.src
@@ -7,19 +7,19 @@ menu "Debian Utilities"
 
 config MKTEMP
         bool "mktemp"
-        default n
+        default y
         help
           mktemp is used to create unique temporary files
 
 config PIPE_PROGRESS
         bool "pipe_progress"
-        default n
+        default y
         help
           Display a dot to indicate pipe activity.
 
 config RUN_PARTS
         bool "run-parts"
-        default n
+        default y
         help
           run-parts is a utility designed to run all the scripts in a directory.
 
@@ -34,14 +34,14 @@ config RUN_PARTS
 
 config FEATURE_RUN_PARTS_LONG_OPTIONS
         bool "Enable long options"
-        default n
+        default y
         depends on RUN_PARTS && LONG_OPTS
         help
           Support long options for the run-parts applet.
 
 config FEATURE_RUN_PARTS_FANCY
         bool "Support additional arguments"
-        default n
+        default y
         depends on RUN_PARTS
         help
           Support additional options:
@@ -50,7 +50,7 @@ config FEATURE_RUN_PARTS_FANCY
 
 config START_STOP_DAEMON
         bool "start-stop-daemon"
-        default n
+        default y
         help
           start-stop-daemon is used to control the creation and
           termination of system-level processes, usually the ones
@@ -58,7 +58,7 @@ config START_STOP_DAEMON
 
 config FEATURE_START_STOP_DAEMON_FANCY
         bool "Support additional arguments"
-        default n
+        default y
         depends on START_STOP_DAEMON
         help
           Support additional arguments.
@@ -68,14 +68,14 @@ config FEATURE_START_STOP_DAEMON_FANCY
 
 config FEATURE_START_STOP_DAEMON_LONG_OPTIONS
         bool "Enable long options"
-        default n
+        default y
         depends on START_STOP_DAEMON && LONG_OPTS
         help
           Support long options for the start-stop-daemon applet.
 
 config WHICH
         bool "which"
-        default n
+        default y
         help
           which is used to find programs in your PATH and
           print out their pathnames.
diff --git a/debianutils/Kbuild b/debianutils/Kbuild.src
index bcf6126ad..bcf6126ad 100644
--- a/debianutils/Kbuild
+++ b/debianutils/Kbuild.src
diff --git a/debianutils/pipe_progress.c b/debianutils/pipe_progress.c
index fa98e8b38..ced5fb307 100644
--- a/debianutils/pipe_progress.c
+++ b/debianutils/pipe_progress.c
@@ -6,7 +6,6 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
-
 #include "libbb.h"
 
 #define PIPE_PROGRESS_SIZE 4096
@@ -17,23 +16,20 @@
 int pipe_progress_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int pipe_progress_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
-        RESERVE_CONFIG_BUFFER(buf, PIPE_PROGRESS_SIZE);
+        char buf[PIPE_PROGRESS_SIZE];
         time_t t = time(NULL);
-        size_t len;
+        int len;
 
-        while ((len = fread(buf, 1, PIPE_PROGRESS_SIZE, stdin)) > 0) {
+        while ((len = safe_read(STDIN_FILENO, buf, PIPE_PROGRESS_SIZE)) > 0) {
                 time_t new_time = time(NULL);
                 if (new_time != t) {
                         t = new_time;
                         fputc('.', stderr);
                 }
-                fwrite(buf, len, 1, stdout);
+                full_write(STDOUT_FILENO, buf, len);
         }
 
         fputc('\n', stderr);
 
-        if (ENABLE_FEATURE_CLEAN_UP)
-                RELEASE_CONFIG_BUFFER(buf);
-
         return 0;
 }