summaryrefslogtreecommitdiff
path: root/progressmeter.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-07-03 13:46:56 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-07-03 13:46:56 +1000
commit9f63f22aa0ab13673f197642a66a98b09a18abd0 (patch)
treed0d0ef1e3802a533d3a935f87de175e9ea010cea /progressmeter.c
parente53270481c279cb50cf31bc83dc6c91835f9a524 (diff)
- deraadt@cvs.openbsd.org 2003/06/28 16:23:06
[atomicio.c atomicio.h authfd.c clientloop.c monitor_wrap.c msg.c progressmeter.c scp.c sftp-client.c ssh-keyscan.c ssh.h sshconnect.c sshd.c] deal with typing of write vs read in atomicio
Diffstat (limited to 'progressmeter.c')
-rw-r--r--progressmeter.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/progressmeter.c b/progressmeter.c
index a3f14c929..6aa225adf 100644
--- a/progressmeter.c
+++ b/progressmeter.c
@@ -64,7 +64,7 @@
64 */ 64 */
65 65
66#include "includes.h" 66#include "includes.h"
67RCSID("$OpenBSD: progressmeter.c,v 1.7 2003/06/10 22:20:52 deraadt Exp $"); 67RCSID("$OpenBSD: progressmeter.c,v 1.8 2003/06/28 16:23:06 deraadt Exp $");
68 68
69#ifdef HAVE_LIBGEN_H 69#ifdef HAVE_LIBGEN_H
70#include <libgen.h> 70#include <libgen.h>
@@ -132,7 +132,7 @@ stop_progress_meter(void)
132 alarm(0); 132 alarm(0);
133 draw_progress_meter(); 133 draw_progress_meter();
134 if (foregroundproc() != 0) 134 if (foregroundproc() != 0)
135 atomicio(write, fileno(stdout), "\n", 1); 135 atomicio(vwrite, fileno(stdout), "\n", 1);
136} 136}
137 137
138static void 138static void
@@ -255,7 +255,7 @@ draw_progress_meter(void)
255 "%02d:%02d%s", i / 60, i % 60, 255 "%02d:%02d%s", i / 60, i % 60,
256 (cursize != totalbytes) ? " ETA" : " "); 256 (cursize != totalbytes) ? " ETA" : " ");
257 } 257 }
258 atomicio(write, fileno(stdout), buf, strlen(buf)); 258 atomicio(vwrite, fileno(stdout), buf, strlen(buf));
259} 259}
260 260
261static int 261static int