Check autoconf results before #including; clean up header inclusion

conf-t.c

@@ -1,11 +1,7 @@
 
 /* Unit tests for conf */
 
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
+#include "common.h"
 #include "conf.h"
 
 #define TESTFILEPATH "/tmp/_conf_test.txt"

configure.ac

@@ -17,7 +17,8 @@ AC_C_CONST
 AC_HEADER_STDC
 AC_HEADER_TIME
 AC_CHECK_HEADERS([netdb.h unistd.h sys/socket.h errno.h netinet/in.h fcntl.h])
-AC_CHECK_HEADERS([signal.h syslog.h])
+AC_CHECK_HEADERS([signal.h syslog.h sys/un.h sys/types.h sys/wait.h sys/poll.h])
+AC_CHECK_HEADERS([netinet/in.h arpa/inet.h])
 
 AC_PATH_PROG([VASCONFIG], [vas-config], [no], [/opt/quest/bin:$PATH])
 if test x"$VASCONFIG" = x"no"; then
@@ -31,6 +32,7 @@ AC_CHECK_FUNC([getopt], [], [AC_LIBOBJ([getopt])])
 dnl AC_CHECK_FUNCS([err errx warn warnx], [], [AC_LIBOBJ([err]) ; break])
 AC_SEARCH_LIBS([socket], [socket])
 AC_SEARCH_LIBS([gethostbyname], [nsl])
+AC_CHECK_FUNC([socketpair])
 AC_FUNC_FORK
 
 AC_CHECK_TYPE([socklen_t],[AC_DEFINE([HAVE_SOCKLEN_T],[1],[socklen_t])],,[

dnstcp.c

@@ -10,7 +10,9 @@
 #include "err.h"
 #include "dns.h"
 #include "dnstcp.h"
-#include <sys/un.h>
+#if HAVE_SYS_UN_H
+# include <sys/un.h>
+#endif
 
 /*
  * DNS over TCP
@@ -117,6 +119,7 @@ tcp_connect(const char *host, const char *service)
 static int
 unix_connect(const char *local)
 {
+#ifdef AF_UNIX
     int s;
     struct sockaddr_un unaddr;
 
@@ -136,6 +139,10 @@ unix_connect(const char *local)
 	return -1;
     }
     return s;
+#else
+    warnx("AF_UNIX not implemented");
+    return -1;
+#endif
 }
 
 /*
@@ -164,10 +171,15 @@ debug_connect_exec(const char *wrapper, const char *host)
 {
     int sp[2];
 
+#if HAVE_SOCKETPAIR && defined(AF_UNIX)
     if (socketpair(AF_UNIX, SOCK_STREAM, 0, sp) < 0) {
 	warn("socketpair");
 	return -1;
     }
+#else
+    warnx("unable to create bidirectional IPC");
+    return -1;
+#endif
 
     if (signal(SIGCHLD, SIG_IGN) == SIG_ERR)
 	warn("signal SIGCHLD");

list-t.c

@@ -1,10 +1,7 @@
 
 /* Unit tests for lists */
 
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "common.h"
 #include "list.h"
 
 #define streq(a,b) ((a)!=NULL && (b)!=NULL && strcmp(a,b)==0)

list.c

@@ -2,8 +2,7 @@
 /* Manage lists. A list is a null terminated array of string pointers.
  * This code is meant to be convenient, not efficient. Won't scale */
 
-#include <stdlib.h>
-#include <string.h>
+#include "common.h"
 #include "list.h"
 
 /* Creates a list out of a whitespace separated string. 

resconf.c

@@ -3,9 +3,6 @@
  * Records resolver configuration, as read from /etc/resolv.conf
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include "common.h"
 #include "resconf.h"
 #include "stream.h"

server-t.c

@@ -107,11 +107,27 @@
 #include "dnsdebug.h"
 #include "err.h"
 
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/un.h>
-#include <sys/wait.h>
-#include <sys/poll.h>
+#if HAVE_SIGNAL_H
+# include <signal.h>
+#endif
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#if HAVE_SYS_UN_H
+# include <sys/un.h>
+#endif
+#if HAVE_SYS_WAIT_H
+# include <sys/wait.h>
+#endif
+#if HAVE_SYS_POLL_H
+# include <sys/poll.h>
+#endif
+#if HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+#if HAVE_ARPA_INET_H
+# include <arpa/inet.h>
+#endif
 
 #define TAG "server-t: "
 
@@ -749,10 +765,6 @@ match_query(struct dns_msg *qmsg, const char *pattern)
     return 1;
 }
 
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
 /* Waits and accepts a single connection on the given port */
 int
 tcp_accept(int port)
@@ -1224,6 +1236,10 @@ delete_unix_listener()
 static int
 build_unix_listener()
 {
+#if !defined(AF_UNIX)
+    warnx("AF_UNIX not available on this system");
+    return -1;
+#else
     int s;
     struct sockaddr_un unaddr;
     char *path;
@@ -1252,6 +1268,7 @@ build_unix_listener()
 	err(1, "listen");
     add_fd(s, unix_listener_ready, 0);
     return s;
+#endif
 }
 
 static RETSIGTYPE

stream.c

@@ -5,9 +5,7 @@
  * a primitive lexical analyser.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-
+#include "common.h"
 #include "stream.h"
 
 /* Prototypes */