[src/trunk]: src/sbin make this compile again.

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

details:   https://anonhg.NetBSD.org/src/rev/b402fface644
branches:  trunk
changeset: 750566:b402fface644
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Jan 07 01:39:56 2010 +0000

description:
make this compile again.

diffstat:

 sbin/fsck_ext2fs/main.c      |  6 +++---
 sbin/fsck_ext2fs/utilities.c |  9 +++++----
 sbin/fsck_ffs/main.c         |  6 +++---
 sbin/fsck_ffs/utilities.c    |  6 +++---
 sbin/fsck_lfs/main.c         |  4 ++--
 sbin/fsck_lfs/utilities.c    |  4 ++--
 6 files changed, 18 insertions(+), 17 deletions(-)

diffs (161 lines):

diff -r 0a8017f84a05 -r b402fface644 sbin/fsck_ext2fs/main.c
--- a/sbin/fsck_ext2fs/main.c   Thu Jan 07 00:18:47 2010 +0000
+++ b/sbin/fsck_ext2fs/main.c   Thu Jan 07 01:39:56 2010 +0000
@@ -1,4 +1,4 @@
-/*     $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
@@ -63,7 +63,7 @@
 #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 */
 
@@ -87,7 +87,7 @@
 #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);
diff -r 0a8017f84a05 -r b402fface644 sbin/fsck_ext2fs/utilities.c
--- a/sbin/fsck_ext2fs/utilities.c      Thu Jan 07 00:18:47 2010 +0000
+++ b/sbin/fsck_ext2fs/utilities.c      Thu Jan 07 01:39:56 2010 +0000
@@ -1,4 +1,4 @@
-/*     $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
@@ -58,7 +58,7 @@
 #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 */
 
@@ -70,6 +70,7 @@
 #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>
@@ -84,7 +85,7 @@
 
 static void rwerror(const char *, daddr_t);
 
-extern volatile sigatomic_t returntosingle;
+extern volatile sig_atomic_t returntosingle;
 
 int
 ftypeok(struct ext2fs_dinode *dp)
@@ -156,7 +157,7 @@
        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);
diff -r 0a8017f84a05 -r b402fface644 sbin/fsck_ffs/main.c
--- a/sbin/fsck_ffs/main.c      Thu Jan 07 00:18:47 2010 +0000
+++ b/sbin/fsck_ffs/main.c      Thu Jan 07 01:39:56 2010 +0000
@@ -1,4 +1,4 @@
-/*     $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
@@ -39,7 +39,7 @@
 #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 */
 
@@ -71,7 +71,7 @@
 #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);
diff -r 0a8017f84a05 -r b402fface644 sbin/fsck_ffs/utilities.c
--- a/sbin/fsck_ffs/utilities.c Thu Jan 07 00:18:47 2010 +0000
+++ b/sbin/fsck_ffs/utilities.c Thu Jan 07 01:39:56 2010 +0000
@@ -1,4 +1,4 @@
-/*     $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
@@ -34,7 +34,7 @@
 #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 */
 
@@ -65,7 +65,7 @@
 
 static void rwerror(const char *, daddr_t);
 
-extern volatile sigatomic_t returntosingle;
+extern volatile sig_atomic_t returntosingle;
 
 int
 ftypeok(union dinode *dp)
diff -r 0a8017f84a05 -r b402fface644 sbin/fsck_lfs/main.c
--- a/sbin/fsck_lfs/main.c      Thu Jan 07 00:18:47 2010 +0000
+++ b/sbin/fsck_lfs/main.c      Thu Jan 07 01:39:56 2010 +0000
@@ -1,4 +1,4 @@
-/* $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
@@ -52,7 +52,7 @@
 #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);
diff -r 0a8017f84a05 -r b402fface644 sbin/fsck_lfs/utilities.c
--- a/sbin/fsck_lfs/utilities.c Thu Jan 07 00:18:47 2010 +0000
+++ b/sbin/fsck_lfs/utilities.c Thu Jan 07 01:39:56 2010 +0000
@@ -1,4 +1,4 @@
-/* $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
@@ -60,7 +60,7 @@
 
 long diskreads, totalreads;    /* Disk cache statistics */
 
-extern volatile sigatomic_t returntosingle;
+extern volatile sig_atomic_t returntosingle;
 extern off_t locked_queue_bytes;
 
 int