Module Name: src
Committed By: martin
Date: Sat Dec 30 19:17:07 UTC 2023
Modified Files:
src/usr.sbin/makefs [netbsd-9]: msdos.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1783):
usr.sbin/makefs/msdos.c: revision 1.22
Return a proper exit status on failure on creating msdosfs.
No particular comment in PR bin/57752.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.14.1 src/usr.sbin/makefs/msdos.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/makefs/msdos.c
diff -u src/usr.sbin/makefs/msdos.c:1.20 src/usr.sbin/makefs/msdos.c:1.20.14.1
--- src/usr.sbin/makefs/msdos.c:1.20 Fri Apr 14 15:40:35 2017
+++ src/usr.sbin/makefs/msdos.c Sat Dec 30 19:17:06 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msdos.c,v 1.20 2017/04/14 15:40:35 christos Exp $ */
+/* $NetBSD: msdos.c,v 1.20.14.1 2023/12/30 19:17:06 martin Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: msdos.c,v 1.20 2017/04/14 15:40:35 christos Exp $");
+__RCSID("$NetBSD: msdos.c,v 1.20.14.1 2023/12/30 19:17:06 martin Exp $");
#endif /* !__lint */
#include <sys/param.h>
@@ -177,7 +177,7 @@ msdos_makefs(const char *image, const ch
printf("Creating `%s'\n", image);
TIMER_START(start);
if (mkfs_msdos(image, NULL, &msdos_opt->options) == -1)
- return;
+ errx(1, "Image file `%s' not created.", image);
TIMER_RESULTS(start, "mkfs_msdos");
fsopts->fd = open(image, O_RDWR);
@@ -201,7 +201,7 @@ msdos_makefs(const char *image, const ch
printf("Populating `%s'\n", image);
TIMER_START(start);
if (msdos_populate_dir(dir, VTODE(&rootvp), root, root, fsopts) == -1)
- errx(1, "Image file `%s' not created.", image);
+ errx(1, "Image file `%s' not populated.", image);
TIMER_RESULTS(start, "msdos_populate_dir");
if (debug & DEBUG_FS_MAKEFS)
