summaryrefslogtreecommitdiff
path: root/sftp.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-06-23 21:27:18 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-06-23 21:27:18 +0000
commitb1f483f472da5fd2dbcb009d9988088f43c21579 (patch)
tree2d3f0c9906f6bb38e2d8f1e2a8f673191fdd3769 /sftp.c
parent5c3855210ef20be5931d4b58f641d71bc3b203e8 (diff)
- 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.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sftp.c b/sftp.c
index f941d18fa..fac2564de 100644
--- a/sftp.c
+++ b/sftp.c
@@ -24,7 +24,7 @@
24 24
25#include "includes.h" 25#include "includes.h"
26 26
27RCSID("$OpenBSD: sftp.c,v 1.29 2002/04/02 17:37:48 markus Exp $"); 27RCSID("$OpenBSD: sftp.c,v 1.30 2002/06/23 09:30:14 deraadt Exp $");
28 28
29/* XXX: short-form remote directory listings (like 'ls -C') */ 29/* XXX: short-form remote directory listings (like 'ls -C') */
30 30
@@ -53,8 +53,10 @@ static void
53connect_to_server(char *path, char **args, int *in, int *out, pid_t *sshpid) 53connect_to_server(char *path, char **args, int *in, int *out, pid_t *sshpid)
54{ 54{
55 int c_in, c_out; 55 int c_in, c_out;
56
56#ifdef USE_PIPES 57#ifdef USE_PIPES
57 int pin[2], pout[2]; 58 int pin[2], pout[2];
59
58 if ((pipe(pin) == -1) || (pipe(pout) == -1)) 60 if ((pipe(pin) == -1) || (pipe(pout) == -1))
59 fatal("pipe: %s", strerror(errno)); 61 fatal("pipe: %s", strerror(errno));
60 *in = pin[0]; 62 *in = pin[0];
@@ -63,6 +65,7 @@ connect_to_server(char *path, char **args, int *in, int *out, pid_t *sshpid)
63 c_out = pin[1]; 65 c_out = pin[1];
64#else /* USE_PIPES */ 66#else /* USE_PIPES */
65 int inout[2]; 67 int inout[2];
68
66 if (socketpair(AF_UNIX, SOCK_STREAM, 0, inout) == -1) 69 if (socketpair(AF_UNIX, SOCK_STREAM, 0, inout) == -1)
67 fatal("socketpair: %s", strerror(errno)); 70 fatal("socketpair: %s", strerror(errno));
68 *in = *out = inout[0]; 71 *in = *out = inout[0];