===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/progressmeter.c,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -u -r1.24 -r1.24.2.1
--- src/usr.bin/ssh/progressmeter.c	2005/06/07 13:25:23	1.24
+++ src/usr.bin/ssh/progressmeter.c	2006/10/06 03:19:33	1.24.2.1
@@ -1,3 +1,4 @@
+/* $OpenBSD: progressmeter.c,v 1.24.2.1 2006/10/06 03:19:33 brad Exp $ */
 /*
  * Copyright (c) 2003 Nils Nordman.  All rights reserved.
  *
@@ -22,9 +23,17 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "includes.h"
-RCSID("$OpenBSD: progressmeter.c,v 1.24 2005/06/07 13:25:23 jaredy Exp $");
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/uio.h>
 
+#include <errno.h>
+#include <signal.h>
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+
 #include "progressmeter.h"
 #include "atomicio.h"
 
@@ -153,7 +162,7 @@
 			len = 0;
 		if (len >= file_len + 1)
 			len = file_len;
-		for (i = len;  i < file_len; i++ )
+		for (i = len; i < file_len; i++)
 			buf[i] = ' ';
 		buf[file_len] = '\0';
 	}
@@ -214,6 +223,7 @@
 	last_update = now;
 }
 
+/*ARGSUSED*/
 static void
 update_progress_meter(int ignore)
 {
@@ -268,6 +278,7 @@
 	atomicio(vwrite, STDOUT_FILENO, "\n", 1);
 }
 
+/*ARGSUSED*/
 static void
 sig_winch(int sig)
 {