Implement the `close' command, which terminates an SFTP session but

[sgt/putty] / psftp.c

diff --git a/psftp.c b/psftp.c
index de1964e..b1cfe16 100644 (file)
--- a/psftp.c
+++ b/psftp.c
@@ -767,6 +767,23 @@ int sftp_cmd_quit(struct sftp_command *cmd)
     return -1;
 }
 
+int sftp_cmd_close(struct sftp_command *cmd)
+{
+    if (back == NULL) {
+       printf("psftp: not connected to a host; use \"open host.name\"\n");
+       return 0;
+    }
+
+    if (back != NULL && back->socket(backhandle) != NULL) {
+       char ch;
+       back->special(backhandle, TS_EOF);
+       sftp_recvdata(&ch, 1);
+    }
+    do_sftp_cleanup();
+
+    return 0;
+}
+
 /*
  * List a directory. If no arguments are given, list pwd; otherwise
  * list the directory given in words[1].
@@ -1632,6 +1649,14 @@ static struct sftp_cmd_lookup {
            sftp_cmd_chmod
     },
     {
+       "close", TRUE, "finish your SFTP session but do not quit PSFTP",
+           "\n"
+           "  Terminates your SFTP session, but does not quit the PSFTP\n"
+           "  program. You can then use \"open\" to start another SFTP\n"
+           "  session, to the same server or to a different one.\n",
+           sftp_cmd_close
+    },
+    {
        "del", TRUE, "delete a file",
            " <filename>\n"
            "  Delete a file.\n",
@@ -1866,7 +1891,7 @@ struct sftp_command *sftp_getcmd(FILE *fp, int mode, int modeflags)
            printf("psftp> ");
        line = fgetline(fp);
     } else {
-       line = ssh_sftp_get_cmdline("psftp> ");
+       line = ssh_sftp_get_cmdline("psftp> ", back == NULL);
     }
 
     if (!line || !*line) {
@@ -2004,6 +2029,8 @@ void do_sftp_cleanup()
        sftp_recvdata(&ch, 1);
        back->free(backhandle);
        sftp_cleanup_request();
+       back = NULL;
+       backhandle = NULL;
     }
     if (pwd) {
        sfree(pwd);
@@ -2577,12 +2604,10 @@ int psftp_main(int argc, char *argv[])
        back->special(backhandle, TS_EOF);
        sftp_recvdata(&ch, 1);
     }
+    do_sftp_cleanup();
     random_save_seed();
     cmdline_cleanup();
     console_provide_logctx(NULL);
-    do_sftp_cleanup();
-    backhandle = NULL;
-    back = NULL;
     sk_cleanup();
 
     return 0;