consolidate includes.

diff --git a/fortune-mod/fortune/fortune.c b/fortune-mod/fortune/fortune.c
index 9fbfc039f4bb71f0589e37e474ae8ef61d707b50..f417b3a0c6adbe37efa3299de23f5dc0a9288c11 100644 (file)
--- a/fortune-mod/fortune/fortune.c
+++ b/fortune-mod/fortune/fortune.c
@@ -98,23 +98,10 @@ static char rcsid[] = "$NetBSD: fortune.c,v 1.8 1995/03/23 08:28:40 cgd Exp $";
 
 #define         PROGRAM_NAME            "fortune-mod"
 
-#include <stdbool.h>
-
-#include        <sys/types.h>
-#include        <sys/time.h>
-#include        <sys/param.h>
-#include        <sys/stat.h>
-#include        <netinet/in.h>
-
-#include        <time.h>
+#include "fortune-mod-common.h"
 #include        <dirent.h>
 #include        <fcntl.h>
 #include        <assert.h>
-#include        <unistd.h>
-#include        <stdio.h>
-#include        <ctype.h>
-#include        <stdlib.h>
-#include        <string.h>
 #include        <errno.h>
 #include        <locale.h>
 #include        <langinfo.h>
@@ -132,7 +119,6 @@ static char rcsid[] = "$NetBSD: fortune.c,v 1.8 1995/03/23 08:28:40 cgd Exp $";
 #endif
 
 #include        "config.h"
-#include        "strfile.h"
 
 #define TRUE    1
 #define FALSE   0

diff --git a/fortune-mod/util/fortune-mod-common.h b/fortune-mod/util/fortune-mod-common.h
new file mode 100644 (file)
index 0000000..baab677
--- /dev/null
+++ b/fortune-mod/util/fortune-mod-common.h
@@ -0,0 +1,59 @@
+/*-
+ * Copyright (c) 1991, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Ken Arnold.
+ *
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the University of
+ *  California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, 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.
+ *
+ *  @(#)strfile.h   8.1 (Berkeley) 5/31/93
+ */
+#pragma once
+#include        <sys/types.h>
+#include        <sys/stat.h>
+/* For ntohl() */
+#ifdef _WIN32
+#include        <winsock2.h>
+#define getpid() 0
+#else
+#include        <arpa/inet.h>
+#include        <unistd.h>
+#endif
+#include        <sys/param.h>
+#include        "strfile.h"
+#include        <stdio.h>
+#include        <time.h>
+#include        <ctype.h>
+#include        <string.h>
+#include        <stdlib.h>
+#include        <stdbool.h>
+#ifndef MAXPATHLEN
+#define MAXPATHLEN      1024
+#endif /* MAXPATHLEN */

diff --git a/fortune-mod/util/randstr.c b/fortune-mod/util/randstr.c
index 061d8fb07356305cbb9de2b561d97f46efc01947..e6b9f68f823e0f27b79da011d077c0732a17bac7 100644 (file)
--- a/fortune-mod/util/randstr.c
+++ b/fortune-mod/util/randstr.c
@@ -86,23 +86,7 @@
  * Who're you gonna quote?  Dan Quayle?
  */
 
-/* For ntohl() */
-#ifdef _WIN32
-#include        <winsock2.h>
-#define getpid() 0
-#else
-#include        <arpa/inet.h>
-#include        <unistd.h>
-#endif
-#include        "strfile.h"
-#include        <stdio.h>
-#include        <stdlib.h>
-#include        <ctype.h>
-#include        <string.h>
-#include        <time.h>
-#ifndef MAXPATHLEN
-#define MAXPATHLEN      1024
-#endif /* MAXPATHLEN */
+#include "fortune-mod-common.h"
 
 char *Infile,                   /* name of input file */
   Datafile[MAXPATHLEN],         /* name of data file */

diff --git a/fortune-mod/util/strfile.c b/fortune-mod/util/strfile.c
index bab41e269647ff1145229c8f3b2069486fa0ab5c..005dde39f6d38fee7f4201c6cf0bf477a8cc1562 100644 (file)
--- a/fortune-mod/util/strfile.c
+++ b/fortune-mod/util/strfile.c
@@ -72,20 +72,7 @@
  *I haven't the faintest flipping idea what all that is, so kill the warnings
  */
 
-#include        <stdlib.h>
-#include        <unistd.h>
-#include        <netinet/in.h>
-#include        <sys/param.h>
-#include        <stdio.h>
-#include        <ctype.h>
-#include        <string.h>
-#include        <time.h>
-#include        <stdbool.h>
-#include        "strfile.h"
-
-#ifndef MAXPATHLEN
-#define MAXPATHLEN      1024
-#endif /* MAXPATHLEN */
+#include "fortune-mod-common.h"
 
 /*
  *    This program takes a file composed of strings separated by

diff --git a/fortune-mod/util/unstr.c b/fortune-mod/util/unstr.c
index d8dddbbb5d519bec4005394fb32908cff09ec9fa..b66cf15c1a7d0e7bdadfbcc6791faec39c48a71b 100644 (file)
--- a/fortune-mod/util/unstr.c
+++ b/fortune-mod/util/unstr.c
@@ -88,19 +88,8 @@ static char sccsid[] = "@(#)unstr.c     8.1 (Berkeley) 5/31/93";
  * get a fortune that contains nothing but a newline.  Karo syrup, syrup.
  * For the gory details, and lots of cussing, see strfile.c
  */
-#include        <sys/types.h>
-#include        <netinet/in.h>
-#include        <sys/param.h>
-#include        "strfile.h"
-#include        <stdio.h>
-#include        <ctype.h>
-#include        <string.h>
-#include        <stdlib.h>
-#include        <unistd.h>
-
-#ifndef MAXPATHLEN
-#define MAXPATHLEN      1024
-#endif /* MAXPATHLEN */
+
+#include "fortune-mod-common.h"
 
 static char *Infile,                   /* name of input file */
   Datafile[MAXPATHLEN],         /* name of data file */