From nobody Wed Apr 13 19:01:50 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9D13E1B31BAB; Wed, 13 Apr 2022 19:01:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KdsQQ43tSz3KHt; Wed, 13 Apr 2022 19:01:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649876510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JFSUsQde9gW3501HwSZHKMUVvY3uv0EJKuYJmm8ts3Q=; b=Y1Xcd6TQrITy5pdX8gXjRyGciFPZEDYdkQfS5Xfh4/xJyS31g/UmyOuzAzltX25hCTAKmQ REqIJ+8gCnT0ZBVhr1CkJcLCp15ovgXV18xCY0NK5jESKxXaH/5eT5S+qOB8kgESKV8s0A MP69jxulB2U+RNqZExUxTcF7lBJXRdpJafBMuYiSxkNenToWCWspc7ooPvnchTWKSPa50H PCok3z4BbqZnzRlKvZFRklBeveb4QhBRjNuQ3zHkISg1V1gZKHVYbhphVQ7typ5Ymg9HQv N55wK/W8x+oDaPRVNpQCWLpUUPWfoSeDFrZ0PmRtqX4DJljTkQobH5DGok6isg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6BAD411B6E; Wed, 13 Apr 2022 19:01:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23DJ1o29048307; Wed, 13 Apr 2022 19:01:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23DJ1oQi048306; Wed, 13 Apr 2022 19:01:50 GMT (envelope-from git) Date: Wed, 13 Apr 2022 19:01:50 GMT Message-Id: <202204131901.23DJ1oQi048306@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Piotr Pawel Stefaniak Subject: git: c8f0a1c6d756 - stable/13 - sh: fix autocompletion for commands that share name with a directory List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pstef X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c8f0a1c6d756a0c5cf2fb4deb0234b7863b46fd6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649876510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JFSUsQde9gW3501HwSZHKMUVvY3uv0EJKuYJmm8ts3Q=; b=GuOU4TPHSpLoo5L9j3Rw49wnOLxJLQ+mArvnqP75LXLu3VU8cybH1o8JZZ3+z9PyEiF5xV 4rhWmMvAhJrTGhRqVS4TfFgNr649GJ+cOXvvDpXKgjUQEuDu4CjCri8Zlz07ZmU4SiFJpt 7T9ZhbKG/Rkaa63N607dV28Lh8cNuZkwKEfgtvOFX0Uqa6b6NRiLQ2UmtiXxa5ASb6y08E feiKgzO1x0hIeg1ZmPOBKUw+vtF83I1hOQ4dFH5S9DqD7H5mB3+ZBpLJfI7uwO3Jeh38GA tlvsXgC7kRIQj7jyxO/gcioJubDYeafwmeUQcPUr0VppvXSpe/rOEXvTEHkU2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649876510; a=rsa-sha256; cv=none; b=U3QJ7uUnp8tWDOhFzhREEhsrPz3VxmiGu2kLVmikbVvWnGDUuNGjCrzJ1tFD8MCDYVc0BV OsHN3V2buwJD7/AhX253uII8LF2OGP6uzfh0o+qGYzgk/HIH74fwnLX/swErqURvU+sbh9 RcKMktLU+dr0v316zKvYR/BlrY1tGD7k2EJweJNnMQPRG9M2LYWS5NUsrY6FcX4yEjLwZ6 29e01vmET0YY5bAYultb5EUuTbSErNkTdxGXNb3yKQWKI1rcT43aqmLzBxMEazWrHAdjb5 rhdgUPxoMRuCcu2yq2AVoI3AXGLWcJuOkcfAM0+bovtFWpqHKarglRf2FpvoEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by pstef: URL: https://cgit.FreeBSD.org/src/commit/?id=c8f0a1c6d756a0c5cf2fb4deb0234b7863b46fd6 commit c8f0a1c6d756a0c5cf2fb4deb0234b7863b46fd6 Author: Piotr Pawel Stefaniak AuthorDate: 2022-03-12 11:08:05 +0000 Commit: Piotr Pawel Stefaniak CommitDate: 2022-04-13 19:01:04 +0000 sh: fix autocompletion for commands that share name with a directory (cherry picked from commit 68700941c7ad58d6fa8eda82f3f370d87670fa6a) --- bin/sh/histedit.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c index f3100221d6ad..cf6bebad4c1a 100644 --- a/bin/sh/histedit.c +++ b/bin/sh/histedit.c @@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -70,12 +71,14 @@ History *hist; /* history cookie */ EditLine *el; /* editline cookie */ int displayhist; static FILE *el_in, *el_out; +static bool in_command_completion; static char *fc_replace(const char *, char *, char *); static int not_fcnumber(const char *); static int str_to_event(const char *, int); static int comparator(const void *, const void *, void *); static char **sh_matches(const char *, int, int); +static const char *append_char_function(const char *); static unsigned char sh_complete(EditLine *, int); /* @@ -540,8 +543,10 @@ static char size_t i = 0, size = 16, uniq; size_t curpos = end - start, lcstring = -1; + in_command_completion = false; if (start > 0 || memchr("/.~", text[0], 3) != NULL) return (NULL); + in_command_completion = true; if ((free_path = path = strdup(pathval())) == NULL) goto out; if ((matches = malloc(size * sizeof(matches[0]))) == NULL) @@ -634,6 +639,32 @@ out: return (matches); } +/* + * If we don't specify this function as app_func in the call to fn_complete2, + * libedit will use the default one, which adds a " " to plain files and + * a "/" to directories regardless of whether it's a command name or a plain + * path (relative or absolute). We never want to add "/" to commands. + * + * For example, after I did "mkdir rmdir", "rmdi" would be autocompleted to + * "rmdir/" instead of "rmdir ". + */ +static const char * +append_char_function(const char *name) +{ + struct stat stbuf; + char *expname = name[0] == '~' ? fn_tilde_expand(name) : NULL; + const char *rs; + + if (!in_command_completion && + stat(expname ? expname : name, &stbuf) == 0 && + S_ISDIR(stbuf.st_mode)) + rs = "/"; + else + rs = " "; + free(expname); + return (rs); +} + /* * This is passed to el_set(el, EL_ADDFN, ...) so that it's possible to * bind a key (tab by default) to execute the function. @@ -642,8 +673,8 @@ unsigned char sh_complete(EditLine *sel, int ch __unused) { return (unsigned char)fn_complete2(sel, NULL, sh_matches, - L" \t\n\"\\'`@$><=;|&{(", NULL, NULL, (size_t)100, - NULL, &((int) {0}), NULL, NULL, FN_QUOTE_MATCH); + L" \t\n\"\\'`@$><=;|&{(", NULL, append_char_function, + (size_t)100, NULL, &((int) {0}), NULL, NULL, FN_QUOTE_MATCH); } #else