o Merge from OPENSSH_3_2_3P1_GSI_3 to OPENSSH_3_4P1_GSI-20020701.

[gssapi-openssh.git] / openssh / sftp.c

diff --git a/openssh/sftp.c b/openssh/sftp.c
index 0b73bde6fd7d1c97dc2de985ab428ca74b5da30d..c310dfc04b44301590d635917a1f1bcdd6a36f03 100644 (file)
--- a/openssh/sftp.c
+++ b/openssh/sftp.c
@@ -24,7 +24,7 @@
 
 #include "includes.h"
 
-RCSID("$OpenBSD: sftp.c,v 1.29 2002/04/02 17:37:48 markus Exp $");
+RCSID("$OpenBSD: sftp.c,v 1.30 2002/06/23 09:30:14 deraadt Exp $");
 
 /* XXX: short-form remote directory listings (like 'ls -C') */
 
@@ -53,8 +53,10 @@ static void
 connect_to_server(char *path, char **args, int *in, int *out, pid_t *sshpid)
 {
        int c_in, c_out;
+
 #ifdef USE_PIPES
        int pin[2], pout[2];
+
        if ((pipe(pin) == -1) || (pipe(pout) == -1))
                fatal("pipe: %s", strerror(errno));
        *in = pin[0];
@@ -63,6 +65,7 @@ connect_to_server(char *path, char **args, int *in, int *out, pid_t *sshpid)
        c_out = pin[1];
 #else /* USE_PIPES */
        int inout[2];
+
        if (socketpair(AF_UNIX, SOCK_STREAM, 0, inout) == -1)
                fatal("socketpair: %s", strerror(errno));
        *in = *out = inout[0];
@@ -240,8 +243,8 @@ main(int argc, char **argv)
        interactive_loop(in, out, file1, file2);
 
 #if !defined(USE_PIPES)
-        shutdown(in, SHUT_RDWR);
-        shutdown(out, SHUT_RDWR);
+       shutdown(in, SHUT_RDWR);
+       shutdown(out, SHUT_RDWR);
 #endif
 
        close(in);