From nobody Sun Feb 15 08:58:44 2026 X-Original-To: dev-commits-src-all@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 4fDKZX4yD0z6SGhQ for ; Sun, 15 Feb 2026 08:58:44 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDKZX3kV7z46l6 for ; Sun, 15 Feb 2026 08:58:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771145924; 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=UcHtWmgrOBcD8tsLT34w4VbFVevkKlCtHsRg4p8zpwE=; b=FeXcYzs+Ts+xwdMIithl9zGtY7Z+n2WDrhLl96XKvR3WWG7xsr8voNPLrBubhaLJ2Ccj9K 5W/wHUkr0/LetVkhFFjnBRY+XaxSTBBrdp3Zubo9Ie0CzioNPBJawtqbHA9bHRQh2Y3N1+ xmkKSd1dm/vtuQUX+ttgOEL4ObsARYkUaK5nsMSPIs7I7SjS0zTHuLYaytxcU2EGga3Wdh 7GmW7eunY8Sb8v8wdhWOKzqcsjNR3LXdmK7WPDKwR0I6XXOQMwXY9BK1EvoLeUZgcqghtV iGA9zcf3tetiff6dnsgzjLSZhhp4MTr5+fdR8b4n6gbzpcLqeGGaponkVW2d8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771145924; a=rsa-sha256; cv=none; b=PUcI+16gy7AUyDcs4dGn9AMMP6CbIZctnw6cF0++03NJxjwN+iGIVvrRCYO+fkRRGu72GR HMjFOE6j1vk7yfsNvWN8n+uMvl1qYjd+zzYj3gAnIdj2JXbrshD/moq0aXwXfI069d2pen +TF8EwemTDPR96bYHz9VDe5PGay8FHOxJgUbSTh3I06qq63LEs38RTn7a84KYI1t3VrONE 5MLyPT/8QWqpqOcAa8YWxlF8DK0CvKM++kZ2iGo/37Uje72zRk5/EG+1SNY2RDiXN/xyUV XIMxZMuWY3I0zygTVNL3+PvdjjAS28xk4xeRkKp21qXxf/Y6NrIv3Rxm3yU1Xg== 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=1771145924; 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=UcHtWmgrOBcD8tsLT34w4VbFVevkKlCtHsRg4p8zpwE=; b=fSp8Q0EeYsnyAJUSFKI7zbDdmqKm21+nOBNH0f+Ey0AcuQu8ExO3wj4Cr2bF9FmtBRYvj4 QSbCJji1IInryo1dpbtogfSaGY22WrT6WtJUqYMvPG6qapS2DKdTDp5JeqW3mB5ztMWGnj 285AOtwyQb0dvEYl+63Xt/lVTwdAXComJHMmCQSc3uXV6UKjSRkIoVXE2NXYtjYgddo6Wj 3yWOgHzLpfRTiilOzS7gJGVCGwbrPmDkBNx2AAv3lQUQ7kqofUZ6jpJtG1Jgg3b5c7C0y1 FgO+Y+eRSosYomuq3+3SXoxP8kXDWEkLENbbqDF5gMswfNvgJI1Zxz4TMjxw/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDKZX3C3FzmMl for ; Sun, 15 Feb 2026 08:58:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a06e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Feb 2026 08:58:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: ae75d4bdc12b - stable/14 - pwd: Clean up and adopt POSIX semantics List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: ae75d4bdc12bcdd30099bf35ce72f3452972b59f Auto-Submitted: auto-generated Date: Sun, 15 Feb 2026 08:58:44 +0000 Message-Id: <69918ac4.1a06e.5f8f1e61@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=ae75d4bdc12bcdd30099bf35ce72f3452972b59f commit ae75d4bdc12bcdd30099bf35ce72f3452972b59f Author: Dag-Erling Smørgrav AuthorDate: 2026-02-10 14:29:04 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-15 08:58:34 +0000 pwd: Clean up and adopt POSIX semantics According to POSIX, the default should be -L. Based on code history, whoever first wrote BSD pwd(1) could not figure out how to implement -L and therefore made -P the default (and only) option. Support for -L was later added, but the default was never changed. Clean up the code, make -L the default, and rewrite getcwd_logical() to reject paths that contain dot or dot-dot, as required by POSIX. MFC after: 1 week Reviewed by: olce Differential Revision: https://reviews.freebsd.org/D55146 (cherry picked from commit 2df923c5d2d02350abc29f61b603c5b9615b225c) --- bin/pwd/pwd.1 | 4 +-- bin/pwd/pwd.c | 99 +++++++++++++++++++++++++++++++---------------------------- 2 files changed, 54 insertions(+), 49 deletions(-) diff --git a/bin/pwd/pwd.1 b/bin/pwd/pwd.1 index 40f5b023f19f..e791de1332f5 100644 --- a/bin/pwd/pwd.1 +++ b/bin/pwd/pwd.1 @@ -31,7 +31,7 @@ .\" .\" @(#)pwd.1 8.2 (Berkeley) 4/28/95 .\" -.Dd May 22, 2023 +.Dd Februrary 6, 2026 .Dt PWD 1 .Os .Sh NAME @@ -62,7 +62,7 @@ Display the physical current working directory (all symbolic links resolved). .El .Pp If no options are specified, the -.Fl P +.Fl L option is assumed. .Sh ENVIRONMENT Environment variables used by diff --git a/bin/pwd/pwd.c b/bin/pwd/pwd.c index 47e2bc1ffdd5..e8ce4cabc01a 100644 --- a/bin/pwd/pwd.c +++ b/bin/pwd/pwd.c @@ -3,6 +3,7 @@ * * Copyright (c) 1991, 1993, 1994 * The Regents of the University of California. All rights reserved. + * Copyright (c) 2026 Dag-Erling Smørgrav * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -43,40 +44,74 @@ static char sccsid[] = "@(#)pwd.c 8.3 (Berkeley) 4/1/94"; #include #include #include -#include #include -#include +#include #include #include #include -static char *getcwd_logical(void); -void usage(void); +static char * +getcwd_logical(void) +{ + struct stat log, phy; + char *pwd, *p, *q; + + /* $PWD is set and absolute */ + if ((pwd = getenv("PWD")) == NULL || *pwd != '/') + return (NULL); + /* $PWD does not contain /./ or /../ */ + for (p = pwd; *p; p = q) { + for (q = ++p; *q && *q != '/'; q++) + /* nothing */; + if ((*p == '.' && q == ++p) || + (*p == '.' && q == ++p)) + return (NULL); + } + /* $PWD refers to the current directory */ + if (stat(pwd, &log) != 0 || stat(".", &phy) != 0 || + log.st_dev != phy.st_dev || log.st_ino != phy.st_ino) + return (NULL); + return (pwd); +} + +static char * +getcwd_physical(void) +{ + static char pwd[MAXPATHLEN]; + + return (getcwd(pwd, sizeof(pwd))); +} + +static void +usage(void) +{ + (void)fprintf(stderr, "usage: pwd [-L | -P]\n"); + exit(1); +} int main(int argc, char *argv[]) { - int physical; - int ch; - char *p; + char *pwd; + int opt; + bool logical; - physical = 1; - while ((ch = getopt(argc, argv, "LP")) != -1) - switch (ch) { + logical = true; + while ((opt = getopt(argc, argv, "LP")) != -1) { + switch (opt) { case 'L': - physical = 0; + logical = true; break; case 'P': - physical = 1; + logical = false; break; - case '?': default: usage(); } + } argc -= optind; argv += optind; - if (argc != 0) usage(); @@ -84,40 +119,10 @@ main(int argc, char *argv[]) * If we're trying to find the logical current directory and that * fails, behave as if -P was specified. */ - if ((!physical && (p = getcwd_logical()) != NULL) || - (p = getcwd(NULL, 0)) != NULL) - printf("%s\n", p); + if ((logical && (pwd = getcwd_logical()) != NULL) || + (pwd = getcwd_physical()) != NULL) + printf("%s\n", pwd); else err(1, "."); - exit(0); } - -void __dead2 -usage(void) -{ - - (void)fprintf(stderr, "usage: pwd [-L | -P]\n"); - exit(1); -} - -static char * -getcwd_logical(void) -{ - struct stat lg, phy; - char *pwd; - - /* - * Check that $PWD is an absolute logical pathname referring to - * the current working directory. - */ - if ((pwd = getenv("PWD")) != NULL && *pwd == '/') { - if (stat(pwd, &lg) == -1 || stat(".", &phy) == -1) - return (NULL); - if (lg.st_dev == phy.st_dev && lg.st_ino == phy.st_ino) - return (pwd); - } - - errno = ENOENT; - return (NULL); -}