[progressmeter.c]
     pass file_size + 1 to snprintf: fixes printing of truncated
     file names; fix based on patch/report from sturm@;
This commit is contained in:
Damien Miller 2003-09-02 22:53:01 +10:00
parent fbdeecef92
commit 17af176302
2 changed files with 7 additions and 3 deletions

View File

@ -15,6 +15,10 @@
- markus@cvs.openbsd.org 2003/08/29 10:04:36 - markus@cvs.openbsd.org 2003/08/29 10:04:36
[channels.c nchan.c] [channels.c nchan.c]
be less chatty; debug -> debug2, cleanup; ok henning@ 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 20030829
- (bal) openbsd-compat/ clean up. Considate headers, add in Id on our - (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. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au 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 $

View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #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 "progressmeter.h"
#include "atomicio.h" #include "atomicio.h"
@ -140,7 +140,7 @@ refresh_progress_meter(void)
buf[0] = '\0'; buf[0] = '\0';
file_len = win_size - 35; file_len = win_size - 35;
if (file_len > 0) { 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++ ) for (i = len; i < file_len; i++ )
buf[i] = ' '; buf[i] = ' ';
buf[file_len] = '\0'; buf[file_len] = '\0';