- (dtucker) [openbsd-compat/setproctitle.c] Ensure SPT_TYPE is defined before

[openssh.git] / progressmeter.c

diff --git a/progressmeter.c b/progressmeter.c
index 343e1b7d52cc8121e2891f874d393acbb52e1f58..a3f14c929408432db5ac3ae84cc4c1511137bbbc 100644 (file)
--- a/progressmeter.c
+++ b/progressmeter.c
@@ -64,7 +64,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: progressmeter.c,v 1.6 2003/04/07 21:58:05 millert Exp $");
+RCSID("$OpenBSD: progressmeter.c,v 1.7 2003/06/10 22:20:52 deraadt Exp $");
 
 #ifdef HAVE_LIBGEN_H
 #include <libgen.h>
@@ -72,6 +72,7 @@ RCSID("$OpenBSD: progressmeter.c,v 1.6 2003/04/07 21:58:05 millert Exp $");
 
 #include "atomicio.h"
 #include "progressmeter.h"
+#include "misc.h"
 
 /* Number of seconds before xfer considered "stalled". */
 #define STALLTIME      5
@@ -121,12 +122,12 @@ start_progress_meter(char *file, off_t filesize, off_t *counter)
        lastsize = 0;
 
        draw_progress_meter();
-       signal(SIGALRM, update_progress_meter);
+       mysignal(SIGALRM, update_progress_meter);
        alarm(PROGRESSTIME);
 }
 
 void
-stop_progress_meter()
+stop_progress_meter(void)
 {
        alarm(0);
        draw_progress_meter();
@@ -140,7 +141,7 @@ update_progress_meter(int ignore)
        int save_errno = errno;
 
        draw_progress_meter();
-       signal(SIGALRM, update_progress_meter);
+       mysignal(SIGALRM, update_progress_meter);
        alarm(PROGRESSTIME);
        errno = save_errno;
 }
@@ -164,7 +165,7 @@ foregroundproc(void)
 }
 
 static void
-draw_progress_meter()
+draw_progress_meter(void)
 {
        static const char spaces[] = "                          "
            "                                                   "