From: simon <simon@cda61777-01e9-0310-a592-d414129be87e>
Date: Wed, 23 Feb 2005 09:25:39 +0000 (+0000)
Subject: Fallout from my change in the semantics of cfg.remote_cmd_ptr.
X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/commitdiff_plain/a79e1969c433be76db0e0585081977b4a7656e51

Fallout from my change in the semantics of cfg.remote_cmd_ptr.
Spotted by Alano na Alania.


git-svn-id: svn://svn.tartarus.org/sgt/putty@5386 cda61777-01e9-0310-a592-d414129be87e
---

diff --git a/unix/uxplink.c b/unix/uxplink.c
index 88d580c7..42d69664 100644
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -414,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;
 			}
 		    }
 
@@ -518,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;
 
     /*
diff --git a/windows/winplink.c b/windows/winplink.c
index 602ec7bc..1fb3ee0b 100644
--- a/windows/winplink.c
+++ b/windows/winplink.c
@@ -425,8 +425,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;
 			}
 		    }
 
@@ -529,7 +527,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;
 
     /*