Module Name: src
Committed By: snj
Date: Tue Apr 14 05:15:57 UTC 2015
Modified Files:
src/sbin/fsck_ext2fs [netbsd-7]: setup.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #688):
sbin/fsck_ext2fs/setup.c: revision 1.32
Instead of zerodivide, give a useful error message.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.31.6.1 src/sbin/fsck_ext2fs/setup.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_ext2fs/setup.c
diff -u src/sbin/fsck_ext2fs/setup.c:1.31 src/sbin/fsck_ext2fs/setup.c:1.31.6.1
--- src/sbin/fsck_ext2fs/setup.c:1.31 Sun Jun 23 02:06:04 2013
+++ src/sbin/fsck_ext2fs/setup.c Tue Apr 14 05:15:57 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: setup.c,v 1.31 2013/06/23 02:06:04 dholland Exp $ */
+/* $NetBSD: setup.c,v 1.31.6.1 2015/04/14 05:15:57 snj Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -58,7 +58,7 @@
#if 0
static char sccsid[] = "@(#)setup.c 8.5 (Berkeley) 11/23/94";
#else
-__RCSID("$NetBSD: setup.c,v 1.31 2013/06/23 02:06:04 dholland Exp $");
+__RCSID("$NetBSD: setup.c,v 1.31.6.1 2015/04/14 05:15:57 snj Exp $");
#endif
#endif /* not lint */
@@ -490,6 +490,10 @@ calcsb(const char *dev, int devfd, struc
fstypenames[pp->p_fstype] : "unknown");
return 0;
}
+ if (pp->p_fsize == 0) {
+ pfatal("%s: PARTITION SIZE IS 0\n", dev);
+ return 0;
+ }
memset(fs, 0, sizeof(struct m_ext2fs));
fs->e2fs_bsize = pp->p_fsize;
fs->e2fs.e2fs_log_bsize = pp->p_fsize / 1024;
