From af479c48b844ec74834a9f2b5a3ef7e219dcf214 Mon Sep 17 00:00:00 2001
From: lukem <lukem@NetBSD.org>
Date: Sat, 20 Sep 1997 06:16:23 +0000
Subject: [PATCH] - don't indiscriminately include <stdlib.h> and <unistd.h> in
 "fsck.h" - explicitly pull in <stdio.h>, <stdlib.h> and <unistd.h> in *.c as
 necessary

---
 sbin/fsck_ffs/dir.c       | 5 +++--
 sbin/fsck_ffs/fsck.h      | 4 +---
 sbin/fsck_ffs/main.c      | 5 +++--
 sbin/fsck_ffs/pass1.c     | 6 ++++--
 sbin/fsck_ffs/pass2.c     | 6 ++++--
 sbin/fsck_ffs/pass4.c     | 5 +++--
 sbin/fsck_ffs/setup.c     | 6 ++++--
 sbin/fsck_ffs/utilities.c | 7 +++++--
 8 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c
index edbfe8b2123a..bc88605c852f 100644
--- a/sbin/fsck_ffs/dir.c
+++ b/sbin/fsck_ffs/dir.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dir.c,v 1.23 1997/09/16 16:44:48 lukem Exp $	*/
+/*	$NetBSD: dir.c,v 1.24 1997/09/20 06:16:23 lukem Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)dir.c	8.8 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: dir.c,v 1.23 1997/09/16 16:44:48 lukem Exp $");
+__RCSID("$NetBSD: dir.c,v 1.24 1997/09/20 06:16:23 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -50,6 +50,7 @@ __RCSID("$NetBSD: dir.c,v 1.23 1997/09/16 16:44:48 lukem Exp $");
 #include <ufs/ffs/fs.h>
 
 #include <err.h>
+#include <stdio.h>
 #include <string.h>
 
 #include "fsck.h"
diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h
index 3f2c540527cd..795ba9cada92 100644
--- a/sbin/fsck_ffs/fsck.h
+++ b/sbin/fsck_ffs/fsck.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: fsck.h,v 1.14 1997/09/16 16:44:56 lukem Exp $	*/
+/*	$NetBSD: fsck.h,v 1.15 1997/09/20 06:16:25 lukem Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -35,8 +35,6 @@
  *	@(#)fsck.h	8.4 (Berkeley) 5/9/95
  */
 
-#include <unistd.h>
-#include <stdlib.h>
 #include <stdio.h>
 
 #define	MAXDUP		10	/* limit on dup blks (per inode) */
diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index af5747f61bca..68dc38880851 100644
--- a/sbin/fsck_ffs/main.c
+++ b/sbin/fsck_ffs/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.25 1997/09/16 16:45:05 lukem Exp $	*/
+/*	$NetBSD: main.c,v 1.26 1997/09/20 06:16:27 lukem Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1986, 1993\n\
 #if 0
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/14/95";
 #else
-__RCSID("$NetBSD: main.c,v 1.25 1997/09/16 16:45:05 lukem Exp $");
+__RCSID("$NetBSD: main.c,v 1.26 1997/09/20 06:16:27 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -60,6 +60,7 @@ __RCSID("$NetBSD: main.c,v 1.25 1997/09/16 16:45:05 lukem Exp $");
 #include <string.h>
 #include <ctype.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 #include "fsck.h"
diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c
index f4282824df60..f57a4ab9e70d 100644
--- a/sbin/fsck_ffs/pass1.c
+++ b/sbin/fsck_ffs/pass1.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pass1.c,v 1.19 1997/09/16 16:45:09 lukem Exp $	*/
+/*	$NetBSD: pass1.c,v 1.20 1997/09/20 06:16:29 lukem Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)pass1.c	8.6 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: pass1.c,v 1.19 1997/09/16 16:45:09 lukem Exp $");
+__RCSID("$NetBSD: pass1.c,v 1.20 1997/09/20 06:16:29 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -50,6 +50,8 @@ __RCSID("$NetBSD: pass1.c,v 1.19 1997/09/16 16:45:09 lukem Exp $");
 #include <ufs/ffs/fs.h>
 
 #include <err.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "fsck.h"
diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c
index de34f5792531..08900a5dfe71 100644
--- a/sbin/fsck_ffs/pass2.c
+++ b/sbin/fsck_ffs/pass2.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pass2.c,v 1.20 1997/09/16 16:45:16 lukem Exp $	*/
+/*	$NetBSD: pass2.c,v 1.21 1997/09/20 06:16:31 lukem Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)pass2.c	8.9 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: pass2.c,v 1.20 1997/09/16 16:45:16 lukem Exp $");
+__RCSID("$NetBSD: pass2.c,v 1.21 1997/09/20 06:16:31 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -50,6 +50,8 @@ __RCSID("$NetBSD: pass2.c,v 1.20 1997/09/16 16:45:16 lukem Exp $");
 #include <ufs/ffs/fs.h>
 
 #include <err.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "fsck.h"
diff --git a/sbin/fsck_ffs/pass4.c b/sbin/fsck_ffs/pass4.c
index 1a52d8332458..f7a8454cb6e1 100644
--- a/sbin/fsck_ffs/pass4.c
+++ b/sbin/fsck_ffs/pass4.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pass4.c,v 1.13 1997/09/16 16:45:23 lukem Exp $	*/
+/*	$NetBSD: pass4.c,v 1.14 1997/09/20 06:16:32 lukem Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)pass4.c	8.4 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: pass4.c,v 1.13 1997/09/16 16:45:23 lukem Exp $");
+__RCSID("$NetBSD: pass4.c,v 1.14 1997/09/20 06:16:32 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -49,6 +49,7 @@ __RCSID("$NetBSD: pass4.c,v 1.13 1997/09/16 16:45:23 lukem Exp $");
 #include <ufs/ffs/fs.h>
 
 #include <err.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "fsutil.h"
diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c
index f2c6722aa7af..3a7a7aa9d0bb 100644
--- a/sbin/fsck_ffs/setup.c
+++ b/sbin/fsck_ffs/setup.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: setup.c,v 1.30 1997/09/16 16:45:33 lukem Exp $	*/
+/*	$NetBSD: setup.c,v 1.31 1997/09/20 06:16:33 lukem Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)setup.c	8.10 (Berkeley) 5/9/95";
 #else
-__RCSID("$NetBSD: setup.c,v 1.30 1997/09/16 16:45:33 lukem Exp $");
+__RCSID("$NetBSD: setup.c,v 1.31 1997/09/20 06:16:33 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -56,6 +56,8 @@ __RCSID("$NetBSD: setup.c,v 1.30 1997/09/16 16:45:33 lukem Exp $");
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "fsck.h"
diff --git a/sbin/fsck_ffs/utilities.c b/sbin/fsck_ffs/utilities.c
index 0dddbdfab97f..d3cda37347bf 100644
--- a/sbin/fsck_ffs/utilities.c
+++ b/sbin/fsck_ffs/utilities.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: utilities.c,v 1.20 1997/09/16 16:45:37 lukem Exp $	*/
+/*	$NetBSD: utilities.c,v 1.21 1997/09/20 06:16:34 lukem Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)utilities.c	8.6 (Berkeley) 5/19/95";
 #else
-__RCSID("$NetBSD: utilities.c,v 1.20 1997/09/16 16:45:37 lukem Exp $");
+__RCSID("$NetBSD: utilities.c,v 1.21 1997/09/20 06:16:34 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -51,7 +51,10 @@ __RCSID("$NetBSD: utilities.c,v 1.20 1997/09/16 16:45:37 lukem Exp $");
 
 #include <ctype.h>
 #include <err.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "fsutil.h"
 #include "fsck.h"