From nobody Mon Aug 3 14:30:42 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 4hDJxb2qbcz6nV3s for ; Mon, 03 Aug 2026 14:30:43 +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 4hDJxb0s0Bz3sqV for ; Mon, 03 Aug 2026 14:30:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785767443; 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=LS+26SPmXg2Nmd0214gWyTWBtGoZoHkkwk2iPqWWYY8=; b=TU5It614dRghHkFYJ1qkpu/oFJL4wzlL9VyXCI05gUTZPU9iDQKZm4QlR//ffT4zhpCnUG Gk1Cknt4Wr1CRoKypb5dUbPlzfxWlgdKOuEMJHUiUd7mGgldF9GPTV3XOrGWzvJ2RCoeM+ cj9ptiDeHKu3S01++0e0SxmcnWaw6qC8RSzVU8B3V3s7i+m9WPSZMEk8VcobtUsDzFLK1m QB8CT/ZpwFDuVtwnAHM0OjPMPGlvCeDFsYL8U62GFKUft+yK1/KiL2Y4zupb6nUp6MSx/F ia+4QSoz8iLJVS0ko1TlN04hCUE2yf5jha0/rJAdLWoG97ZbMmxl0eKn2/O9HA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785767443; a=rsa-sha256; cv=none; b=o+v5MQRDwJ1yi8pKF97IgvpANVYZDWVw4dQ1/yHFlfJmubcBskSuLcUzdGDWgeJFrGKd7i MqiYiuW2rGkB4A2Chl0kenrlJEs+KVD5nF3Tm+NuANCIDiRpI18SrQgu1korhv6B0HBzPj edWvS1bCBm8ChZ59roKWDFWYA9amL7Q57mwCOBYrHHWUgC3DpQi16ovKwU/TyCbZ1PXSW5 94bHXzh5+iNbWl67cz3pEK5i2EpNXsDn8SpPhTbeyNL41h2+6CmUBV8GhgxW2l3htC2i/q mmFQYJTCNXecz/VkM3cANtJu1427IbR3+vabvymzPWW47pc7a1kBAEJEkqT6fQ== 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=1785767443; 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=LS+26SPmXg2Nmd0214gWyTWBtGoZoHkkwk2iPqWWYY8=; b=GGJgMieLVb4dF/HcIptE30U7hBlbG+5uAQt6zOdtScbPBKyXDmmvfNRGcbGGrspa7Lnfk3 xXzHr+b+LGg9zySwJqZENas0//5Y5UcjtjXY0ufmULXejHHSYTUr7NC7lNYI21Mxq6KtDK UJoc2/cgNFzOwibAKFxKwege/Sq8TFc956767uPLwebvONvsYlCM2fSYJoh37PBfSOb2N0 GTuVBgsx6+qmJBTBNnCQ6WMmuEzwXy0RfqgHidod3qkn7dk7tJ86cu/ZWdKXFiFFGS5/vM N18KI6SdQLlGIzSCvD5TlLgdU9D3CHvk1clO5Llg9T2DFZ+Tryzcf0nuAlsDOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hDJxZ6WJ6z14Lp for ; Mon, 03 Aug 2026 14:30:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37216 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 03 Aug 2026 14:30:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: bcee560d390e - main - libucl: Const correctness for C23 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bcee560d390eb8aa8fd0f08a7a0bffb6e77fffc6 Auto-Submitted: auto-generated Date: Mon, 03 Aug 2026 14:30:42 +0000 Message-Id: <6a70a612.37216.46f0d6fb@gitrepo.freebsd.org> The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=bcee560d390eb8aa8fd0f08a7a0bffb6e77fffc6 commit bcee560d390eb8aa8fd0f08a7a0bffb6e77fffc6 Author: Lexi Winter AuthorDate: 2026-08-03 14:05:09 +0000 Commit: Lexi Winter CommitDate: 2026-08-03 14:05:09 +0000 libucl: 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 libucl during the bootstrap build, since it assumes the return value is always a mutable pointer. Instead of assigning directly to params->prefix (which is const), use a non-const temporary variable and assign the result after we've done the modification. MFC after: 1 week Reviewed by: bofh, bapt Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D58490 --- contrib/libucl/src/ucl_util.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/contrib/libucl/src/ucl_util.c b/contrib/libucl/src/ucl_util.c index a56d8b27ad65..3b732a58701c 100644 --- a/contrib/libucl/src/ucl_util.c +++ b/contrib/libucl/src/ucl_util.c @@ -1088,7 +1088,7 @@ ucl_include_file_single(const unsigned char *data, size_t len, bool res; struct ucl_chunk *chunk; unsigned char *buf = NULL; - char *old_curfile, *ext; + char *old_curfile, *ext, *tmp; size_t buflen = 0; char filebuf[PATH_MAX], realbuf[PATH_MAX]; int prev_state; @@ -1200,12 +1200,13 @@ ucl_include_file_single(const unsigned char *data, size_t len, if (params->use_prefix && params->prefix == NULL) { /* Auto generate a key name based on the included filename */ - params->prefix = basename(realbuf); - ext = strrchr(params->prefix, '.'); + tmp = basename(realbuf); + ext = strrchr(tmp, '.'); if (ext != NULL && (strcmp(ext, ".conf") == 0 || strcmp(ext, ".ucl") == 0)) { /* Strip off .conf or .ucl */ *ext = '\0'; } + params->prefix = tmp; } if (params->prefix != NULL) { /* This is a prefixed include */