diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-06-06 18:19:25 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-06-06 18:19:25 +0200 |
| commit | 5f3303712ef483d270097cae4ba0a559b1056121 (patch) | |
| tree | b2605d84dc30d7c61fe14dc2ad14e996c09cddee /debianutils | |
| parent | 8aab0c95be4b2b3277b1a44d53c996c26bdd5ff5 (diff) | |
| download | busybox-w32-5f3303712ef483d270097cae4ba0a559b1056121.tar.gz busybox-w32-5f3303712ef483d270097cae4ba0a559b1056121.tar.bz2 busybox-w32-5f3303712ef483d270097cae4ba0a559b1056121.zip | |
pipe_progress: shrink
function old new delta
pipe_progress_main 163 151 -12
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'debianutils')
| -rw-r--r-- | debianutils/pipe_progress.c | 12 |
1 files changed, 4 insertions, 8 deletions
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 @@ | |||
| 6 | * | 6 | * |
| 7 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 7 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
| 8 | */ | 8 | */ |
| 9 | |||
| 10 | #include "libbb.h" | 9 | #include "libbb.h" |
| 11 | 10 | ||
| 12 | #define PIPE_PROGRESS_SIZE 4096 | 11 | #define PIPE_PROGRESS_SIZE 4096 |
| @@ -17,23 +16,20 @@ | |||
| 17 | int pipe_progress_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 16 | int pipe_progress_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
| 18 | int pipe_progress_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) | 17 | int pipe_progress_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) |
| 19 | { | 18 | { |
| 20 | RESERVE_CONFIG_BUFFER(buf, PIPE_PROGRESS_SIZE); | 19 | char buf[PIPE_PROGRESS_SIZE]; |
| 21 | time_t t = time(NULL); | 20 | time_t t = time(NULL); |
| 22 | size_t len; | 21 | int len; |
| 23 | 22 | ||
| 24 | while ((len = fread(buf, 1, PIPE_PROGRESS_SIZE, stdin)) > 0) { | 23 | while ((len = safe_read(STDIN_FILENO, buf, PIPE_PROGRESS_SIZE)) > 0) { |
| 25 | time_t new_time = time(NULL); | 24 | time_t new_time = time(NULL); |
| 26 | if (new_time != t) { | 25 | if (new_time != t) { |
| 27 | t = new_time; | 26 | t = new_time; |
| 28 | fputc('.', stderr); | 27 | fputc('.', stderr); |
| 29 | } | 28 | } |
| 30 | fwrite(buf, len, 1, stdout); | 29 | full_write(STDOUT_FILENO, buf, len); |
| 31 | } | 30 | } |
| 32 | 31 | ||
| 33 | fputc('\n', stderr); | 32 | fputc('\n', stderr); |
| 34 | 33 | ||
| 35 | if (ENABLE_FEATURE_CLEAN_UP) | ||
| 36 | RELEASE_CONFIG_BUFFER(buf); | ||
| 37 | |||
| 38 | return 0; | 34 | return 0; |
| 39 | } | 35 | } |