Move GetRelocatedProcdirRoot() from libntech and add GetProcdirPid()

These have checks for environment variables to override to support testing.

Ticket: CFE-3429
Changelog: none

Author: craigcomstock

libenv/unix_iface.c

@@ -39,6 +39,7 @@
 #include <ip_address.h>
 #include <file_lib.h>
 #include <cleanup.h>
+#include <unix.h> /* GetRelocatedProcdirRoot() and GetProcdirPid() */
 
 #ifdef HAVE_SYS_JAIL_H
 # include <sys/jail.h>

libpromises/unix.c

@@ -25,6 +25,7 @@
 #include <unix.h>
 #include <exec_tools.h>
 #include <file_lib.h>
+#include <string_lib.h> /* StringToInt64() */
 
 #ifdef HAVE_SYS_UIO_H
 # include <sys/uio.h>
@@ -527,4 +528,45 @@ bool GetGroupID(const char *group_name, gid_t *gid, LogLevel error_log_level)
     return true;
 }
 
+const char* GetRelocatedProcdirRoot()
+{
+    const char *procdir = getenv("CFENGINE_TEST_OVERRIDE_PROCDIR");
+    if (procdir == NULL)
+    {
+        procdir = "";
+    }
+    else
+    {
+        Log(LOG_LEVEL_VERBOSE, "Overriding /proc location to be %s", procdir);
+    }
+
+    return procdir;
+}
+
+/**
+ * With the addition of using the current PID when examining the proc filesystem for details
+ * we need a test-override option for acceptance tests.
+ */
+int GetProcdirPid()
+{
+    const char *procpid = getenv("CFENGINE_TEST_OVERRIDE_PROCPID");
+    if (procpid != NULL)
+    {
+        int64_t pid_int;
+        int rc;
+        rc = StringToInt64(procpid, &pid_int);
+        if (rc != 0)
+        {
+            Log(LOG_LEVEL_ERR, "Could not parse CFENGINE_TEST_OVERRIDE_PROCPID '%s' as integer: '%s'", procpid, strerror(errno));
+        }
+        else
+        {
+            Log(LOG_LEVEL_VERBOSE, "Overriding proc pid from env var CFENGINE_TEST_OVERRIDE_PROCPID with value %jd", (intmax_t) pid_int);
+            return (int) pid_int;
+        }
+    }
+    return (int) getpid();
+}
+
+
 #endif /* !__MINGW32__ */

libpromises/unix.h

@@ -33,6 +33,17 @@ void ProcessSignalTerminate(pid_t pid);
 bool GetCurrentUserName(char *userName, int userNameLen);
 
 #ifndef __MINGW32__
+/**
+ * @brief For testing things against /proc, uses env var CFENGINE_TEST_OVERRIDE_PROCDIR
+ * @return the extra directory to add BEFORE /proc in the path
+ */
+const char* GetRelocatedProcdirRoot();
+/**
+ * @brief For testing things against /proc, use env var CFENGINE_TEST_OVERRIDE_PROCPID
+ * @return the fake pid to use in proc paths
+ */
+int GetProcdirPid();
+
 /**
  * Get user name for the user with UID #uid
  *