X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/7016cde4097d265eb0bc3d31f1d3b07bf40a870d..edd0cb8aef57080ae884e06731a7892ca8cdba44:/unix/uxplink.c

diff --git a/unix/uxplink.c b/unix/uxplink.c
index 2505cb2a..90b151f7 100644
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -13,7 +13,10 @@
 #include <termios.h>
 #include <pwd.h>
 #include <sys/ioctl.h>
+#include <sys/time.h>
+#ifndef HAVE_NO_SYS_SELECT_H
 #include <sys/select.h>
+#endif
 
 #define PUTTY_DO_GLOBALS	       /* actually _define_ globals */
 #include "putty.h"
@@ -149,6 +152,17 @@ void ldisc_update(void *frontend, int echo, int edit)
 	mode.c_iflag &= ~IXON;
 	mode.c_iflag &= ~IXOFF;
     }
+    /* 
+     * Mark parity errors and (more important) BREAK on input.  This
+     * is more complex than it need be because POSIX-2001 suggests
+     * that escaping of valid 0xff in the input stream is dependent on
+     * IGNPAR being clear even though marking of BREAK isn't.  NetBSD
+     * 2.0 goes one worse and makes it dependent on INPCK too.  We
+     * deal with this by forcing these flags into a useful state and
+     * then faking the state in which we found them in from_tty() if
+     * we get passed a parity or framing error.
+     */
+    mode.c_iflag = (mode.c_iflag | INPCK | PARMRK) & ~IGNPAR;
 
     tcsetattr(0, TCSANOW, &mode);
 }
@@ -283,7 +297,7 @@ char *get_ttymode(void *frontend, const char *mode)
 #if defined(ONOCR)
     GET_BOOL("ONOCR", ONOCR, c_oflag, );
 #endif
-#if defined(ONLCR)
+#if defined(ONLRET)
     GET_BOOL("ONLRET", ONLRET, c_oflag, );
 #endif
 
@@ -380,6 +394,91 @@ int from_backend(void *frontend_handle, int is_stderr,
     return osize + esize;
 }
 
+int from_backend_untrusted(void *frontend_handle, const char *data, int len)
+{
+    /*
+     * No "untrusted" output should get here (the way the code is
+     * currently, it's all diverted by FLAG_STDERR).
+     */
+    assert(!"Unexpected call to from_backend_untrusted()");
+    return 0; /* not reached */
+}
+
+int get_userpass_input(prompts_t *p, unsigned char *in, int inlen)
+{
+    int ret;
+    ret = cmdline_get_passwd_input(p, in, inlen);
+    if (ret == -1)
+	ret = console_get_userpass_input(p, in, inlen);
+    return ret;
+}
+
+/*
+ * Handle data from a local tty in PARMRK format.
+ */
+static void from_tty(void *buf, unsigned len)
+{
+    char *p, *q, *end;
+    static enum {NORMAL, FF, FF00} state = NORMAL;
+
+    p = buf; end = buf + len;
+    while (p < end) {
+	switch (state) {
+	    case NORMAL:
+		if (*p == '\xff') {
+		    p++;
+		    state = FF;
+		} else {
+		    q = memchr(p, '\xff', end - p);
+		    if (q == NULL) q = end;
+		    back->send(backhandle, p, q - p);
+		    p = q;
+		}
+		break;
+	    case FF:
+		if (*p == '\xff') {
+		    back->send(backhandle, p, 1);
+		    p++;
+		    state = NORMAL;
+		} else if (*p == '\0') {
+		    p++;
+		    state = FF00;
+		} else abort();
+		break;
+	    case FF00:
+		if (*p == '\0') {
+		    back->special(backhandle, TS_BRK);
+		} else {
+		    /* 
+		     * Pretend that PARMRK wasn't set.  This involves
+		     * faking what INPCK and IGNPAR would have done if
+		     * we hadn't overridden them.  Unfortunately, we
+		     * can't do this entirely correctly because INPCK
+		     * distinguishes between framing and parity
+		     * errors, but PARMRK format represents both in
+		     * the same way.  We assume that parity errors are
+		     * more common than framing errors, and hence
+		     * treat all input errors as being subject to
+		     * INPCK.
+		     */
+		    if (orig_termios.c_iflag & INPCK) {
+			/* If IGNPAR is set, we throw away the character. */
+			if (!(orig_termios.c_iflag & IGNPAR)) {
+			    /* PE/FE get passed on as NUL. */
+			    *p = 0;
+			    back->send(backhandle, p, 1);
+			}
+		    } else {
+			/* INPCK not set.  Assume we got a parity error. */
+			back->send(backhandle, p, 1);
+		    }
+		}
+		p++;
+		state = NORMAL;
+	}
+    }
+}
+
 int signalpipe[2];
 
 void sigwinch(int signum)
@@ -454,8 +553,6 @@ int main(int argc, char **argv)
     void *ldisc, *logctx;
     long now;
 
-    ssh_get_line = console_get_line;
-
     fdlist = NULL;
     fdcount = fdsize = 0;
     /*
@@ -926,7 +1023,10 @@ int main(int argc, char **argv)
 		    back->special(backhandle, TS_EOF);
 		    sending = FALSE;   /* send nothing further after this */
 		} else {
-		    back->send(backhandle, buf, ret);
+		    if (local_tty)
+			from_tty(buf, ret);
+		    else
+			back->send(backhandle, buf, ret);
 		}
 	    }
 	}