~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More use of sockaddr_union (above and beyond that necessary to remove current
[sgt/putty]
/
unix
/
uxproxy.c
diff --git
a/unix/uxproxy.c
b/unix/uxproxy.c
index
617f5cc
..
ddc5580
100644
(file)
--- a/
unix/uxproxy.c
+++ b/
unix/uxproxy.c
@@
-209,7
+209,7
@@
static int localproxy_select_result(int fd, int event)
} else if (ret == 0) {
return plug_closing(s->plug, NULL, 0, 0);
} else {
} else if (ret == 0) {
return plug_closing(s->plug, NULL, 0, 0);
} else {
- return plug_receive(s->plug,
1
, buf, ret);
+ return plug_receive(s->plug,
0
, buf, ret);
}
} else if (event == 2) {
assert(fd == s->to_cmd);
}
} else if (event == 2) {
assert(fd == s->to_cmd);
@@
-265,6
+265,8
@@
Socket platform_new_connection(SockAddr addr, char *hostname,
ret->error = dupprintf("pipe: %s", strerror(errno));
return (Socket)ret;
}
ret->error = dupprintf("pipe: %s", strerror(errno));
return (Socket)ret;
}
+ cloexec(to_cmd_pipe[1]);
+ cloexec(from_cmd_pipe[0]);
pid = fork();
pid = fork();
@@
-272,16
+274,15
@@
Socket platform_new_connection(SockAddr addr, char *hostname,
ret->error = dupprintf("fork: %s", strerror(errno));
return (Socket)ret;
} else if (pid == 0) {
ret->error = dupprintf("fork: %s", strerror(errno));
return (Socket)ret;
} else if (pid == 0) {
- int i;
close(0);
close(1);
dup2(to_cmd_pipe[0], 0);
dup2(from_cmd_pipe[1], 1);
close(0);
close(1);
dup2(to_cmd_pipe[0], 0);
dup2(from_cmd_pipe[1], 1);
- for (i = 3; i < 127; i++)
-
close(i
);
+ close(to_cmd_pipe[0]);
+
close(from_cmd_pipe[1]
);
fcntl(0, F_SETFD, 0);
fcntl(1, F_SETFD, 0);
fcntl(0, F_SETFD, 0);
fcntl(1, F_SETFD, 0);
- execl("/bin/sh", "sh", "-c", cmd, NULL);
+ execl("/bin/sh", "sh", "-c", cmd,
(void *)
NULL);
_exit(255);
}
_exit(255);
}