X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unix%2Fuxproxy.c;h=209991fc8ee6387fe2a1d2fa512b4b0b05d3d390;hb=d83cd2f79bba111660262af0827296cb76e17040;hp=b3f75e813fabfa09fd6ff5bad6a2f984c20d6d88;hpb=92db92af5a6b230e876a5f0f34a184612792847d;p=PuTTY.git diff --git a/unix/uxproxy.c b/unix/uxproxy.c index b3f75e81..209991fc 100644 --- a/unix/uxproxy.c +++ b/unix/uxproxy.c @@ -98,6 +98,8 @@ static void sk_localproxy_close (Socket s) del234(localproxy_by_fromfd, ps); del234(localproxy_by_tofd, ps); + uxsel_del(ps->to_cmd); + uxsel_del(ps->from_cmd); close(ps->to_cmd); close(ps->from_cmd); @@ -221,8 +223,8 @@ static int localproxy_select_result(int fd, int event) Socket platform_new_connection(SockAddr addr, char *hostname, int port, int privport, - int oobinline, int nodelay, Plug plug, - const Config *cfg) + int oobinline, int nodelay, int keepalive, + Plug plug, const Config *cfg) { char *cmd; @@ -279,7 +281,7 @@ Socket platform_new_connection(SockAddr addr, char *hostname, close(i); 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); }