aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2025-11-09 19:43:50 +0000
committerEd Maste <emaste@FreeBSD.org>2025-11-10 03:02:09 +0000
commitdbb34d496708a37763d3d8bf6782991dee10d17e (patch)
tree0c9e4253eeec3dd12c296c9f1fd0c3b3227b96c1
parent80ca573fc4e65db6f17cb476b6e857fe06b2e3d8 (diff)
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
-rw-r--r--sbin/newfs_msdos/mkfs_msdos.c6
1 files 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) {