From nobody Mon Nov 17 14:46:54 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 4d99Yp1ts0z6HLtc; Mon, 17 Nov 2025 14:46:54 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d99Yp1FqQz3C1n; Mon, 17 Nov 2025 14:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763390814; 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=9zTwDPBR9n5lPMaiWfJfc+py4UjOYvSiSsUpqcCN7XQ=; b=PhrcnAwXWxr8J9FsbcinikXV6AzayTl6dqC6McTyd24RNZQJQ1GZTgRd/EP6dHpmApHY0q ObgiGTYsP1RjT4D4TMZhqHQbI9i+ygGxk+S5WyNtG0VJCq33P1n9YNzfUXXF7Z4sLLLKxO dnm2HMD8MqA4XVX0R4LoEuFk2WOWmlEqpJFj9xWilDS6Rk9gSuLvKQYlI4EDbm6bbFxiUs 8LDis3HKAL/RFXMhCn3mFy8NoXrUKbM19vKP5yzYDPX7OAVz84E5iAGi1USqkta2cP4ojo dXoxvOrBXT7p9Vv4DdbCqMdRw6bLTxWgOQioyfgStDPZYBRDTqDqR62ekZEZKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763390814; 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=9zTwDPBR9n5lPMaiWfJfc+py4UjOYvSiSsUpqcCN7XQ=; b=XsJKwVee42XZaWC6GdhxPiuu+2EH8I0i2FlNRjMAUBaTd6ZeUDQLE7NL/0WrZ9YdPT0XA9 6tKD0iOXXtccp6dqrko55FpFvVCk+eDIowLY//cD2SGiV3BJp9T4OPSoMIOdKztMOFUgXz 9dlD0frDxBZJAHcjsYRQLWx5wQNgqDI1uqTWeqYggoRt9jIekMqORAZDGpn4kUtNLPg6cX WUwr8p1FhQCAq5d7vdpa1geYJU28jERr35Z+pykWqlD2oe8JhBlYHsud478R6iC70fuC+R xOKG9eBHme8BFjNLuJeyqiivmWjWuvfbimRlRh2Pm2aoIo4VeALRcsllAXD6iA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763390814; a=rsa-sha256; cv=none; b=ReTK5u87FFWZVECYXGW2sXeD414TCZMex8X5pHQHF/72CA6G+McF6KCJnKWyqNMx+5dnCN DURTfmLdjK2E1Q4HUXXS+/JGwupXV3NDZUA1pxHV0yS4E7VDqxFCPZ9YsfrkLHJuCEsuIP 0Dkoo9QUL05OBWJmGi+rMDFylofh27a6RM3tPx/fA/8F4oWMpYyIFK/U2rtJH+QjOYpMLS c/yyXHi++L9CU6SfnpoUM3dca6dvsfb/ptqFMJVLmiqy4cXmYLKgBZ1imntfunOIQI8QPP ChVUHITy+OIvwtaxnS0x05I0B1wrpfxFvi1MxcZUzSy9dMSvWL/kDsyipE1ppg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d99Yp0g7bz1Qwv; Mon, 17 Nov 2025 14:46:54 +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 5AHEksLu099239; Mon, 17 Nov 2025 14:46:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHEksQL099236; Mon, 17 Nov 2025 14:46:54 GMT (envelope-from git) Date: Mon, 17 Nov 2025 14:46:54 GMT Message-Id: <202511171446.5AHEksQL099236@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: cf3e1dc5f59e - stable/15 - newfs_msdos: Improve error messages 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cf3e1dc5f59e13252ef314bd4f72e19c38115840 Auto-Submitted: auto-generated The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=cf3e1dc5f59e13252ef314bd4f72e19c38115840 commit cf3e1dc5f59e13252ef314bd4f72e19c38115840 Author: Ed Maste AuthorDate: 2025-11-09 19:43:50 +0000 Commit: Ed Maste CommitDate: 2025-11-17 14:46:37 +0000 newfs_msdos: Improve error messages - Report overly long OEM string as too long, not just "bad". - Use warn instead of warnx for open or ftruncate failure to report the error string. Reviewed by: se Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53649 (cherry picked from commit dbb34d496708a37763d3d8bf6782991dee10d17e) --- sbin/newfs_msdos/mkfs_msdos.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/newfs_msdos/mkfs_msdos.c b/sbin/newfs_msdos/mkfs_msdos.c index dcc2bb982efc..a570d92cd17b 100644 --- a/sbin/newfs_msdos/mkfs_msdos.c +++ b/sbin/newfs_msdos/mkfs_msdos.c @@ -264,7 +264,7 @@ mkfs_msdos(const char *fname, const char *dtype, const struct msdos_options *op) goto done; } if (o.OEM_string && strlen(o.OEM_string) > 8) { - warnx("%s: bad OEM string", o.OEM_string); + warnx("%s: OEM string too long", o.OEM_string); goto done; } if (o.create_size) { @@ -274,11 +274,11 @@ mkfs_msdos(const char *fname, const char *dtype, const struct msdos_options *op) } fd = open(fname, O_RDWR | O_CREAT | O_TRUNC, 0644); if (fd == -1) { - warnx("failed to create %s", fname); + warn("failed to create %s", fname); goto done; } if (ftruncate(fd, o.create_size)) { - warnx("failed to initialize %jd bytes", (intmax_t)o.create_size); + warn("failed to initialize %jd bytes", (intmax_t)o.create_size); goto done; } } else if ((fd = open(fname, o.no_create ? O_RDONLY : O_RDWR)) == -1) {