From nobody Sat Jun 27 01:11:40 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 4gnDyj1Z9pz6jGkJ for ; Sat, 27 Jun 2026 01:11:41 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gnDyh2fwBz3DL3 for ; Sat, 27 Jun 2026 01:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782522700; 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=tPI5xyTKmoxHZ2FVzRlBz8CCVI+JKMlfHyipoJG7WsU=; b=HCEyCT3IxaLGd9Cguzka1XFG3FBe6l84u2ZcHmWQv4t36CMYhld0kV6uGB3MBsEcbIyfzF 3JaeoJeiK2IXSOwXmlGL09pY9ZX3k0HERqjPehW+K7084pAT8/w3/BJWjakF8nOfyXk9hI oBuoiklR2viijKJWoI9w79/4v5eQPtmtsuWE3BVxKgOs4duIV4OZLm+uEdsf0/NqZcZ7r6 ngiiPCP0nyZDj4b2PWmVg177RccXiY8vd8sgZPVAArWIFKhDqIlRskJAAk2VB7fATxY/ox VnOIAN4ION+C5PsbSa14RzW9ONTIG2q0w2/vjtgzdOIiMFLYiUw+lCgTCUCkcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782522700; a=rsa-sha256; cv=none; b=vVQhugoS5Ypz9dZNa/LRZ5GpkdxmKvN6e7oLPNa+JTXlTkdHYGjqKAQUFHe0DnWG4nEAxI a0Y36X95OYr/ggGM8n2XkC8fTLclpG93TE5FQ3dhf+4dm+3JBw1E7mye2qUtK961hgm89B 16xPU7qqIPJtDJzvIGxgvANhn3eeSCFr2mga/CSfkRcrrvOMTOXbmxJCw6r8BJ9319jGMK gSLA+siwDxinV/8iVucmTmpm3L5/ilrYgoi370w1kt51f57WMdzI/lQpVhtuDoz7sWgZF5 pdIxc9EoNMR/YYcwmUS7bPvCzAs2MQTQO4lPBT7ZC0iIsMm4ViFL33XRHEOzkg== 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=1782522700; 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=tPI5xyTKmoxHZ2FVzRlBz8CCVI+JKMlfHyipoJG7WsU=; b=e6lw/U+sF1Qs1Bp8tA7i0fSJXRDGdBRcaHgRcSlpHvdTCE5p7C6KIp9Xkx9WFnhFObtQAs A3iqA3n466dxvrdjkitXxLg7/B5NP3z+GF2O2VJqocsnzPs2FEB3mFD9oCItCSvr8bFcXu YzZlV4Rg0T3dvl6XO1nBP0rFRFD1RICdAXFEGIp1eiDwR/Cz6hLltc1cr4Qfi/Z/2RUb1p inuMuJrxVS+kl3OwG4Pi9917VHH8Z6DgoF1lpcHiEUeiW87Kitkcvs/a0befC0k/Exbejw n2/Yrtm8yPpue+9O8zEpLv8JlEdLpRsdvRqbvyaWUugsPpGNrsMazQNCwLFVJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnDyh0thRz12rL for ; Sat, 27 Jun 2026 01:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a4da by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 27 Jun 2026 01:11:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Aymeric Wibo Subject: git: 3d6a475afbf5 - stable/15 - ctermid(3): Fix return values section 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3d6a475afbf5c596c3494a5b40a4ba3545f955ff Auto-Submitted: auto-generated Date: Sat, 27 Jun 2026 01:11:40 +0000 Message-Id: <6a3f234c.1a4da.5add5584@gitrepo.freebsd.org> The branch stable/15 has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=3d6a475afbf5c596c3494a5b40a4ba3545f955ff commit 3d6a475afbf5c596c3494a5b40a4ba3545f955ff Author: Aymeric Wibo AuthorDate: 2026-06-19 14:21:12 +0000 Commit: Aymeric Wibo CommitDate: 2026-06-27 01:09:41 +0000 ctermid(3): Fix return values section ctermid() doesn't, and has never, set errno. While here, add ctermid_r to the name section and align the parameter name in the source file. Reviewed by: bnovkov Approved by: bnovkov MFC after: 3 days Obtained from: https://github.com/apple-oss-distributions/libc Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D57396 (cherry picked from commit dc24f31b67f5b0bac35cb93470f6f2d065d99f6f) --- lib/libc/gen/ctermid.3 | 25 +++++++++++++++---------- lib/libc/gen/ctermid.c | 14 +++++++------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/lib/libc/gen/ctermid.3 b/lib/libc/gen/ctermid.3 index 2a53412f1b29..daf59f32c157 100644 --- a/lib/libc/gen/ctermid.3 +++ b/lib/libc/gen/ctermid.3 @@ -25,11 +25,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 1, 2011 +.Dd June 2, 2026 .Dt CTERMID 3 .Os .Sh NAME -.Nm ctermid +.Nm ctermid , +.Nm ctermid_r .Nd generate terminal pathname .Sh LIBRARY .Lb libc @@ -78,14 +79,18 @@ If no suitable lookup of the controlling terminal name can be performed, this implementation returns .Ql /dev/tty . .Sh RETURN VALUES -Upon successful completion, a -.Pf non- Dv NULL -pointer is returned. -Otherwise, a -.Dv NULL -pointer is returned and the global variable -.Va errno -is set to indicate the error. +The +.Fn ctermid +function returns +.Fa buf +if it is +.Pf non- Dv NULL , +otherwise it returns the address of a static buffer. +The +.Fn ctermid_r +function always returns +.Fa buf , +even if it is the NULL pointer. .Sh ERRORS The current implementation detects no error conditions. .Sh SEE ALSO diff --git a/lib/libc/gen/ctermid.c b/lib/libc/gen/ctermid.c index fb117b3c8ded..1ca2401f0c1d 100644 --- a/lib/libc/gen/ctermid.c +++ b/lib/libc/gen/ctermid.c @@ -39,32 +39,32 @@ #define LEN_PATH_DEV (sizeof(_PATH_DEV) - 1) char * -__ssp_real(ctermid)(char *s) +__ssp_real(ctermid)(char *buf) { static char def[sizeof(_PATH_DEV) + SPECNAMELEN]; struct stat sb; size_t dlen; int sverrno; - if (s == NULL) { - s = def; + if (buf == NULL) { + buf = def; dlen = sizeof(def) - LEN_PATH_DEV; } else dlen = L_ctermid - LEN_PATH_DEV; - strcpy(s, _PATH_TTY); + strcpy(buf, _PATH_TTY); /* Attempt to perform a lookup of the actual TTY pathname. */ sverrno = errno; if (stat(_PATH_TTY, &sb) == 0 && S_ISCHR(sb.st_mode)) - (void)sysctlbyname("kern.devname", s + LEN_PATH_DEV, + (void)sysctlbyname("kern.devname", buf + LEN_PATH_DEV, &dlen, &sb.st_rdev, sizeof(sb.st_rdev)); errno = sverrno; return (s); } char * -__ssp_real(ctermid_r)(char *s) +__ssp_real(ctermid_r)(char *buf) { - return (s != NULL ? ctermid(s) : NULL); + return (buf != NULL ? ctermid(buf) : NULL); }