X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/037fb11340ce13d5392877509c514743f872e9b7..8fd3bdc4ee9fe7d3036a36b70affe273008024e2:/scp.c?ds=sidebyside

diff --git a/scp.c b/scp.c
index cf79a061..5ebcfd2c 100644
--- a/scp.c
+++ b/scp.c
@@ -83,10 +83,8 @@ static int recursive = 0;
 static int preserve = 0;
 static int targetshouldbedirectory = 0;
 static int statistics = 1;
-static int portnumber = 0;
 static int prev_stats_len = 0;
 static int scp_unsafe_mode = 0;
-static char *password = NULL;
 static int errs = 0;
 /* GUI Adaptation - Sept 2000 */
 #define NAME_STR_MAX 2048
@@ -449,10 +447,23 @@ static void do_cmd(char *host, char *user, char *cmd)
 	do_defaults(NULL, &cfg);
 	strncpy(cfg.host, host, sizeof(cfg.host) - 1);
 	cfg.host[sizeof(cfg.host) - 1] = '\0';
-	cfg.port = 22;
     }
 
     /*
+     * Force use of SSH. (If they got the protocol wrong we assume the
+     * port is useless too.)
+     */
+    if (cfg.protocol != PROT_SSH) {
+        cfg.protocol = PROT_SSH;
+        cfg.port = 22;
+    }
+
+    /*
+     * Enact command-line overrides.
+     */
+    cmdline_run_saved();
+
+    /*
      * Trim leading whitespace off the hostname if it's there.
      */
     {
@@ -495,12 +506,6 @@ static void do_cmd(char *host, char *user, char *cmd)
 	free(user);
     }
 
-    if (cfg.protocol != PROT_SSH)
-	cfg.port = 22;
-
-    if (portnumber)
-	cfg.port = portnumber;
-
     /*
      * Disable scary things which shouldn't be enabled for simple
      * things like SCP and SFTP: agent forwarding, port forwarding,
@@ -690,6 +695,12 @@ void scp_sftp_listdir(char *dirname)
     int nnames, namesize;
     int i;
 
+    if (!fxp_init()) {
+	tell_user(stderr, "unable to initialise SFTP: %s", fxp_error());
+	errs++;
+	return;
+    }
+
     printf("Listing directory %s\n", dirname);
 
     dirh = fxp_opendir(dirname);
@@ -2077,8 +2088,14 @@ static void usage(void)
     printf("  -q        quiet, don't show statistics\n");
     printf("  -r        copy directories recursively\n");
     printf("  -v        show verbose messages\n");
+    printf("  -load sessname  Load settings from saved session\n");
     printf("  -P port   connect to specified port\n");
+    printf("  -l user   connect with specified username\n");
     printf("  -pw passw login with specified password\n");
+    printf("  -1 -2     force use of particular SSH protocol version\n");
+    printf("  -C        enable compression\n");
+    printf("  -i key    private key file for authentication\n");
+    printf("  -batch    disable all interactive prompts\n");
     printf("  -unsafe   allow server-side wildcards (DANGEROUS)\n");
 #if 0
     /*
@@ -2094,6 +2111,17 @@ static void usage(void)
     cleanup_exit(1);
 }
 
+void cmdline_error(char *p, ...)
+{
+    va_list ap;
+    fprintf(stderr, "pscp: ");
+    va_start(ap, p);
+    vfprintf(stderr, p, ap);
+    va_end(ap);
+    fputc('\n', stderr);
+    exit(1);
+}
+
 /*
  *  Main program (no, really?)
  */
@@ -2104,38 +2132,43 @@ int main(int argc, char *argv[])
     default_protocol = PROT_TELNET;
 
     flags = FLAG_STDERR;
+    cmdline_tooltype = TOOLTYPE_FILETRANSFER;
     ssh_get_line = &console_get_line;
     init_winsock();
     sk_init();
 
     for (i = 1; i < argc; i++) {
+	int ret;
 	if (argv[i][0] != '-')
 	    break;
-	if (strcmp(argv[i], "-v") == 0)
-	    verbose = 1, flags |= FLAG_VERBOSE;
-	else if (strcmp(argv[i], "-r") == 0)
+	ret = cmdline_process_param(argv[i], i+1<argc?argv[i+1]:NULL, 1);
+	if (ret == -2) {
+	    cmdline_error("option \"%s\" requires an argument", argv[i]);
+	} else if (ret == 2) {
+	    i++;	       /* skip next argument */
+	} else if (ret == 1) {
+	    /* We have our own verbosity in addition to `flags'. */
+	    if (flags & FLAG_VERBOSE)
+		verbose = 1;
+	} else if (strcmp(argv[i], "-r") == 0) {
 	    recursive = 1;
-	else if (strcmp(argv[i], "-p") == 0)
+	} else if (strcmp(argv[i], "-p") == 0) {
 	    preserve = 1;
-	else if (strcmp(argv[i], "-q") == 0)
+	} else if (strcmp(argv[i], "-q") == 0) {
 	    statistics = 0;
-	else if (strcmp(argv[i], "-batch") == 0)
-	    console_batch_mode = 1;
-	else if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "-?") == 0)
+	} else if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "-?") == 0) {
 	    usage();
-	else if (strcmp(argv[i], "-P") == 0 && i + 1 < argc)
-	    portnumber = atoi(argv[++i]);
-	else if (strcmp(argv[i], "-pw") == 0 && i + 1 < argc)
-	    console_password = argv[++i];
-	else if (strcmp(argv[i], "-gui") == 0 && i + 1 < argc) {
+	} else if (strcmp(argv[i], "-gui") == 0 && i + 1 < argc) {
 	    gui_hwnd = argv[++i];
 	    gui_mode = 1;
 	    console_batch_mode = TRUE;
-	} else if (strcmp(argv[i], "-ls") == 0)
+        } else if (strcmp(argv[i], "-ls") == 0) {
 	    list = 1;
-	else if (strcmp(argv[i], "-unsafe") == 0)
+	} else if (strcmp(argv[i], "-batch") == 0) {
+	    console_batch_mode = 1;
+	} else if (strcmp(argv[i], "-unsafe") == 0) {
 	    scp_unsafe_mode = 1;
-	else if (strcmp(argv[i], "--") == 0) {
+	} else if (strcmp(argv[i], "--") == 0) {
 	    i++;
 	    break;
 	} else