From nobody Wed Feb 19 16:55:21 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 4YyjF60VWRz5pc8C; Wed, 19 Feb 2025 16:55:22 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YyjF600hkz3gqV; Wed, 19 Feb 2025 16:55:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739984122; 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=IBMEGpOmwJwGL/8/NizqCICAH9uyhG7lXLOn7ms1dD0=; b=QbbjZB+goS7JYV2mmNfTeOgojcuf4UXdtBBhJZzQBlQEIqZwPTJOil/4Cih1DOX6/MmNpI hKgy7Okj5u/3lSFIkk6Dryj8TEXgZZDohWnL13O5nHEbjl62pIY2vVv2vjTK4KXrVU9bC+ e4LLWSKZUlGWp8SmONdM7snNXx5WWhePSteIW93OU/D1qUnvEj8riw0XuW0FoBpSThKtLi dN3brbcTAsi8zeBznsG55AOfOj+p9i1n1k4ontXJ1B6K/opdTbNjBoQwYuxTrfPenJ/gg6 raHztowWHhvcudyR3zx0GYzVqZ+VFlLY6jdz89cToMinl1mAcmbkqb8hhR3wgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739984122; a=rsa-sha256; cv=none; b=jwJ9zNexpJF9yeiLPW/dEZfeEwxDEtNI/4LXpbwUgcHlqAFHjdW9uD6s5RxGt+aSZMMNh5 jd8bEzaPkt0T/POSMVNAIC/sbxOrYxlxZxbfd0EbQjhebk7UiKIdQ0CBJCep0R6NuLHSS4 7aMWyNX5NxuYHo+SuvZGbAjXXPFLBbbgxcIEY8RR2v7ZzD7CpHVwQvkOTUPMfzDxlW8v+T e4PhMEk3y5UEgyNVe2MdXxBvxKdowD0ZfLHNGHe54cWDn7qH/rSY3cSImIhRPj/KUAQt3+ 0vAnzjaIamdwi9Ksm0gFkN5vud7sCzGs2ZE2Jcctls40xnrfB+WNJi40fJjAiA== 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=1739984122; 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=IBMEGpOmwJwGL/8/NizqCICAH9uyhG7lXLOn7ms1dD0=; b=lkIRAzl4q5kUbYE+SZnFIY7Io8nswoVo6WUH/q8rANxXxeA8CAjJmDusKiHiwd8weSW/gr BeFRJ/59xJR+vr62fggMoX00pyBYF3LdRR02fn9Bc4WWzK99BGC9GeMErG1FyWkfDVlwuM PSRy+1SzxmSv0xqsgsm6/7Q1jLBUpkAtMhHDMlINIFmNNOEW+2F3Px6YHCYkl5qeV/cPwo 0O0TGtKYJ7EIlj/c/ALv/8xkZATW4Cyre/bxjraJ6uvk0eamvPJuYJ5oXau7LsIV918dry 2dZKcmA2hsSKrJ9PI8WocqLwX3TJuQL5ajJNNL08ZTopQvfxivllNnMu1G+0fg== 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 4YyjF56Smpz1Cg7; Wed, 19 Feb 2025 16:55:21 +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 51JGtL6E039288; Wed, 19 Feb 2025 16:55:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51JGtLvS039285; Wed, 19 Feb 2025 16:55:21 GMT (envelope-from git) Date: Wed, 19 Feb 2025 16:55:21 GMT Message-Id: <202502191655.51JGtLvS039285@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: ed955671d2e8 - main - libc: use __sys___realpathat directly in realpath 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed955671d2e844f274dd8245aa3c5c7e9dcdc77a Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=ed955671d2e844f274dd8245aa3c5c7e9dcdc77a commit ed955671d2e844f274dd8245aa3c5c7e9dcdc77a Author: Brooks Davis AuthorDate: 2025-02-19 16:52:04 +0000 Commit: Brooks Davis CommitDate: 2025-02-19 16:55:04 +0000 libc: use __sys___realpathat directly in realpath We don't need to use an interposable symbol for this purpose and it's simpler to just call the syscall in libsys. This resolves a bug where we were incorrectly using __realpathat in libc not libsys. While here, drop support for running on a FreeBSD 12 kernel and simplify includes. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D49048 --- lib/libc/stdlib/realpath.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/libc/stdlib/realpath.c b/lib/libc/stdlib/realpath.c index 28348ea9e226..4c52b73319ab 100644 --- a/lib/libc/stdlib/realpath.c +++ b/lib/libc/stdlib/realpath.c @@ -28,21 +28,16 @@ * SUCH DAMAGE. */ -#include "namespace.h" #include #include #include #include +#include #include #include #include #include -#include "un-namespace.h" -#include "libc_private.h" - -extern int __realpathat(int fd, const char *path, char *buf, size_t size, - int flags); /* * Find the real name of path, by removing all ".", ".." and symlink @@ -224,9 +219,8 @@ __ssp_real(realpath)(const char * __restrict path, char * __restrict resolved) if (resolved == NULL) return (NULL); } - if (__getosreldate() >= 1300080) { - if (__realpathat(AT_FDCWD, path, resolved, PATH_MAX, 0) == 0) - return (resolved); + if (__sys___realpathat(AT_FDCWD, path, resolved, PATH_MAX, 0) == 0) { + return (resolved); } res = realpath1(path, resolved); if (res == NULL)