Merge 4.2p1 to the trunk.

1 files changed, 36 insertions, 13 deletions

diff --git a/progressmeter.c b/progressmeter.c
index 93f5a3e62..3cda09061 100644
--- a/progressmeter.c
+++ b/progressmeter.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: progressmeter.c,v 1.22 2004/07/11 17:48:47 deraadt Exp $");
+RCSID("$OpenBSD: progressmeter.c,v 1.24 2005/06/07 13:25:23 jaredy Exp $");
 
 #include "progressmeter.h"
 #include "atomicio.h"
@@ -42,6 +42,10 @@ static int can_output(void);
 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);
 
@@ -57,6 +61,7 @@ static volatile off_t *counter;	/* progress counter */
 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";
@@ -147,6 +152,8 @@ refresh_progress_meter(void)
                 len = snprintf(buf, file_len + 1, "\r%s", file);
                 if (len < 0)
                         len = 0;
+                if (len >= file_len + 1)
+                        len = file_len;
                 for (i = len;  i < file_len; i++ )
                         buf[i] = ' ';
                 buf[file_len] = '\0';
@@ -215,6 +222,10 @@ update_progress_meter(int ignore)
 
         save_errno = errno;
 
+        if (win_resized) {
+                setscreensize();
+                win_resized = 0;
+        }
         if (can_output())
                 refresh_progress_meter();
 
@@ -226,8 +237,6 @@ update_progress_meter(int ignore)
 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;
@@ -236,20 +245,12 @@ start_progress_meter(char *f, off_t filesize, off_t *ctr)
         stalled = 0;
         bytes_per_second = 0;
 
-        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 */
-
+        setscreensize();
         if (can_output())
                 refresh_progress_meter();
 
         signal(SIGALRM, update_progress_meter);
+        signal(SIGWINCH, sig_winch);
         alarm(UPDATE_INTERVAL);
 }
 
@@ -267,3 +268,25 @@ stop_progress_meter(void)
 
         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 */
+}