 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.35 2010/01/06 18:12:37 christos Exp $	*/
+/*	$NetBSD: main.c,v 1.36 2010/01/07 01:39:56 christos Exp $	*/
 /*
  * Copyright (c) 1980, 1986, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -53,51 +53,51 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1986, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)main.c	8.2 (Berkeley) 1/23/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.35 2010/01/06 18:12:37 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.36 2010/01/07 01:39:56 christos Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/mount.h>
 #include <ufs/ufs/ufsmount.h>
 #include <ufs/ext2fs/ext2fs_dinode.h>
 #include <ufs/ext2fs/ext2fs.h>
 #include <fstab.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <time.h>
 #include <unistd.h>
 #include <signal.h>
 #include "fsck.h"
 #include "extern.h"
 #include "fsutil.h"
 #include "exitvalues.h"
-volatilel sigatomic_t	returntosingle = 0;
+volatile sig_atomic_t	returntosingle = 0;
 static int	argtoi(int, const char *, const char *, int);
 static int	checkfilesys(const char *, char *, long, int);
 static void	usage(void) __dead;
 int
 main(int argc, char *argv[])
+{
 	int ch;
 	int ret = FSCK_EXIT_OK;
 	sync();

 @@ -1,14 +1,14 @@
-/*	$NetBSD: utilities.c,v 1.20 2010/01/06 18:12:37 christos Exp $	*/
+/*	$NetBSD: utilities.c,v 1.21 2010/01/07 01:39:56 christos Exp $	*/
 /*
  * Copyright (c) 1980, 1986, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -48,53 +48,54 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)utilities.c	8.1 (Berkeley) 6/5/93";
 #else
-__RCSID("$NetBSD: utilities.c,v 1.20 2010/01/06 18:12:37 christos Exp $");
+__RCSID("$NetBSD: utilities.c,v 1.21 2010/01/07 01:39:56 christos Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/time.h>
 #include <ufs/ext2fs/ext2fs_dinode.h>
 #include <ufs/ext2fs/ext2fs_dir.h>
 #include <ufs/ext2fs/ext2fs.h>
 #include <ufs/ufs/dinode.h> /* for IFMT & friends */
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
 #include <ctype.h>
 #include <unistd.h>
 #include <signal.h>
 #include "fsutil.h"
 #include "fsck.h"
 #include "extern.h"
 #include "exitvalues.h"
 long	diskreads, totalreads;	/* Disk cache statistics */
 static void rwerror(const char *, daddr_t);
-extern volatile sigatomic_t returntosingle;
+extern volatile sig_atomic_t returntosingle;
 int
 ftypeok(struct ext2fs_dinode *dp)
+{
 	switch (fs2h16(dp->e2di_mode) & IFMT) {
 	case IFDIR:
 	case IFREG:
 	case IFBLK:
 	case IFCHR:
 	case IFLNK:
 	case IFSOCK:
 	case IFIFO:
 @@ -146,27 +147,27 @@ void
 bufinit(void)
+{
 	struct bufarea *bp;
 	long bufcnt, i;
 	char *bufp;
 	diskreads = totalreads = 0;
 	pbp = pdirbp = (struct bufarea *)0;
 	bufhead.b_next = bufhead.b_prev = &bufhead;
 	bufcnt = MAXBUFSPACE / sblock.e2fs_bsize;
 	if (bufcnt < MINBUFS)
 		bufcnt = MINBUFS;
 	for (i = 0; i < bufcnt; i++) {
-		bp = size_t(sizeof(struct bufarea));
+		bp = malloc(sizeof(struct bufarea));
 		bufp = malloc((size_t)sblock.e2fs_bsize);
 		if (bp == NULL || bufp == NULL) {
 			free(bp);
 			free(bufp);
 			if (i >= MINBUFS)
 				break;
 			errexit("cannot allocate buffer pool");
+		}
 		bp->b_un.b_buf = bufp;
 		bp->b_prev = &bufhead;
 		bp->b_next = bufhead.b_next;
 		bufhead.b_next->b_prev = bp;
 		bufhead.b_next = bp;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.74 2010/01/06 18:12:37 christos Exp $	*/
+/*	$NetBSD: main.c,v 1.75 2010/01/07 01:39:56 christos Exp $	*/
 /*
  * Copyright (c) 1980, 1986, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -29,27 +29,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1986, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/14/95";
 #else
-__RCSID("$NetBSD: main.c,v 1.74 2010/01/06 18:12:37 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.75 2010/01/07 01:39:56 christos Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/mount.h>
 #include <sys/resource.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/ufsmount.h>
 #include <ufs/ffs/fs.h>
 #include <ufs/ffs/ffs_extern.h>
 @@ -61,27 +61,27 @@ __RCSID("$NetBSD: main.c,v 1.74 2010/01/
 #include <time.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <signal.h>
 #include "fsck.h"
 #include "extern.h"
 #include "fsutil.h"
 #include "exitvalues.h"
 #include "snapshot.h"
 int	progress = 0;
-volatile sigatomic_t	returntosingle = 0;
+volatile sig_atomic_t	returntosingle = 0;
 static int	argtoi(int, const char *, const char *, int);
 static int	checkfilesys(const char *, const char *, int);
 static void	usage(void);
 static char 	*get_snap_device(char *);
 int
 main(int argc, char *argv[])
+{
 	struct rlimit r;
 	int ch;
 	int ret = FSCK_EXIT_OK;
 	char *snap_backup = NULL;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: utilities.c,v 1.57 2010/01/06 18:12:37 christos Exp $	*/
+/*	$NetBSD: utilities.c,v 1.58 2010/01/07 01:39:56 christos Exp $	*/
 /*
  * Copyright (c) 1980, 1986, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)utilities.c	8.6 (Berkeley) 5/19/95";
 #else
-__RCSID("$NetBSD: utilities.c,v 1.57 2010/01/06 18:12:37 christos Exp $");
+__RCSID("$NetBSD: utilities.c,v 1.58 2010/01/07 01:39:56 christos Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/time.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/dir.h>
 #include <ufs/ffs/fs.h>
 #include <ufs/ffs/ffs_extern.h>
 #include <ufs/ufs/ufs_bswap.h>
 #include <ctype.h>
 @@ -55,27 +55,27 @@ __RCSID("$NetBSD: utilities.c,v 1.57 201
 #include <string.h>
 #include <unistd.h>
 #include <signal.h>
 #include "fsutil.h"
 #include "fsck.h"
 #include "extern.h"
 #include "exitvalues.h"
 long	diskreads, totalreads;	/* Disk cache statistics */
 static void rwerror(const char *, daddr_t);
-extern volatile sigatomic_t returntosingle;
+extern volatile sig_atomic_t returntosingle;
 int
 ftypeok(union dinode *dp)
+{
 	switch (iswap16(DIP(dp, mode)) & IFMT) {
 	case IFDIR:
 	case IFREG:
 	case IFBLK:
 	case IFCHR:
 	case IFLNK:
 	case IFSOCK:
 	case IFIFO:

 @@ -1,14 +1,14 @@
-/* $NetBSD: main.c,v 1.41 2010/01/06 18:12:37 christos Exp $	 */
+/* $NetBSD: main.c,v 1.42 2010/01/07 01:39:56 christos Exp $	 */
 /*
  * Copyright (c) 1980, 1986, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -42,27 +42,27 @@
 #include <string.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <err.h>
 #include <util.h>
 #include <signal.h>
 #include "fsck.h"
 #include "extern.h"
 #include "fsutil.h"
 #include "exitvalues.h"
-volatile sigatomic_t returntosingle = 0;
+volatile sig_atomic_t returntosingle = 0;
 static int argtoi(int, const char *, const char *, int);
 static int checkfilesys(const char *, char *, long, int);
 static void usage(void);
 static void efun(int, const char *, ...);
 extern void (*panic_func)(int, const char *, va_list);
 static void
 efun(int eval, const char *fmt, ...)
+{
 	va_list ap;
 	va_start(ap, fmt);
 	verr(EEXIT, fmt, ap);

 @@ -1,14 +1,14 @@
-/* $NetBSD: utilities.c,v 1.28 2010/01/06 18:12:37 christos Exp $	 */
+/* $NetBSD: utilities.c,v 1.29 2010/01/07 01:39:56 christos Exp $	 */
 /*
  * Copyright (c) 1980, 1986, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -50,27 +50,27 @@
 #include "bufcache.h"
 #include "vnode.h"
 #include "lfs_user.h"
 #include "segwrite.h"
 #include "fsutil.h"
 #include "fsck.h"
 #include "extern.h"
 #include "exitvalues.h"
 long diskreads, totalreads;	/* Disk cache statistics */
-extern volatile sigatomic_t returntosingle;
+extern volatile sig_atomic_t returntosingle;
 extern off_t locked_queue_bytes;
 int
 ftypeok(struct ufs1_dinode * dp)
+{
 	switch (dp->di_mode & IFMT) {
 	case IFDIR:
 	case IFREG:
 	case IFBLK:
 	case IFCHR:
 	case IFLNK:
 	case IFSOCK: