From nobody Thu Jul 24 02:53:24 2025 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 4bnbD54fstz5pxk3; Thu, 24 Jul 2025 02:53:25 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bnbD46WbMz3RcG; Thu, 24 Jul 2025 02:53:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753325604; 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=4H0eNOsQd148XQBE+lbmFqQf32TGcSbkv8YovmPrVAQ=; b=V6VB2R5ILTpSzSsqcgpEzGTeXrGFguXH7l+/OsGURwy9F2GwAlPhSA+RoUXZ39NBsRerd5 suQdb6RB/GItOIJmNYIHMxKmECC+wuYMQufGmBQykvmANfPSK+OBfxJIHg8FJNE0wm2ulV cG+6Oe5J8O5krqubdFEdI9hraDT1p6bpJ52ihsi1APe0d4saaIdLtioYi08MI5IjPc1Dep sJwfl3kZaScO2sS/AAXDK5jvijzeIgrWetAVjG/JmC3qLzZJu8B3h9LoWrEMy3YZekdzOn kDtZzRiS8bSirRTqXoVNL8hi/UZTqTs1c7UtQ8JuCA+3esp9ZOBGMkErrh214A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753325604; 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=4H0eNOsQd148XQBE+lbmFqQf32TGcSbkv8YovmPrVAQ=; b=Uy1LQ4BPkUiglTHvsMzuC9W+donp8xE7HPYb8IqF45GB9klMRtEhgM6Xz5qyqBElnhSzBy OpsP/yG+ZISDEy7CngZBt7Zx2IQEJeHdn+ut4qu8vfZwRdmW6gXvPUo53iQaq0KeDT/Wde ZhIIWiDkLBUn7OnK5ziQjhYZxjQryvsEey5pZWp7u0jnY7XWaqlT0HZnvuvLmtkJbCSDb5 1eghXrSUeqtpaRSiRUdpp8a32mMNa84uE/62349UegPMfBHxGJ5VgArQifKQqmWnjOVLBd OVmfsw425d9b7pG5seYF222Z6yIp8zQoBgTalosLUtrjfiywVRnAvtOyOyltjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753325604; a=rsa-sha256; cv=none; b=BxSRIoGsq0Dyew6Y3JO3wrYv+hlpoG3r6hDGj39zJR6Q8g+Utw/rMak6VaauJo72fKEmTb kqjIWA6fKOfxvuaZe56YDhuLeNXVbUSsJf+UHF98uY7+HbsNfSstVNKi1bLKOsgD7SsVtL sUwbTV3BoXClWYCD1RvLaI6KpIIdFU/Jk1gvdCgAl4/uMPiYrDejMODdLmm8M74v/WmwCP A929FP969z1dUGN40l+Q9xPRiZRjulxeVCprCgYvLaix3qyP2XJY5+HpUGwaV3ZVMhTc7f pRb1nIV7ePqMS5DHEHDkfp+8846+XIbP3Dad16neu3ri99QYYusGZnLTkq5NIg== 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 4bnbD464Mqzgq7; Thu, 24 Jul 2025 02:53:24 +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 56O2rOBT044422; Thu, 24 Jul 2025 02:53:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56O2rOjC044419; Thu, 24 Jul 2025 02:53:24 GMT (envelope-from git) Date: Thu, 24 Jul 2025 02:53:24 GMT Message-Id: <202507240253.56O2rOjC044419@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 442f01cb8860 - stable/14 - msdosfs: replace '/' in direntries with '?' 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 442f01cb8860226685e378c222a57614d941825d Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=442f01cb8860226685e378c222a57614d941825d commit 442f01cb8860226685e378c222a57614d941825d Author: Konstantin Belousov AuthorDate: 2025-07-17 01:12:05 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-24 02:52:25 +0000 msdosfs: replace '/' in direntries with '?' PR: 288266 (cherry picked from commit 29af6d2e2ec9fe8df7cf1e1a0bf3597028831b18) --- sys/fs/msdosfs/msdosfs_conv.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_conv.c b/sys/fs/msdosfs/msdosfs_conv.c index da4848169173..208b64930e61 100644 --- a/sys/fs/msdosfs/msdosfs_conv.c +++ b/sys/fs/msdosfs/msdosfs_conv.c @@ -797,19 +797,24 @@ mbsadjpos(const char **instr, size_t inlen, size_t outlen, int weight, int flag, static u_char * dos2unixchr(u_char *outbuf, const u_char **instr, size_t *ilen, int lower, struct msdosfsmount *pmp) { - u_char c, *outp; - size_t len, olen; + u_char c, *outp, *outp1; + size_t i, len, olen; outp = outbuf; if (pmp->pm_flags & MSDOSFSMNT_KICONV && msdosfs_iconv) { olen = len = 4; + outp1 = outp; if (lower & (LCASE_BASE | LCASE_EXT)) msdosfs_iconv->convchr_case(pmp->pm_d2u, (const char **)instr, ilen, (char **)&outp, &olen, KICONV_LOWER); else msdosfs_iconv->convchr(pmp->pm_d2u, (const char **)instr, ilen, (char **)&outp, &olen); + for (i = 0; i < outp - outp1; i++) { + if (outp1[i] == '/') + outp1[i] = '?'; + } len -= olen; /* @@ -826,6 +831,8 @@ dos2unixchr(u_char *outbuf, const u_char **instr, size_t *ilen, int lower, struc c = dos2unix[c]; if (lower & (LCASE_BASE | LCASE_EXT)) c = u2l[c]; + if (c == '/') + c = '?'; *outp++ = c; outbuf[1] = '\0'; }