RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-02-17 06:16:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2001/05/06 21:45:14

Browse Source 
[clientloop.c]
     use atomicio for flushing stdout/stderr bufs. thanks to
     jbw@izanami.cee.hw.ac.uk
This commit is contained in:
Ben Lindstrom 2001-05-08 23:58:37 +00:00
parent 72af2ef8db
commit 23fedf5e49
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -11,6 +11,10 @@
- mouring@cvs.openbsd.org 2001/05/08 19:45:25 - mouring@cvs.openbsd.org 2001/05/08 19:45:25
[misc.c misc.h scp.c sftp.c] [misc.c misc.h scp.c sftp.c]
Use addargs() in sftp plus some clean up of addargs(). OK Markus Use addargs() in sftp plus some clean up of addargs(). OK Markus
- markus@cvs.openbsd.org 2001/05/06 21:45:14
[clientloop.c]
use atomicio for flushing stdout/stderr bufs. thanks to
jbw@izanami.cee.hw.ac.uk
- (bal) UseLogin patch for Solaris/UNICOS. Patch by Wayne Davison - (bal) UseLogin patch for Solaris/UNICOS. Patch by Wayne Davison
<wayne@blorf.net> <wayne@blorf.net>
- (bal) ./configure support to disable SIA on OSF1. Patch by - (bal) ./configure support to disable SIA on OSF1. Patch by
@ -5375,4 +5379,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1210 2001/05/08 20:42:28 mouring Exp $ $Id: ChangeLog,v 1.1211 2001/05/08 23:58:37 mouring Exp $

18
clientloop.c
View File

@ -59,7 +59,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: clientloop.c,v 1.67 2001/05/04 23:47:34 markus Exp $"); RCSID("$OpenBSD: clientloop.c,v 1.68 2001/05/06 21:45:14 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"
@ -936,25 +936,21 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
buffer_append(&stderr_buffer, buf, strlen(buf)); buffer_append(&stderr_buffer, buf, strlen(buf));
} }
/* Output any buffered data for stdout. */ /* Output any buffered data for stdout. */
while (buffer_len(&stdout_buffer) > 0) { if (buffer_len(&stdout_buffer) > 0) {
len = write(fileno(stdout), buffer_ptr(&stdout_buffer), len = atomicio(write, fileno(stdout), buffer_ptr(&stdout_buffer),
buffer_len(&stdout_buffer)); buffer_len(&stdout_buffer));
if (len <= 0) { if (len != buffer_len(&stdout_buffer))
error("Write failed flushing stdout buffer."); error("Write failed flushing stdout buffer.");
break;
}
buffer_consume(&stdout_buffer, len); buffer_consume(&stdout_buffer, len);
stdout_bytes += len; stdout_bytes += len;
} }
/* Output any buffered data for stderr. */ /* Output any buffered data for stderr. */
while (buffer_len(&stderr_buffer) > 0) { if (buffer_len(&stderr_buffer) > 0) {
len = write(fileno(stderr), buffer_ptr(&stderr_buffer), len = atomicio(write, fileno(stderr), buffer_ptr(&stderr_buffer),
buffer_len(&stderr_buffer)); buffer_len(&stderr_buffer));
if (len <= 0) { if (len != buffer_len(&stderr_buffer))
error("Write failed flushing stderr buffer."); error("Write failed flushing stderr buffer.");
break;
}
buffer_consume(&stderr_buffer, len); buffer_consume(&stderr_buffer, len);
stderr_bytes += len; stderr_bytes += len;
} }