Improve handling of oobinline sockets; Plink in telnet mode now

[u/mdw/putty] / unix / uxplink.c

diff --git a/unix/uxplink.c b/unix/uxplink.c
index 8f828a5..dab6947 100644 (file)
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -447,7 +447,7 @@ int main(int argc, char **argv)
        error = back->init(NULL, &backhandle, cfg.host, cfg.port,
                           &realhost, nodelay);
        if (error) {
-           fprintf(stderr, "Unable to open connection:\n%s", error);
+           fprintf(stderr, "Unable to open connection:\n%s\n", error);
            return 1;
        }
        logctx = log_init(NULL);
@@ -532,12 +532,17 @@ int main(int argc, char **argv)
 
        for (i = 0; i < skcount; i++) {
            socket = sklist[i];
+            /*
+             * We must process exceptional notifications before
+             * ordinary readability ones, or we may go straight
+             * past the urgent marker.
+             */
+           if (FD_ISSET(socket, &xset))
+               select_result(socket, 4);
            if (FD_ISSET(socket, &rset))
                select_result(socket, 1);
            if (FD_ISSET(socket, &wset))
                select_result(socket, 2);
-           if (FD_ISSET(socket, &xset))
-               select_result(socket, 4);
        }
 
        if (FD_ISSET(0, &rset)) {