From: djm <djm>
Date: Tue, 2 Sep 2003 12:53:32 +0000 (+0000)
Subject:    - markus@cvs.openbsd.org 2003/08/31 12:14:22
X-Git-Tag: V_3_7_P1~76
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/3845a9acdc74a0b77d36bf4532617b2b07a53266?hp=8e38294906babe7e222e1be1e8f06279952e8d58

   - markus@cvs.openbsd.org 2003/08/31 12:14:22
     [progressmeter.c]
     do write to buf[-1]
---

diff --git a/ChangeLog b/ChangeLog
index 2777bfba..6ab1ffa2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@
      [progressmeter.c]
      pass file_size + 1 to snprintf: fixes printing of truncated
      file names; fix based on patch/report from sturm@;
+   - markus@cvs.openbsd.org 2003/08/31 12:14:22
+     [progressmeter.c]
+     do write to buf[-1]
 
 20030829
  - (bal) openbsd-compat/ clean up.  Considate headers, add in Id on our
diff --git a/progressmeter.c b/progressmeter.c
index 9d5b42a2..c315464e 100644
--- a/progressmeter.c
+++ b/progressmeter.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: progressmeter.c,v 1.14 2003/08/31 10:26:04 markus Exp $");
+RCSID("$OpenBSD: progressmeter.c,v 1.15 2003/08/31 12:14:22 markus Exp $");
 
 #include "progressmeter.h"
 #include "atomicio.h"
@@ -141,6 +141,8 @@ refresh_progress_meter(void)
 	file_len = win_size - 35;
 	if (file_len > 0) {
 		len = snprintf(buf, file_len + 1, "\r%s", file);
+		if (len < 0)
+			len = 0;
 		for (i = len;  i < file_len; i++ )
 			buf[i] = ' ';
 		buf[file_len] = '\0';