From: djm@openbsd.org <djm@openbsd.org>
Date: Fri, 16 Sep 2022 03:13:34 +0000 (+0000)
Subject: upstream: sftp: Don't attempt to complete arguments for
X-Git-Tag: V_9_1_P1~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=590db83384f9d99fc51c84505792d26d1ef60df9;p=thirdparty%2Fopenssh-portable.git

upstream: sftp: Don't attempt to complete arguments for

non-existent commands

If user entered a non-existent command (e.g. because they made a
typo) there is no point in trying to complete its arguments. Skip
calling complete_match() if that's the case.

From Michal Privoznik

OpenBSD-Commit-ID: cf39c811a68cde2aeb98fc85addea4000ef6b07a
---

diff --git a/sftp.c b/sftp.c
index 939b8dc00..11ebe209c 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.218 2022/06/28 06:09:14 jmc Exp $ */
+/* $OpenBSD: sftp.c,v 1.219 2022/09/16 03:13:34 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -2143,7 +2143,7 @@ complete(EditLine *el, int ch)
 		if (carg > 1 && line[cursor-1] != ' ')
 			filematch = argv[carg - 1];
 
-		if (remote != 0 &&
+		if ((remote == REMOTE || remote == LOCAL) &&
 		    complete_match(el, complete_ctx->conn,
 		    *complete_ctx->remote_pathp, filematch,
 		    remote, carg == argc, quote, terminated) != 0)