From nobody Thu Jul 17 21:54:16 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 4bjmsh6szSz62JbF; Thu, 17 Jul 2025 21:54:16 +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 4bjmsh2KZ6z3Kkg; Thu, 17 Jul 2025 21:54:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752789256; 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=sMKfsbYVc50XpZEiapm8gVE7YWxOdTrxmiI5mnp6f2c=; b=YUeb+rrW+6LLd+JctW/P+uU+zT9EUfEYH31tePuz83T+paCm74YFxeFewJ95IfPVq7Gxhm SyqKx/f8JvsxBXFU9BlM3yAYBuVA5QJeMQF+j+rBx4zwmhxqaY/beGAXgHy4XlbV28Y+cO FGCFHVwbbDj+hIrXoBOsyji8Rc1wsfv6uTaPTgzONXMSwfxqjG/6rm6oaIY8ZFQP7fdYyp Zx7rnA8WXJxufnWwSqj57DeJRr5snB0vc+Ww4XPvlVLdHHOWPeYIv4viyOBCJWqE+9jhRI +wCwUTU44fMvniUvQyAuQvGT/b5nEHKmeXQi7+kwqsN2cTVhn0dSeqqen1zo3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752789256; 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=sMKfsbYVc50XpZEiapm8gVE7YWxOdTrxmiI5mnp6f2c=; b=eY8FCzfsAFOO0l+jYGugg4imi1PSzuAJlu5n0e8+7vClVLYHN0ntYHaRfrme87sS9cwMN5 W3xpCWp7eOwhMwspioW62R0pdUU4fcm0y50itxyKRbAQUr9s5Tj60DKOAQHQRFKD/00lrY +wBQk6p5nsyjoOPIXijBlwhrDpLxwGOnpjD5Pl9hJ5nzHPmV11DzTB1W4ftr5n+mA4Cps1 EhGz9fRAUREFR3dtgoK6fBFe+TIALlpHW4/EDTDnenERa+OnCMZ5vcSXBRT5f4TWln+fna gzKiLNYALEfJF17LwM0MdYFkc1Q6v0wVxPiG4Xd/njOmNjLti7tcBeqKmG1doA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752789256; a=rsa-sha256; cv=none; b=ReO83lY+Nk14OzhTtlaRw485BtJynZamDISJO/qeUNlMEjhkX6EH701YVXkeWD0OQoCkmG aaQjrs/04x9+YOr6xQNRGVqZZky41iez4L65wuIhjoBVTBE/Nxa/Hsh0ljeu9vSrB7vGX9 7eDH9rgUs09caVr6K+1LJqv22EL1405PlFauTlnBXm+oidmyQHdN8wCL+jYDZPVcSsoEa6 0lk4Tm4j2MVncUw6/KWJi88aE88jHoDs/iIJ18sP3zlLWqCnCMgorRCo5MsfENIagApWdP YRsbyLXKjCdvMdcEM9Q+wXMNhivrR3H3fv61J7Hj9wFrRyt7FbsYJ3BmqkPgaA== 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 4bjmsh1wTnz1CKv; Thu, 17 Jul 2025 21:54:16 +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 56HLsGnA095200; Thu, 17 Jul 2025 21:54:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56HLsGLL095197; Thu, 17 Jul 2025 21:54:16 GMT (envelope-from git) Date: Thu, 17 Jul 2025 21:54:16 GMT Message-Id: <202507172154.56HLsGLL095197@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 29af6d2e2ec9 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 29af6d2e2ec9fe8df7cf1e1a0bf3597028831b18 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=29af6d2e2ec9fe8df7cf1e1a0bf3597028831b18 commit 29af6d2e2ec9fe8df7cf1e1a0bf3597028831b18 Author: Konstantin Belousov AuthorDate: 2025-07-17 01:12:05 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-17 21:53:54 +0000 msdosfs: replace '/' in direntries with '?' PR: 288266 Reported by: Robert Morris Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D51365 --- 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'; }