Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/debianutils/pipe_progress.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/debianutils/pipe_progress.c (modified) (2 diffs)

branches/2.2.9/mindi-busybox/debianutils/pipe_progress.c

@@ -5 +5 @@
  * Copyright (C) 2003 by Rob Landley <rob@landley.net>, Joey Hess
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 #include "libbb.h"
 
@@ -15 +14 @@
  * Activity is indicated by a '.' to stderr
  */
-int pipe_progress_main(int argc, char **argv);
-int pipe_progress_main(int argc, char **argv)
+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);
+            bb_putchar_stderr('.');
         }
-        fwrite(buf, len, 1, stdout);
+        full_write(STDOUT_FILENO, buf, len);
     }
 
-    fputc('\n', stderr);
-
-    if (ENABLE_FEATURE_CLEAN_UP)
-        RELEASE_CONFIG_BUFFER(buf);
+    bb_putchar_stderr('\n');
 
     return 0;