bc: convert to "G trick" - this returns bc to zero bss increase

[oweals/busybox.git] / debianutils / pipe_progress.c

diff --git a/debianutils/pipe_progress.c b/debianutils/pipe_progress.c
index ab05202ebd45a397c70209b70ce01b2456a04b67..e6b7601faee7199d6358ec4842797303775d5fb6 100644 (file)
--- a/debianutils/pipe_progress.c
+++ b/debianutils/pipe_progress.c
@@ -1,55 +1,48 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Monitor a pipe with a simple progress display.
  *
  * Copyright (C) 2003 by Rob Landley <rob@landley.net>, Joey Hess
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+//config:config PIPE_PROGRESS
+//config:      bool "pipe_progress (225 bytes)"
+//config:      default y
+//config:      help
+//config:      Display a dot to indicate pipe activity.
+
+//applet:IF_PIPE_PROGRESS(APPLET(pipe_progress, BB_DIR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_PIPE_PROGRESS) += pipe_progress.o
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <time.h>
+//usage:#define pipe_progress_trivial_usage NOUSAGE_STR
+//usage:#define pipe_progress_full_usage ""
 
-#include "busybox.h"
+#include "libbb.h"
 
 #define PIPE_PROGRESS_SIZE 4096
 
-/*     Read a block of data from stdin, write it to stdout.
- *  Activity is indicated by a '.' to stderr
+/* Read a block of data from stdin, write it to stdout.
+ * Activity is indicated by a '.' to stderr
  */
-extern 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);
+       bb_putchar_stderr('\n');
 
-#ifdef CONFIG_FEATURE_CLEAN_UP
-       RELEASE_CONFIG_BUFFER(buf);
-#endif
        return 0;
 }