New upstream release (8.1p1)

1 files changed, 16 insertions, 13 deletions

diff --git a/sftp.c b/sftp.c
index 44aa19d96..b66037f16 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.190 2019/01/21 22:50:42 tb Exp $ */
+/* $OpenBSD: sftp.c,v 1.195 2019/10/02 00:42:30 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -53,7 +53,6 @@ typedef void EditLine;
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <stdarg.h>
 
 #ifdef HAVE_UTIL_H
 # include <util.h>
@@ -284,9 +283,7 @@ help(void)
             "df [-hi] [path]                    Display statistics for current directory or\n"
             "                                   filesystem containing 'path'\n"
             "exit                               Quit sftp\n"
-            "get [-afPpRr] remote [local]       Download file\n"
-            "reget [-fPpRr] remote [local]      Resume download file\n"
-            "reput [-fPpRr] [local] remote      Resume upload file\n"
+            "get [-afpR] remote [local]         Download file\n"
             "help                               Display this help text\n"
             "lcd path                           Change local directory to 'path'\n"
             "lls [ls-options [path]]            Display local directory listing\n"
@@ -297,10 +294,12 @@ help(void)
             "lumask umask                       Set local umask to 'umask'\n"
             "mkdir path                         Create remote directory\n"
             "progress                           Toggle display of progress meter\n"
-            "put [-afPpRr] local [remote]       Upload file\n"
+            "put [-afpR] local [remote]         Upload file\n"
             "pwd                                Display remote working directory\n"
             "quit                               Quit sftp\n"
+            "reget [-fpR] remote [local]        Resume download file\n"
             "rename oldpath newpath             Rename remote file\n"
+            "reput [-fpR] local [remote]        Resume upload file\n"
             "rm path                            Delete remote file\n"
             "rmdir path                         Remove remote directory\n"
             "symlink oldpath newpath            Symlink remote file\n"
@@ -2189,7 +2188,7 @@ interactive_loop(struct sftp_conn *conn, char *file1, char *file2)
                 el_set(el, EL_BIND, "^I", "ftp-complete", NULL);
                 /* enable ctrl-left-arrow and ctrl-right-arrow */
                 el_set(el, EL_BIND, "\\e[1;5C", "em-next-word", NULL);
-                el_set(el, EL_BIND, "\\e[5C", "em-next-word", NULL);
+                el_set(el, EL_BIND, "\\e\\e[C", "em-next-word", NULL);
                 el_set(el, EL_BIND, "\\e[1;5D", "ed-prev-word", NULL);
                 el_set(el, EL_BIND, "\\e\\e[D", "ed-prev-word", NULL);
                 /* make ^w match ksh behaviour */
@@ -2388,7 +2387,6 @@ main(int argc, char **argv)
         size_t num_requests = DEFAULT_NUM_REQUESTS;
         long long limit_kbps = 0;
 
-        ssh_malloc_init();      /* must be called before any mallocs */
         /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
         sanitise_stdfd();
         msetlocale();
@@ -2528,12 +2526,17 @@ main(int argc, char **argv)
                                 port = tmp;
                         break;
                 default:
+                        /* Try with user, host and path. */
                         if (parse_user_host_path(*argv, &user, &host,
-                            &file1) == -1) {
-                                /* Treat as a plain hostname. */
-                                host = xstrdup(*argv);
-                                host = cleanhostname(host);
-                        }
+                            &file1) == 0)
+                                break;
+                        /* Try with user and host. */
+                        if (parse_user_host_port(*argv, &user, &host, NULL)
+                            == 0)
+                                break;
+                        /* Treat as a plain hostname. */
+                        host = xstrdup(*argv);
+                        host = cleanhostname(host);
                         break;
                 }
                 file2 = *(argv + 1);