===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/progressmeter.c,v
retrieving revision 1.22.4.1
retrieving revision 1.23
diff -u -r1.22.4.1 -r1.23
--- src/usr.bin/ssh/progressmeter.c	2005/09/04 18:40:02	1.22.4.1
+++ src/usr.bin/ssh/progressmeter.c	2005/04/28 10:17:56	1.23
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: progressmeter.c,v 1.22.4.1 2005/09/04 18:40:02 brad Exp $");
+RCSID("$OpenBSD: progressmeter.c,v 1.23 2005/04/28 10:17:56 moritz Exp $");
 
 #include "progressmeter.h"
 #include "atomicio.h"
@@ -41,10 +41,6 @@
 static void format_size(char *, int, off_t);
 static void format_rate(char *, int, off_t);
 
-/* window resizing */
-static void sig_winch(int);
-static void setscreensize(void);
-
 /* updates the progressmeter to reflect the current state of the transfer */
 void refresh_progress_meter(void);
 
@@ -60,7 +56,6 @@
 static long stalled;		/* how long we have been stalled */
 static int bytes_per_second;	/* current speed in bytes per second */
 static int win_size;		/* terminal window size */
-static volatile sig_atomic_t win_resized; /* for window resizing */
 
 /* units for format_size */
 static const char unit[] = " KMGT";
@@ -221,10 +216,6 @@
 
 	save_errno = errno;
 
-	if (win_resized) {
-		setscreensize();
-		win_resized = 0;
-	}
 	if (can_output())
 		refresh_progress_meter();
 
@@ -236,6 +227,8 @@
 void
 start_progress_meter(char *f, off_t filesize, off_t *ctr)
 {
+	struct winsize winsize;
+
 	start = last_update = time(NULL);
 	file = f;
 	end_pos = filesize;
@@ -244,12 +237,20 @@
 	stalled = 0;
 	bytes_per_second = 0;
 
-	setscreensize();
+	if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &winsize) != -1 &&
+	    winsize.ws_col != 0) {
+		if (winsize.ws_col > MAX_WINSIZE)
+			win_size = MAX_WINSIZE;
+		else
+			win_size = winsize.ws_col;
+	} else
+		win_size = DEFAULT_WINSIZE;
+	win_size += 1;					/* trailing \0 */
+
 	if (can_output())
 		refresh_progress_meter();
 
 	signal(SIGALRM, update_progress_meter);
-	signal(SIGWINCH, sig_winch);
 	alarm(UPDATE_INTERVAL);
 }
 
@@ -266,26 +267,4 @@
 		refresh_progress_meter();
 
 	atomicio(vwrite, STDOUT_FILENO, "\n", 1);
-}
-
-static void
-sig_winch(int sig)
-{
-	win_resized = 1;
-}
-
-static void
-setscreensize(void)
-{
-	struct winsize winsize;
-
-	if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &winsize) != -1 &&
-	    winsize.ws_col != 0) {
-		if (winsize.ws_col > MAX_WINSIZE)
-			win_size = MAX_WINSIZE;
-		else
-			win_size = winsize.ws_col;
-	} else
-		win_size = DEFAULT_WINSIZE;
-	win_size += 1;					/* trailing \0 */
 }