summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-09-02 22:53:32 +1000
committerDamien Miller <djm@mindrot.org>2003-09-02 22:53:32 +1000
commitb5829f56eba3a3d8a1cad944c84e9468eefc732c (patch)
tree2bbaabd5872ab58c2fafd208ca046e6c3abc2114
parent17af176302916a5f97174063773a173a324fe093 (diff)
- markus@cvs.openbsd.org 2003/08/31 12:14:22
[progressmeter.c] do write to buf[-1]
-rw-r--r--ChangeLog5
-rw-r--r--progressmeter.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index fecaef335..79db1a5ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@
19 [progressmeter.c] 19 [progressmeter.c]
20 pass file_size + 1 to snprintf: fixes printing of truncated 20 pass file_size + 1 to snprintf: fixes printing of truncated
21 file names; fix based on patch/report from sturm@; 21 file names; fix based on patch/report from sturm@;
22 - markus@cvs.openbsd.org 2003/08/31 12:14:22
23 [progressmeter.c]
24 do write to buf[-1]
22 25
2320030829 2620030829
24 - (bal) openbsd-compat/ clean up. Considate headers, add in Id on our 27 - (bal) openbsd-compat/ clean up. Considate headers, add in Id on our
@@ -934,4 +937,4 @@
934 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 937 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
935 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 938 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
936 939
937$Id: ChangeLog,v 1.2924 2003/09/02 12:53:01 djm Exp $ 940$Id: ChangeLog,v 1.2925 2003/09/02 12:53:32 djm Exp $
diff --git a/progressmeter.c b/progressmeter.c
index 9d5b42a20..c315464ee 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.14 2003/08/31 10:26:04 markus Exp $"); 26RCSID("$OpenBSD: progressmeter.c,v 1.15 2003/08/31 12:14:22 markus Exp $");
27 27
28#include "progressmeter.h" 28#include "progressmeter.h"
29#include "atomicio.h" 29#include "atomicio.h"
@@ -141,6 +141,8 @@ refresh_progress_meter(void)
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 + 1, "\r%s", file); 143 len = snprintf(buf, file_len + 1, "\r%s", file);
144 if (len < 0)
145 len = 0;
144 for (i = len; i < file_len; i++ ) 146 for (i = len; i < file_len; i++ )
145 buf[i] = ' '; 147 buf[i] = ' ';
146 buf[file_len] = '\0'; 148 buf[file_len] = '\0';