From 1b2764421c940ee03d536b2ec9506c30d280b21d Mon Sep 17 00:00:00 2001
From: Ben Walker <benjamin.walker@intel.com>
Date: Mon, 8 May 2017 12:46:11 -0700
Subject: [PATCH] build: Automatically detect use of POSIX includes

Scan the source for POSIX includes outside of the
allowed locations in check_format.sh. This only
tests for POSIX headers - not Linux Standards Base.

Also, fix one bug that was caught by this addition.

Change-Id: Ib0ca93fe6ac552dc49d95b27b4803e40282027e8
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
---
 include/spdk/stdinc.h   |  1 +
 lib/net/interface.c     |  2 -
 scripts/check_format.sh | 11 ++++++
 scripts/posix.txt       | 82 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 94 insertions(+), 2 deletions(-)
 create mode 100644 scripts/posix.txt

diff --git a/include/spdk/stdinc.h b/include/spdk/stdinc.h
index 9f473606b..586a94f56 100644
--- a/include/spdk/stdinc.h
+++ b/include/spdk/stdinc.h
@@ -72,6 +72,7 @@ extern "C" {
 #include <syslog.h>
 #include <termios.h>
 #include <unistd.h>
+#include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <sys/ioctl.h>
diff --git a/lib/net/interface.c b/lib/net/interface.c
index e7125607c..de9cb4f43 100644
--- a/lib/net/interface.c
+++ b/lib/net/interface.c
@@ -42,8 +42,6 @@
 
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
-#include <net/if.h>
-
 
 static TAILQ_HEAD(, spdk_interface) g_interface_head;
 
diff --git a/scripts/check_format.sh b/scripts/check_format.sh
index a4dd1fdad..ec128f45b 100755
--- a/scripts/check_format.sh
+++ b/scripts/check_format.sh
@@ -62,6 +62,17 @@ else
 fi
 rm -f eofnl.log
 
+echo -n "Checking for POSIX includes..."
+git grep -I -i -f scripts/posix.txt -- './*' ':!include/spdk/stdinc.h' ':!lib/vhost/rte_vhost/**' ':!scripts/posix.txt' > scripts/posix.log || true
+if [ -s scripts/posix.log ]; then
+	echo "POSIX includes detected. Please include spdk/stdinc.h instead."
+	cat scripts/posix.log
+	rc=1
+else
+	echo " OK"
+fi
+rm -f scripts/posix.log
+
 if hash pep8; then
 	echo -n "Checking Python style..."
 
diff --git a/scripts/posix.txt b/scripts/posix.txt
new file mode 100644
index 000000000..2d07f23df
--- /dev/null
+++ b/scripts/posix.txt
@@ -0,0 +1,82 @@
+<aio.h>
+<arpa/inet.h>
+<assert.h>
+<complex.h>
+<cpio.h>
+<ctype.h>
+<dirent.h>
+<dlfcn.h>
+<errno.h>
+<fcntl.h>
+<fenv.h>
+<float.h>
+<fmtmsg.h>
+<fnmatch.h>
+<ftw.h>
+<glob.h>
+<grp.h>
+<iconv.h>
+<inttypes.h>
+<iso646.h>
+<langinfo.h>
+<libgen.h>
+<limits.h>
+<locale.h>
+<math.h>
+<monetary.h>
+<mqueue.h>
+<ndbm.h>
+<net/if.h>
+<netdb.h>
+<netinet/in.h>
+<netinet/tcp.h>
+<nl_types.h>
+<poll.h>
+<pthread.h>
+<pwd.h>
+<regex.h>
+<sched.h>
+<search.h>
+<semaphore.h>
+<setjmp.h>
+<signal.h>
+<spawn.h>
+<stdarg.h>
+<stdbool.h>
+<stddef.h>
+<stdint.h>
+<stdio.h>
+<stdlib.h>
+<string.h>
+<strings.h>
+<stropts.h>
+<sys/ipc.h>
+<sys/mman.h>
+<sys/msg.h>
+<sys/resource.h>
+<sys/select.h>
+<sys/sem.h>
+<sys/shm.h>
+<sys/socket.h>
+<sys/stat.h>
+<sys/statvfs.h>
+<sys/time.h>
+<sys/times.h>
+<sys/types.h>
+<sys/uio.h>
+<sys/un.h>
+<sys/utsname.h>
+<sys/wait.h>
+<syslog.h>
+<tar.h>
+<termios.h>
+<tgmath.h>
+<time.h>
+<trace.h>
+<ulimit.h>
+<unistd.h>
+<utime.h>
+<utmpx.h>
+<wchar.h>
+<wctype.h>
+<wordexp.h>