Module Name: src
Committed By: christos
Date: Wed Mar 25 20:17:48 UTC 2020
Modified Files:
src/usr.sbin/makefs/ffs: mkfs.c
Log Message:
improve error messages.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/usr.sbin/makefs/ffs/mkfs.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/ffs/mkfs.c
diff -u src/usr.sbin/makefs/ffs/mkfs.c:1.37 src/usr.sbin/makefs/ffs/mkfs.c:1.38
--- src/usr.sbin/makefs/ffs/mkfs.c:1.37 Wed Feb 8 23:42:53 2017
+++ src/usr.sbin/makefs/ffs/mkfs.c Wed Mar 25 16:17:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mkfs.c,v 1.37 2017/02/09 04:42:53 kre Exp $ */
+/* $NetBSD: mkfs.c,v 1.38 2020/03/25 20:17:48 christos Exp $ */
/*
* Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -48,7 +48,7 @@
static char sccsid[] = "@(#)mkfs.c 8.11 (Berkeley) 5/3/95";
#else
#ifdef __RCSID
-__RCSID("$NetBSD: mkfs.c,v 1.37 2017/02/09 04:42:53 kre Exp $");
+__RCSID("$NetBSD: mkfs.c,v 1.38 2020/03/25 20:17:48 christos Exp $");
#endif
#endif
#endif /* not lint */
@@ -821,15 +821,15 @@ ffs_wtfs(daddr_t bno, int size, void *bf
offset = bno * fsopts->sectorsize + fsopts->offset;
if (lseek(fsopts->fd, offset, SEEK_SET) == -1)
- err(EXIT_FAILURE, "%s: seek error for sector %lld", __func__,
- (long long)bno);
+ err(EXIT_FAILURE, "%s: seek error @%td for sector %jd",
+ __func__, offset, (intmax_t)bno);
n = write(fsopts->fd, bf, size);
if (n == -1)
- err(EXIT_FAILURE, "%s: write error for sector %lld", __func__,
- (long long)bno);
+ err(EXIT_FAILURE, "%s: write error for sector %jd", __func__,
+ (intmax_t)bno);
else if (n != size)
- errx(EXIT_FAILURE, "%s: short write error for sector %lld",
- __func__, (long long)bno);
+ errx(EXIT_FAILURE, "%s: short write error for sector %jd",
+ __func__, (intmax_t)bno);
}
