summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--progressmeter.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ef52dc25..fecaef335 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,10 @@
15 - markus@cvs.openbsd.org 2003/08/29 10:04:36 15 - markus@cvs.openbsd.org 2003/08/29 10:04:36
16 [channels.c nchan.c] 16 [channels.c nchan.c]
17 be less chatty; debug -> debug2, cleanup; ok henning@ 17 be less chatty; debug -> debug2, cleanup; ok henning@
18 - markus@cvs.openbsd.org 2003/08/31 10:26:04
19 [progressmeter.c]
20 pass file_size + 1 to snprintf: fixes printing of truncated
21 file names; fix based on patch/report from sturm@;
18 22
1920030829 2320030829
20 - (bal) openbsd-compat/ clean up. Considate headers, add in Id on our 24 - (bal) openbsd-compat/ clean up. Considate headers, add in Id on our
@@ -930,4 +934,4 @@
930 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 934 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
931 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 935 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
932 936
933$Id: ChangeLog,v 1.2923 2003/09/02 12:52:31 djm Exp $ 937$Id: ChangeLog,v 1.2924 2003/09/02 12:53:01 djm Exp $
diff --git a/progressmeter.c b/progressmeter.c
index 9fe8cfa41..9d5b42a20 100644
--- a/progressmeter.c
+++ b/progressmeter.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: progressmeter.c,v 1.13 2003/07/31 22:34:03 markus Exp $"); 26RCSID("$OpenBSD: progressmeter.c,v 1.14 2003/08/31 10:26:04 markus Exp $");
27 27
28#include "progressmeter.h" 28#include "progressmeter.h"
29#include "atomicio.h" 29#include "atomicio.h"
@@ -140,7 +140,7 @@ refresh_progress_meter(void)
140 buf[0] = '\0'; 140 buf[0] = '\0';
141 file_len = win_size - 35; 141 file_len = win_size - 35;
142 if (file_len > 0) { 142 if (file_len > 0) {
143 len = snprintf(buf, file_len, "\r%s", file); 143 len = snprintf(buf, file_len + 1, "\r%s", file);
144 for (i = len; i < file_len; i++ ) 144 for (i = len; i < file_len; i++ )
145 buf[i] = ' '; 145 buf[i] = ' ';
146 buf[file_len] = '\0'; 146 buf[file_len] = '\0';