From nobody Mon Nov 17 14:48:57 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 4d99cB0tnnz6HLV4; Mon, 17 Nov 2025 14:48:58 +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 4d99cB0338z3CDv; Mon, 17 Nov 2025 14:48:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763390938; 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=rUuKqRkOVLYBx0uTXsH1zkWel88y6h+A6bsQG+I/PWI=; b=Eqja2FR4tvN+oDD20PfpLgXHgvP1KVLMwBz0QXjMsvj+x1SnFDh8d4E9z58PsYQ9jp90U1 6kuYDmL0Sj/YFWlVpSdZsg/zgLBsCiw1RwlV2CIXEkyf1iuUa/fumD6+HBp8nXut1Sk495 V/6qun5qDoxk5Nhx3W0MrbjdcNCzyMfqJVtIBdeLrQ/EQQSi/94h4KSwJ/9QPojW3V7Oq/ phqoxKsm1RjpCbW13W2UsqguGfCdQOQbDxZdvsYxXfgktdc7d1rLAUEubos0Psb1svYIcP nrQxqOQwI1lHLNZp3VhBGF4/7S45/FBwZe/vWB5NyrHpPRYHYNu8CaA5HwBmwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763390938; 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=rUuKqRkOVLYBx0uTXsH1zkWel88y6h+A6bsQG+I/PWI=; b=bgwqU1nvuo+zsA7yWem81ZGJoZ3HdVP0KTD4vk+7noiew5ESPtFnLfLvZ2d8RGt9G2crfF wDWlP0g2MhEB4GZZVUyulI7XwHmcBqHWcMcdL5YdZPo9b9+17zCM6Q9CWocly3Y/onf/vi AS9TOWMOtDZoo0vVmgY8LhiIrehyBMQM8jOoJ4Va9w0k443SJ9ESrR9KiAw4fnAtPssIZn PM1WFbtlOlJfeb0GQtZiWVmD9BRisu8rVIK3iqiIP1Y8XtKo/hr5YYFlc6o6cjsoRkhZx/ YUOoQHzqvfYLQD86TTPNjl0vjzCtad2JFSu+uOmTWpPtRcxhLwOQ3NPsAECuWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763390938; a=rsa-sha256; cv=none; b=QxoibRf4mz52XlVHCBDGGJuG90G+524aw0/d1IgdUBmMASgoKtMbPSK1/ee7k+ESFn7oTK dSOQl6jJr0Ct64iF4z3L++iMEsVQp2zqCdFTham9wyRlUuqyQiDomeEodfeyTWp0tMKp4O Lw+Nbg1LyYTyB9ixtgbtaxl76ubFMknmu9ZjLwfQ4AfdSpks2m+XK6keRIw2O/PwCmb85q gTjJ+TmEsUlle6DkeM7geCKlTZi92TzhVFOnh/zNLNJYVhNxDoM+/VJJh626gvjMpX3lDx MeuDq93fZuGvCJk2x0kiitTr6QPzCF+qNJ7Q9OVIb6dUaWaEKK4ctH5HMsPr/A== 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 4d99c96S2Kz1RPP; Mon, 17 Nov 2025 14:48:57 +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 5AHEmvR9099937; Mon, 17 Nov 2025 14:48:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHEmvll099934; Mon, 17 Nov 2025 14:48:57 GMT (envelope-from git) Date: Mon, 17 Nov 2025 14:48:57 GMT Message-Id: <202511171448.5AHEmvll099934@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: 3602181372ab - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 3602181372abc0aa164b5024c6269720e7896b10 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3602181372abc0aa164b5024c6269720e7896b10 commit 3602181372abc0aa164b5024c6269720e7896b10 Author: Ed Maste AuthorDate: 2025-11-09 19:43:50 +0000 Commit: Ed Maste CommitDate: 2025-11-17 14:48:41 +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) (cherry picked from commit cf3e1dc5f59e13252ef314bd4f72e19c38115840) --- 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 065e3c5f4192..3600755f30c3 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) {