[src/netbsd-7]: src/sbin/fsck_ext2fs Pull up following revision(s) (requested...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1506256e94a3
branches:  netbsd-7
changeset: 799201:1506256e94a3
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Apr 14 05:15:57 2015 +0000

description:
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.

diffstat:

 sbin/fsck_ext2fs/setup.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r 1898386e7dd4 -r 1506256e94a3 sbin/fsck_ext2fs/setup.c
--- a/sbin/fsck_ext2fs/setup.c  Tue Apr 14 05:14:17 2015 +0000
+++ b/sbin/fsck_ext2fs/setup.c  Tue Apr 14 05:15:57 2015 +0000
@@ -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 @@
                    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;