first pass

[PuTTY.git] / psftp.c

diff --git a/psftp.c b/psftp.c
index 83dec9687b4f70c9fbde22df15b553c8e7342ff3..5394c1fbb9150007422c8f9d0b39da66ff8aa37e 100644 (file)
--- a/psftp.c
+++ b/psftp.c
@@ -1050,6 +1050,7 @@ int sftp_cmd_ls(struct sftp_command *cmd)
 
     if (dirh == NULL) {
        printf("Unable to open %s: %s\n", dir, fxp_error());
+       return 0;
     } else {
        nnames = namesize = 0;
        ournames = NULL;
@@ -2657,6 +2658,8 @@ static void usage(void)
     printf("  -hostkey aa:bb:cc:...\n");
     printf("            manually specify a host key (may be repeated)\n");
     printf("  -batch    disable all interactive prompts\n");
+    printf("  -proxycmd command\n");
+    printf("            use 'command' as local proxy\n");
     printf("  -sshlog file\n");
     printf("  -sshrawlog file\n");
     printf("            log protocol details to a file\n");
@@ -2668,7 +2671,7 @@ static void version(void)
   char *buildinfo_text = buildinfo("\n");
   printf("psftp: %s\n%s\n", ver, buildinfo_text);
   sfree(buildinfo_text);
-  cleanup_exit(1);
+  exit(0);
 }
 
 /*
@@ -2840,6 +2843,8 @@ static int psftp_connect(char *userhost, char *user, int portnumber)
     logctx = log_init(NULL, conf);
     console_provide_logctx(logctx);
 
+    platform_psftp_pre_conn_setup();
+
     err = back->init(NULL, &backhandle, conf,
                     conf_get_str(conf, CONF_host),
                     conf_get_int(conf, CONF_port),
@@ -2954,8 +2959,6 @@ int psftp_main(int argc, char *argv[])
     argv += i;
     back = NULL;
 
-    platform_psftp_post_option_setup();
-
     /*
      * If the loaded session provides a hostname, and a hostname has not
      * otherwise been specified, pop it in `userhost' so that