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 8ef52dc2..fecaef33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,10 @@
- markus@cvs.openbsd.org 2003/08/29 10:04:36
[channels.c nchan.c]
be less chatty; debug -> debug2, cleanup; ok henning@
+ - markus@cvs.openbsd.org 2003/08/31 10:26:04
+ [progressmeter.c]
+ pass file_size + 1 to snprintf: fixes printing of truncated
+ file names; fix based on patch/report from sturm@;
20030829
- (bal) openbsd-compat/ clean up. Considate headers, add in Id on our
@@ -930,4 +934,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.2923 2003/09/02 12:52:31 djm Exp $
+$Id: ChangeLog,v 1.2924 2003/09/02 12:53:01 djm Exp $
diff --git a/progressmeter.c b/progressmeter.c
index 9fe8cfa4..9d5b42a2 100644
--- a/progressmeter.c
+++ b/progressmeter.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: progressmeter.c,v 1.13 2003/07/31 22:34:03 markus Exp $");
+RCSID("$OpenBSD: progressmeter.c,v 1.14 2003/08/31 10:26:04 markus Exp $");
#include "progressmeter.h"
#include "atomicio.h"
@@ -140,7 +140,7 @@ refresh_progress_meter(void)
buf[0] = '\0';
file_len = win_size - 35;
if (file_len > 0) {
- len = snprintf(buf, file_len, "\r%s", file);
+ len = snprintf(buf, file_len + 1, "\r%s", file);
for (i = len; i < file_len; i++ )
buf[i] = ' ';
buf[file_len] = '\0';