03 Aug 2026 14:30:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785767448; 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=QwLBp3aHpcxN5zp4mZV4RJW2shZBkJjEFGvPEHFht70=; b=sexM8+R02XkiZFwf0Fz0xmaP7jmiIzbnNqAJuNJ1A3DHIFCMleFdpEAeqsZFftr5NtMe3f H5xfuaWgMxdYs2mi59d4fTM9NPY289uGfVfkdAJcvgWBkgPVmIVGbDRGxhABxQGqoHlQLO e77Ed+QRMXA0Em1wP0VtPpFJLIVqlhNNK1uQb5B6Ac+1yIVabeuFATo0c+pOA+xnwDv1uD vk8yVlzvM88fZ2B0hrVb8viB4o+MreQkDGBv6pGT00V+zpA3nUSKGkCp4leTENoaGaff9O uDWmXbNWPDUEJFN1nTs7+4Lt7fXv+vaQeqDJ/aY0pzKJYnJusg9ikWDNIhxhsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785767448; a=rsa-sha256; cv=none; b=DAdKbalThudhacgZBKXRRu/kniEf+QcZcSWMPYAk2uLOmSlynKuvUV9xpZTVWYyQZ8bycj k1N6EEWdUgchMttOwgmsC5xMdYbwHwbYwfBZ6H2s2vEpqaFHjy9ESiNBRTLFenfiIirkt+ G4XfTtSEhIpKvLOumOhyJMRE6j3YXHWD8YDpt73pLtoCR2bAiQXU/XQ7NW8o7CtfJZzM9G WGoevnQaMhbuxvkYlX/KjzzsiUar1UtKcl+6SaRS9K94mAadg3jcBXOt6Ad63xpPlWrLYB Wuwm+6twC/rqDbxz4+46amjQiyRc+Xw2En2brQAG63TlaABORkV9Abapq0UuAQ== 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=1785767448; 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=QwLBp3aHpcxN5zp4mZV4RJW2shZBkJjEFGvPEHFht70=; b=t3q+xb1Qwy0Nw3P/QMKLWkCF3POHAx7UFHlxadpzYv0f096P9bUVliy9PWCLmOeApR29LS BAnWHysDdPmxgem6JJ7dySn6HxTrLwipzLQeC9/TNtplH/ztom3SOHZ/OJkHu2hOWXwE2/ RIH/eWckavH3DeEOoeap0N+SanNkte5Vizvzv2fPYMo5TasbM8tCBeoel9fabBzwaDWwYa 82AQZtosQ6pcs+VjzCTiUzUKaANP1ZOnNXyzNAQTvA84uloxjBNnTI0vBUZCGZjc/BctQt ydoRwKk+fFfZBlknrN8EJaVEMDZrpMnp31OqpaB8cwVTsqMSq9+u8HK/+mq2ug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hDJxh2jJpz14V9 for ; Mon, 03 Aug 2026 14:30:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36a77 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 03 Aug 2026 14:30:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 9f18614d5353 - main - mandoc: Const correctness for C23 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 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f18614d5353ce513511ccbf59d09e76c93f7bc9 Auto-Submitted: auto-generated Date: Mon, 03 Aug 2026 14:30:48 +0000 Message-Id: <6a70a618.36a77.35390257@gitrepo.freebsd.org> The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=9f18614d5353ce513511ccbf59d09e76c93f7bc9 commit 9f18614d5353ce513511ccbf59d09e76c93f7bc9 Author: Lexi Winter AuthorDate: 2026-08-03 14:09:39 +0000 Commit: Lexi Winter CommitDate: 2026-08-03 14:09:39 +0000 mandoc: Const correctness for C23 On some platforms, e.g. Linux Clang 22.1.8 / glibc 2.43, strchr() now implements the C23 behaviour where passing a const pointer to strchr() also returns a const pointer. This breaks mandoc during the bootstrap build, since it assumes the return value is always a mutable pointer. In read.c, make the existing temporary pointer const, and for the mandoc_asprintf() call, add a new mutable local. In mdoc.c and out.c, since the data is mutable and is mutated here, remove const from the temporary pointers. MFC after: 1 week Reviewed by: fuz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D58495 --- contrib/mandoc/mdoc.c | 3 +-- contrib/mandoc/out.c | 4 ++-- contrib/mandoc/read.c | 10 ++++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/contrib/mandoc/mdoc.c b/contrib/mandoc/mdoc.c index 475a6aa0ddb3..90a079870f64 100644 --- a/contrib/mandoc/mdoc.c +++ b/contrib/mandoc/mdoc.c @@ -165,8 +165,7 @@ static int mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs) { struct roff_node *n; - const char *cp, *sp; - char *c, *ws, *end; + char *c, *ws, *end, *cp, *sp; n = mdoc->last; diff --git a/contrib/mandoc/out.c b/contrib/mandoc/out.c index 21c282b2141b..082e7e61e8af 100644 --- a/contrib/mandoc/out.c +++ b/contrib/mandoc/out.c @@ -457,8 +457,8 @@ static size_t tblcalc_literal(struct rofftbl *tbl, struct roffcol *col, const struct tbl_dat *dp, size_t mw) { - const char *str; /* Beginning of the first line. */ - const char *beg; /* Beginning of the current line. */ + char *str; /* Beginning of the first line. */ + char *beg; /* Beginning of the current line. */ char *end; /* End of the current line. */ /* Widths in basic units. */ diff --git a/contrib/mandoc/read.c b/contrib/mandoc/read.c index 0e8d32df5a5e..d958a25832b3 100644 --- a/contrib/mandoc/read.c +++ b/contrib/mandoc/read.c @@ -628,7 +628,7 @@ mparse_readfd(struct mparse *curp, int fd, const char *filename) int mparse_open(struct mparse *curp, const char *file) { - char *cp; + const char *cp; int fd, save_errno; cp = strrchr(file, '.'); @@ -645,10 +645,12 @@ mparse_open(struct mparse *curp, const char *file) */ if ( ! curp->gzip) { + char *fn; + save_errno = errno; - mandoc_asprintf(&cp, "%s.gz", file); - fd = open(cp, O_RDONLY); - free(cp); + mandoc_asprintf(&fn, "%s.gz", file); + fd = open(fn, O_RDONLY); + free(fn); errno = save_errno; if (fd != -1) { curp->gzip = 1;