diff options
author | mouring <mouring> | 2002-06-23 21:27:18 +0000 |
---|---|---|
committer | mouring <mouring> | 2002-06-23 21:27:18 +0000 |
commit | 66b37bfa27d7eff2d3e602620a1e2cde91e1e0f3 (patch) | |
tree | 5dd9b713378cb4a643452c50077d17f7e4e53bda /sftp.c | |
parent | ba6722e9c8ae3cad5b9e2b857bc0edf22f5261e7 (diff) | |
download | openssh-66b37bfa27d7eff2d3e602620a1e2cde91e1e0f3.tar.gz |
- deraadt@cvs.openbsd.org 2002/06/23 09:30:14
[sftp-client.c sftp-client.h sftp-common.c sftp-int.c sftp-server.c
sftp.c]
bunch of u_int vs int stuff
Diffstat (limited to 'sftp.c')
-rw-r--r-- | sftp.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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]; |