Working on macros

Author: thomasjm

cbits/posix/bsd_closefrom.h

@@ -0,0 +1,6 @@
+#ifndef BSD_CLOSEFROM_H_
+#define BSD_CLOSEFROM_H_
+
+void closefrom(int lowfd);
+
+#endif // BSD_CLOSEFROM_H_

cbits/posix/common.h

@@ -23,7 +23,6 @@ struct std_handle {
 };
 
 void closefrom_excluding(int from, int excluding);
-void closefrom(int lowfd);
 
 // defined in find_executable.c
 #if !defined(HAVE_EXECVPE)

cbits/posix/runProcess.c

@@ -7,6 +7,8 @@
 #include "runProcess.h"
 #include "common.h"
 
+#include "bsd_closefrom.h"
+
 #include <unistd.h>
 #include <errno.h>
 #include <sys/wait.h>
@@ -19,7 +21,8 @@
 #include <signal.h>
 #endif
 
-#if defined(HAVE_CLOSE_RANGE)
+#if defined(HAVE_LINUX_CLOSE_RANGE_H)
+#define _GNU_SOURCE
 #include <linux/close_range.h>
 #endif
 

configure.ac

@@ -17,15 +17,16 @@ AC_CHECK_FUNCS([setitimer sysconf])
 AC_CHECK_FUNCS([execvpe])
 
 # check for headers and functions used by bsd_closefrom.c
-AC_CHECK_HEADERS([dirent.h fcntl.h libproc.h ndir.h sys/dir.h sys/ndir.h])
-AC_CHECK_FUNCS([
-  closefrom
-  close_range
-  dirfd
-  proc_pid
-  proc_pidinfo
-  sysconf
-  ])
+AC_CHECK_HEADERS([dirent.h fcntl.h libproc.h linux/close_range.h ndir.h sys/dir.h sys/ndir.h])
+AC_CHECK_FUNCS([closefrom close_range dirfd proc_pidinfo sysconf])
+AC_MSG_CHECKING([for /proc/pid/fd directory])
+if test -d "/proc/$$/fd" ; then
+	AC_DEFINE([HAVE_PROC_PID], [1], [Define if you have /proc/$pid/fd])
+	AC_MSG_RESULT([yes])
+else
+	AC_MSG_RESULT([no])
+fi
+
 
 # posix_spawn checks
 AC_CHECK_HEADERS([spawn.h])