diff options
| author | Damien Miller <djm@mindrot.org> | 2002-01-22 23:06:22 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2002-01-22 23:06:22 +1100 |
| commit | 7c31809c4ae41e03e0d393ee7f00667c6e728477 (patch) | |
| tree | 7b61e5c083e9fc110624cb46b628e1f71b648c1c /serverloop.c | |
| parent | 6e1057c2d79de5382efc53ceb3e1213cc273ca12 (diff) | |
| download | openssh-git-7c31809c4ae41e03e0d393ee7f00667c6e728477.tar.gz | |
- markus@cvs.openbsd.org 2001/12/21 12:17:33
[serverloop.c]
remove ifdef for USE_PIPES since fdin != fdout; ok djm@
Diffstat (limited to 'serverloop.c')
| -rw-r--r-- | serverloop.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/serverloop.c b/serverloop.c index 0754fe76..d28b8611 100644 --- a/serverloop.c +++ b/serverloop.c @@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: serverloop.c,v 1.88 2001/12/20 22:50:24 djm Exp $"); +RCSID("$OpenBSD: serverloop.c,v 1.89 2001/12/21 12:17:33 markus Exp $"); #include "xmalloc.h" #include "packet.h" @@ -406,14 +406,10 @@ process_output(fd_set * writeset) if (len < 0 && (errno == EINTR || errno == EAGAIN)) { /* do nothing */ } else if (len <= 0) { -#ifdef USE_PIPES - close(fdin); -#else if (fdin != fdout) close(fdin); else shutdown(fdin, SHUT_WR); /* We will no longer send. */ -#endif fdin = -1; } else { /* Successful write. */ @@ -563,14 +559,10 @@ server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg) * input data, cause a real eof by closing fdin. */ if (stdin_eof && fdin != -1 && buffer_len(&stdin_buffer) == 0) { -#ifdef USE_PIPES - close(fdin); -#else if (fdin != fdout) close(fdin); else shutdown(fdin, SHUT_WR); /* We will no longer send. */ -#endif fdin = -1; } /* Make packets from buffered stderr data to send to the client. */ |