summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-06-06 16:19:25 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2010-06-06 16:19:25 (GMT)
commit5f3303712ef483d270097cae4ba0a559b1056121 (patch)
treeb2605d84dc30d7c61fe14dc2ad14e996c09cddee
parent8aab0c95be4b2b3277b1a44d53c996c26bdd5ff5 (diff)
downloadbusybox-5f3303712ef483d270097cae4ba0a559b1056121.tar.gz
busybox-5f3303712ef483d270097cae4ba0a559b1056121.tar.bz2
pipe_progress: shrink
function old new delta pipe_progress_main 163 151 -12 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--debianutils/pipe_progress.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/debianutils/pipe_progress.c b/debianutils/pipe_progress.c
index fa98e8b..ced5fb3 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;
}