From 7649cb0043cb41571f2748bc287da294a8c3b870 Mon Sep 17 00:00:00 2001
From: Kirk McKusick <mckusick@FreeBSD.org>
Date: Mon, 24 Jan 2011 06:17:05 +0000
Subject: [PATCH] The dump, fsck_ffs, fsdb, fsirand, newfs, makefs, and quot
 utilities include sys/time.h instead of time.h. This include is incorrect as
 per the manpages for the APIs and the POSIX definitions. This commit replaces
 sys/time.h where necessary with time.h.

The commit also includes some minor style(9) header fixup in newfs.

This commit is part of a larger effort by Garrett Cooper started in
//depot/user/gcooper/posix-conformance-work/ -- to make FreeBSD more
POSIX compliant.

Submitted by:  Garrett Cooper   yanegomi at gmail dot com
---
 sbin/dump/itime.c        |  2 +-
 sbin/dump/main.c         |  2 +-
 sbin/dump/optr.c         |  2 +-
 sbin/dump/tape.c         |  2 +-
 sbin/fsck_ffs/inode.c    |  2 +-
 sbin/fsck_ffs/main.c     |  4 ++--
 sbin/fsck_ffs/suj.c      |  5 +++--
 sbin/fsdb/fsdb.c         |  2 +-
 sbin/fsirand/fsirand.c   |  4 ++--
 sbin/newfs/mkfs.c        | 19 +++++++++----------
 usr.sbin/makefs/ffs.c    |  1 +
 usr.sbin/makefs/makefs.c |  1 +
 usr.sbin/quot/quot.c     |  2 +-
 13 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c
index 4cac87b41a1..f3271885fe1 100644
--- a/sbin/dump/itime.c
+++ b/sbin/dump/itime.c
@@ -37,7 +37,6 @@ static const char rcsid[] =
 
 #include <sys/param.h>
 #include <sys/queue.h>
-#include <sys/time.h>
 
 #include <ufs/ufs/dinode.h>
 
@@ -49,6 +48,7 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <timeconv.h>
 
 #include "dump.h"
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index e344887de14..3e6ed1f1ac5 100644
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.c
@@ -43,7 +43,6 @@ static const char rcsid[] =
 
 #include <sys/param.h>
 #include <sys/stat.h>
-#include <sys/time.h>
 #include <sys/mount.h>
 #include <sys/disklabel.h>
 
@@ -64,6 +63,7 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <timeconv.h>
 #include <unistd.h>
 
diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c
index 7173fc9a3c4..311e2551aff 100644
--- a/sbin/dump/optr.c
+++ b/sbin/dump/optr.c
@@ -38,7 +38,6 @@ static const char rcsid[] =
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/wait.h>
-#include <sys/time.h>
 
 #include <ufs/ufs/dinode.h>
 
@@ -51,6 +50,7 @@ static const char rcsid[] =
 #include <string.h>
 #include <stdarg.h>
 #include <signal.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "dump.h"
diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c
index 913409fb7b0..ff4e397849d 100644
--- a/sbin/dump/tape.c
+++ b/sbin/dump/tape.c
@@ -37,7 +37,6 @@ static const char rcsid[] =
 
 #include <sys/param.h>
 #include <sys/socket.h>
-#include <sys/time.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 
@@ -54,6 +53,7 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "dump.h"
diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c
index 5feead0ed5e..fa738ed02fb 100644
--- a/sbin/fsck_ffs/inode.c
+++ b/sbin/fsck_ffs/inode.c
@@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/stdint.h>
-#include <sys/time.h>
 #include <sys/sysctl.h>
 
 #include <ufs/ufs/dinode.h>
@@ -47,6 +46,7 @@ __FBSDID("$FreeBSD$");
 #include <err.h>
 #include <pwd.h>
 #include <string.h>
+#include <time.h>
 
 #include "fsck.h"
 
diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index e556240bc3d..8ee140d53bf 100644
--- a/sbin/fsck_ffs/main.c
+++ b/sbin/fsck_ffs/main.c
@@ -42,11 +42,10 @@ static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/14/95";
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/stat.h>
 #include <sys/file.h>
-#include <sys/time.h>
 #include <sys/mount.h>
 #include <sys/resource.h>
+#include <sys/stat.h>
 #include <sys/sysctl.h>
 #include <sys/uio.h>
 #include <sys/disklabel.h>
@@ -62,6 +61,7 @@ __FBSDID("$FreeBSD$");
 #include <paths.h>
 #include <stdint.h>
 #include <string.h>
+#include <time.h>
 
 #include "fsck.h"
 
diff --git a/sbin/fsck_ffs/suj.c b/sbin/fsck_ffs/suj.c
index 279e880eaee..60e3b33a901 100644
--- a/sbin/fsck_ffs/suj.c
+++ b/sbin/fsck_ffs/suj.c
@@ -37,6 +37,8 @@ __FBSDID("$FreeBSD$");
 #include <ufs/ufs/dir.h>
 #include <ufs/ffs/fs.h>
 
+#include <assert.h>
+#include <err.h>
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -46,8 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <strings.h>
 #include <sysexits.h>
-#include <err.h>
-#include <assert.h>
+#include <time.h>
 
 #include "fsck.h"
 
diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c
index 5622cbb2919..17226536820 100644
--- a/sbin/fsdb/fsdb.c
+++ b/sbin/fsdb/fsdb.c
@@ -34,13 +34,13 @@ static const char rcsid[] =
 #endif /* not lint */
 
 #include <sys/param.h>
-#include <sys/time.h>
 #include <ctype.h>
 #include <err.h>
 #include <grp.h>
 #include <histedit.h>
 #include <pwd.h>
 #include <string.h>
+#include <time.h>
 #include <timeconv.h>
 
 #include <ufs/ufs/dinode.h>
diff --git a/sbin/fsirand/fsirand.c b/sbin/fsirand/fsirand.c
index 761ce5e4018..483879e45d3 100644
--- a/sbin/fsirand/fsirand.c
+++ b/sbin/fsirand/fsirand.c
@@ -35,9 +35,8 @@ static const char rcsid[] =
   "$FreeBSD$";
 #endif /* not lint */
 
-#include <sys/disklabel.h>
 #include <sys/param.h>
-#include <sys/time.h>
+#include <sys/disklabel.h>
 #include <sys/resource.h>
 
 #include <ufs/ufs/dinode.h>
@@ -50,6 +49,7 @@ static const char rcsid[] =
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 static void usage(void) __dead2;
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c
index 96fa9eb8a91..f98a51a7c31 100644
--- a/sbin/newfs/mkfs.c
+++ b/sbin/newfs/mkfs.c
@@ -44,6 +44,14 @@ static char sccsid[] = "@(#)mkfs.c	8.11 (Berkeley) 5/3/95";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <sys/param.h>
+#include <sys/disklabel.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <sys/resource.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
 #include <err.h>
 #include <grp.h>
 #include <limits.h>
@@ -52,20 +60,11 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <time.h>
 #include <unistd.h>
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/resource.h>
-#include <sys/stat.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/dir.h>
 #include <ufs/ffs/fs.h>
-#include <sys/disklabel.h>
-#include <sys/file.h>
-#include <sys/mman.h>
-#include <sys/ioctl.h>
 #include "newfs.h"
 
 /*
diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c
index 4f3fded80cb..a3c9d687765 100644
--- a/usr.sbin/makefs/ffs.c
+++ b/usr.sbin/makefs/ffs.c
@@ -80,6 +80,7 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "makefs.h"
diff --git a/usr.sbin/makefs/makefs.c b/usr.sbin/makefs/makefs.c
index f2420b6b2f8..60b691683b2 100644
--- a/usr.sbin/makefs/makefs.c
+++ b/usr.sbin/makefs/makefs.c
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "makefs.h"
diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c
index 4da58baafe5..979eef402d5 100644
--- a/usr.sbin/quot/quot.c
+++ b/usr.sbin/quot/quot.c
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/stdint.h>
 #include <sys/mount.h>
 #include <sys/disklabel.h>
-#include <sys/time.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
 
@@ -49,6 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 /* some flags of what to do: */