diff options
| author | Damien Miller <djm@mindrot.org> | 1999-12-07 15:38:31 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 1999-12-07 15:38:31 +1100 |
| commit | 037a0dc0835bb5a442bdcbeecdd5baed723f0b45 (patch) | |
| tree | d02954d57ac437fd036e3e9544f24559ca8f0f0f /serverloop.c | |
| parent | eabf3417bc73ca9546a3ed489cd809ffdf303853 (diff) | |
- Merged more OpenBSD changes:
- [atomicio.c authfd.c scp.c serverloop.c ssh.h sshconnect.c sshd.c]
move atomicio into it's own file. wrap all socket write()s which
were doing write(sock, buf, len) != len, with atomicio() calls.
- [auth-skey.c]
fd leak
- [authfile.c]
properly name fd variable
- [channels.c]
display great hatred towards strcpy
- [pty.c pty.h sshd.c]
use openpty() if it exists (it does on BSD4_4)
- [tildexpand.c]
check for ~ expansion past MAXPATHLEN
- Modified helper.c to use new atomicio function.
- Reformat Makefile a little
- Moved RC4 routines from rc4.[ch] into helper.c
- Added autoconf code to detect /dev/ptmx (Solaris) and /dev/ptc (AIX)
Diffstat (limited to 'serverloop.c')
| -rw-r--r-- | serverloop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/serverloop.c b/serverloop.c index 94c21157..a5ecfe97 100644 --- a/serverloop.c +++ b/serverloop.c @@ -170,7 +170,7 @@ make_packets_from_stderr_data() /* Send buffered stderr data to the client. */ while (buffer_len(&stderr_buffer) > 0 && - packet_not_very_much_data_to_write()) { + packet_not_very_much_data_to_write()) { len = buffer_len(&stderr_buffer); if (packet_is_interactive()) { if (len > 512) @@ -199,7 +199,7 @@ make_packets_from_stdout_data() /* Send buffered stdout data to the client. */ while (buffer_len(&stdout_buffer) > 0 && - packet_not_very_much_data_to_write()) { + packet_not_very_much_data_to_write()) { len = buffer_len(&stdout_buffer); if (packet_is_interactive()) { if (len > 512) @@ -364,7 +364,7 @@ process_output(fd_set * writeset) /* Write buffered data to program stdin. */ if (fdin != -1 && FD_ISSET(fdin, writeset)) { len = write(fdin, buffer_ptr(&stdin_buffer), - buffer_len(&stdin_buffer)); + buffer_len(&stdin_buffer)); if (len <= 0) { #ifdef USE_PIPES close(fdin); |