X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/055817455466c8eb60392f30bb7c689763962e17..e527cc48938cbd53591aa0ac9436069aca078c1f:/unix/uxplink.c

diff --git a/unix/uxplink.c b/unix/uxplink.c
index fdc0f666..8d1aac74 100644
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -13,6 +13,7 @@
 #include <termios.h>
 #include <pwd.h>
 #include <sys/ioctl.h>
+#include <sys/select.h>
 
 #define PUTTY_DO_GLOBALS	       /* actually _define_ globals */
 #include "putty.h"
@@ -128,10 +129,13 @@ void ldisc_update(void *frontend, int echo, int edit)
     else
 	mode.c_lflag &= ~ECHO;
 
-    if (edit)
+    if (edit) {
+	mode.c_iflag |= ICRNL;
 	mode.c_lflag |= ISIG | ICANON;
-    else
+    } else {
+	mode.c_iflag &= ~ICRNL;
 	mode.c_lflag &= ~(ISIG | ICANON);
+    }
 
     tcsetattr(0, TCSANOW, &mode);
 }
@@ -213,7 +217,6 @@ static void usage(void)
     printf("            force use of a particular protocol\n");
     printf("  -P port   connect to specified port\n");
     printf("  -l user   connect with specified username\n");
-    printf("  -m file   read remote command(s) from file\n");
     printf("  -batch    disable all interactive prompts\n");
     printf("The following options only apply to SSH connections:\n");
     printf("  -pw passw login with specified password\n");
@@ -230,6 +233,7 @@ static void usage(void)
     printf("  -4 -6     force use of IPv4 or IPv6\n");
     printf("  -C        enable compression\n");
     printf("  -i key    private key file for authentication\n");
+    printf("  -m file   read remote command(s) from file\n");
     printf("  -s        remote command is an SSH subsystem (SSH-2 only)\n");
     printf("  -N        don't start a shell/command (SSH-2 only)\n");
     exit(1);
@@ -410,8 +414,6 @@ int main(int argc, char **argv)
 			    cfg.port = default_port;
 			} else {
 			    cfg = cfg2;
-			    /* Ick: patch up internal pointer after copy */
-			    cfg.remote_cmd_ptr = cfg.remote_cmd;
 			}
 		    }
 
@@ -514,7 +516,7 @@ int main(int argc, char **argv)
 	cfg.host[p1] = '\0';
     }
 
-    if (!*cfg.remote_cmd_ptr)
+    if (!cfg.remote_cmd_ptr && !*cfg.remote_cmd)
 	flags |= FLAG_INTERACTIVE;
 
     /*