X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/18e62ad8969d5b38cfdc28c943f05c59ea7fba5d..4423d5c7a793b01f16c92b2740bebeef9210a249:/psftp.c

diff --git a/psftp.c b/psftp.c
index 218d363c..1def80eb 100644
--- a/psftp.c
+++ b/psftp.c
@@ -1361,45 +1361,34 @@ static int sftp_cmd_help(struct sftp_command *cmd)
 struct sftp_command *sftp_getcmd(FILE *fp, int mode, int modeflags)
 {
     char *line;
-    int linelen, linesize;
     struct sftp_command *cmd;
     char *p, *q, *r;
     int quoting;
 
-    if ((mode == 0) || (modeflags & 1)) {
-	printf("psftp> ");
-    }
-    fflush(stdout);
-
     cmd = snew(struct sftp_command);
     cmd->words = NULL;
     cmd->nwords = 0;
     cmd->wordssize = 0;
 
     line = NULL;
-    linesize = linelen = 0;
-    while (1) {
-	int len;
-	char *ret;
-
-	linesize += 512;
-	line = sresize(line, linesize, char);
-	ret = fgets(line + linelen, linesize - linelen, fp);
-
-	if (!ret || (linelen == 0 && line[0] == '\0')) {
-	    cmd->obey = sftp_cmd_quit;
-	    if ((mode == 0) || (modeflags & 1))
-		printf("quit\n");
-	    return cmd;		       /* eof */
-	}
-	len = linelen + strlen(line + linelen);
-	linelen += len;
-	if (line[linelen - 1] == '\n') {
-	    linelen--;
-	    line[linelen] = '\0';
-	    break;
-	}
+
+    if (fp) {
+	if (modeflags & 1)
+	    printf("psftp> ");
+	line = fgetline(fp);
+    } else {
+	line = ssh_sftp_get_cmdline("psftp> ");
     }
+
+    if (!line || !*line) {
+	cmd->obey = sftp_cmd_quit;
+	if ((mode == 0) || (modeflags & 1))
+	    printf("quit\n");
+	return cmd;		       /* eof */
+    }
+
+    line[strcspn(line, "\r\n")] = '\0';
+
     if (modeflags & 1) {
 	printf("%s\n", line);
     }
@@ -1464,7 +1453,8 @@ struct sftp_command *sftp_getcmd(FILE *fp, int mode, int modeflags)
 	}
     }
 
-	sfree(line);
+    sfree(line);
+
     /*
      * Now parse the first word and assign a function.
      */
@@ -1551,7 +1541,7 @@ void do_sftp(int mode, int modeflags, char *batchfile)
          */
         while (1) {
 	    struct sftp_command *cmd;
-	    cmd = sftp_getcmd(stdin, 0, 0);
+	    cmd = sftp_getcmd(NULL, 0, 0);
 	    if (!cmd)
 		break;
 	    ret = cmd->obey(cmd);
@@ -1847,6 +1837,15 @@ static int psftp_connect(char *userhost, char *user, int portnumber)
     }
 
     /*
+     * If saved session / Default Settings says SSH-1 (`1 only' or `1'),
+     * then change it to SSH-2, on the grounds that that's more likely to
+     * work for SFTP. (Can be overridden with `-1' option.)
+     * But if it says `2 only' or `2', respect which.
+     */
+    if (cfg.sshprot != 2 && cfg.sshprot != 3)
+	cfg.sshprot = 2;
+
+    /*
      * Enact command-line overrides.
      */
     cmdline_run_saved(&cfg);
@@ -1861,7 +1860,7 @@ static int psftp_connect(char *userhost, char *user, int portnumber)
 
     /* See if host is of the form user@host */
     if (cfg.host[0] != '\0') {
-	char *atsign = strchr(cfg.host, '@');
+	char *atsign = strrchr(cfg.host, '@');
 	/* Make sure we're not overflowing the user field */
 	if (atsign) {
 	    if (atsign - cfg.host < sizeof cfg.username) {
@@ -1898,10 +1897,9 @@ static int psftp_connect(char *userhost, char *user, int portnumber)
 	cfg.username[sizeof(cfg.username) - 1] = '\0';
     }
     if (!cfg.username[0]) {
-	printf("login as: ");
-	fflush(stdout);
-	if (!fgets(cfg.username, sizeof(cfg.username), stdin)) {
-	    fprintf(stderr, "psftp: aborting\n");
+	if (!console_get_line("login as: ",
+			      cfg.username, sizeof(cfg.username), FALSE)) {
+	    fprintf(stderr, "psftp: no username, aborting\n");
 	    cleanup_exit(1);
 	} else {
 	    int len = strlen(cfg.username);
@@ -1913,9 +1911,6 @@ static int psftp_connect(char *userhost, char *user, int portnumber)
     if (portnumber)
 	cfg.port = portnumber;
 
-    /* SFTP uses SSH2 by default always */
-    cfg.sshprot = 2;
-
     /*
      * Disable scary things which shouldn't be enabled for simple
      * things like SCP and SFTP: agent forwarding, port forwarding,
@@ -2061,6 +2056,15 @@ int psftp_main(int argc, char *argv[])
     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.
      */