Another wart in the command-line processing: if the user just specifies

`-load sessname', and that mentions a hostname, that should be sufficient
to start a connection.

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

diff --git a/psftp.c b/psftp.c
index 079a61f33eef8178ec1f6710f1319e43272f5bd4..e5374c5f9a18409a9c8a1f99c5d01cef0455f520 100644 (file)
--- a/psftp.c
+++ b/psftp.c
@@ -2066,6 +2066,15 @@ int psftp_main(int argc, char *argv[])
     argv += i;
     back = NULL;
 
+    /*
+     * If the loaded session provides a hostname, and a hostname has not
+     * otherwise been specified, pop it in `userhost' so that
+     * `psftp -load sessname' is sufficient to start a session.
+     */
+    if (!userhost && cfg.host[0] != '\0') {
+       userhost = dupstr(cfg.host);
+    }
+
     /*
      * If a user@host string has already been provided, connect to
      * it now.