From nobody Tue Apr 15 17:58:16 2025 X-Original-To: dev-commits-src-main@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 4ZcX2J6Qyqz5tXqv; Tue, 15 Apr 2025 17:58:16 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZcX2J1NpSz3k61; Tue, 15 Apr 2025 17:58:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744739896; 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=W3b7fxY4i7dN2fhrACMeEhGfiASpTXYbGIPyWI/ahF4=; b=iwDZqSqmnyTWf7xckTYvUPyy3WQmfySMN29lt4tudpYuhhe4OcRJpoJZLCzKU7Kn+Eond5 95P7GF2uCfZdemK0P8mAWuwlwM1/4bdtVrWrO6SQg5EnS7F3bGgT4amT15P7tGK/IuPGvT SjKZXzxU8YqdhWVvLPV1qF5ITDSRljlyzIzVgTnyx67TKfgeVGLKUOkJDINtbquyxq/X3n XI9A+XVfmxH94gZiHOaiL9i6oQGf8e9bdWsEJfLVOYlREMayNShhnyGiJ9rfmOwzginWzV DfEQnXqZdumMs74cTpePynOrYI8YKMsrKTvnzt16YD0AnBjPu4USGiZvSm7U6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744739896; a=rsa-sha256; cv=none; b=a3E3+mdpb5QCAsDZZq7+4I2X3ma12QGsxMkgMOd8PRc8XSdGftvlBdd7pyPBGnlsXr5f4a bfV6RF1D7OdL9MIs1Fe9tOLSo1LwkscNgLDuViDbkD8jz5rW4g3pqhphZ8Jd1FZIWTPbY1 XD+tcEBJ768oTu+9+HQTw9zDjUu2kkSJKB1n5rDZBxyC02qK8F9f9usqtoHStvJR15eVnh rC6Z8F7Iis4+Su+FWQGEIctZuPrYmdbvr+9dPDGVcpc8CAfjdj9iSBHVpiPu+ir5Esg3Hm YtPRv92M3ANWYSGIOi6IUsOeRkdvthD+72jEJnD0zmsEl7eP9y+gRcpTLisHcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744739896; 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=W3b7fxY4i7dN2fhrACMeEhGfiASpTXYbGIPyWI/ahF4=; b=Nfg6wtF6am7WOZpiGkw39JCUmBnd4PZ3L4BIVhHpyVg3kcfla75rG3cCkV+iTh4Nhp2yH7 JYNvG+l5WMSSMEoc9qJox8JZisg3bYSkBSb5PVKiUCib7qMRmFCXxhJgB3zqp6WsuVWYDZ fphs8u1PvEYQqZ1sih+AvOZvJro9+Px5UIKs7C4mWC7/Uqpy+3ZKSNeOV0nbk3hqhWE8xA BeRB6PsF1ClBCJkSeOMl3fOPp27Y2GkYZMXEhrqm7GATsE1srmBFVBYnzqP/0TodH6dWqb fpdltbNppVLldCeQ80UILKlwZxdxgUbSemOB9F/Bw+e0DZtHI8AwZEuxrWHM5Q== 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 4ZcX2J0vmKzkqL; Tue, 15 Apr 2025 17:58:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53FHwGxh059404; Tue, 15 Apr 2025 17:58:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53FHwGHk059401; Tue, 15 Apr 2025 17:58:16 GMT (envelope-from git) Date: Tue, 15 Apr 2025 17:58:16 GMT Message-Id: <202504151758.53FHwGHk059401@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 8ce85300c792 - main - ln: Tweak append logic. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ce85300c792ecfcb9a307577e3af96ea9a4544c Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=8ce85300c792ecfcb9a307577e3af96ea9a4544c commit 8ce85300c792ecfcb9a307577e3af96ea9a4544c Author: Dag-Erling Smørgrav AuthorDate: 2025-04-15 17:57:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-04-15 17:57:52 +0000 ln: Tweak append logic. If the target is "." or ends in "/" or "/.", we always want to append the source's basename, even in the Fflag case. MFC after: never Relnotes: yes Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D49842 --- bin/ln/ln.c | 34 +++++++++++++++++++++++++++------- bin/ln/tests/ln_test.sh | 6 +++++- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/bin/ln/ln.c b/bin/ln/ln.c index 6300658effa1..3055c7563cca 100644 --- a/bin/ln/ln.c +++ b/bin/ln/ln.c @@ -212,6 +212,13 @@ samedirent(const char *path1, const char *path2) return sb1.st_dev == sb2.st_dev && sb1.st_ino == sb2.st_ino; } +/* + * Create a link to source. If target is a directory (and some additional + * conditions apply, see comments within) the link will be created within + * target and have the basename of source. Otherwise, the link will be + * named target. If isdir is true, target has already been determined to + * be a directory; otherwise, we will check, if needed. + */ static int linkit(const char *source, const char *target, bool isdir) { @@ -221,7 +228,7 @@ linkit(const char *source, const char *target, bool isdir) struct stat sb; const char *p; int ch, first; - bool exists; + bool append, exists; if (!sflag) { /* If source doesn't exist, quit now. */ @@ -238,14 +245,27 @@ linkit(const char *source, const char *target, bool isdir) } /* - * If the target is a directory (and not a symlink if hflag), - * append the source's name, unless Fflag is set. + * Append a slash and the source's basename if: + * - the target is "." or ends in "/" or "/.", or + * - the target is a directory (and not a symlink if hflag) and + * Fflag is not set */ - if (!Fflag && (isdir || - (lstat(target, &sb) == 0 && S_ISDIR(sb.st_mode)) || - (!hflag && stat(target, &sb) == 0 && S_ISDIR(sb.st_mode)))) { + if ((p = strrchr(target, '/')) == NULL) + p = target; + else + p++; + append = false; + if (p[0] == '\0' || (p[0] == '.' && p[1] == '\0')) { + append = true; + } else if (!Fflag) { + if (isdir || (lstat(target, &sb) == 0 && S_ISDIR(sb.st_mode)) || + (!hflag && stat(target, &sb) == 0 && S_ISDIR(sb.st_mode))) { + append = true; + } + } + if (append) { if (strlcpy(bbuf, source, sizeof(bbuf)) >= sizeof(bbuf) || - (p = basename(bbuf)) == NULL || + (p = basename(bbuf)) == NULL /* can't happen */ || snprintf(path, sizeof(path), "%s/%s", target, p) >= (ssize_t)sizeof(path)) { errno = ENAMETOOLONG; diff --git a/bin/ln/tests/ln_test.sh b/bin/ln/tests/ln_test.sh index 82bc556842d8..78b4074aea18 100644 --- a/bin/ln/tests/ln_test.sh +++ b/bin/ln/tests/ln_test.sh @@ -170,11 +170,15 @@ sfF_flag_head() } sfF_flag_body() { - atf_check mkdir A B C + atf_check mkdir A B C D D/A atf_check ln -sF A C atf_check_symlink_to A C atf_check ln -sfF B C atf_check_symlink_to B C + atf_check ln -sfF A D/ + atf_check_symlink_to A D/A + atf_check ln -sfF ../A . + atf_check_symlink_to ../A A } atf_test_case s_flag