emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pipe_progress: shrink

Browse Source 
function                                             old     new   delta
pipe_progress_main                                   163     151     -12

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-06-06 18:19:25 +02:00
parent 8aab0c95be
commit 5f3303712e
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
debianutils/pipe_progress.c
View File

@ -6,7 +6,6 @@
* *
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details. * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/ */
#include "libbb.h" #include "libbb.h"
#define PIPE_PROGRESS_SIZE 4096 #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, char **argv) MAIN_EXTERNALLY_VISIBLE;
int pipe_progress_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) 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); 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); time_t new_time = time(NULL);
if (new_time != t) { if (new_time != t) {
t = new_time; t = new_time;
fputc('.', stderr); fputc('.', stderr);
} }
fwrite(buf, len, 1, stdout); full_write(STDOUT_FILENO, buf, len);
} }
fputc('\n', stderr); fputc('\n', stderr);
if (ENABLE_FEATURE_CLEAN_UP)
RELEASE_CONFIG_BUFFER(buf);
return 0; return 0;
} }