Separate some functions to common.h

This patch is part of a bigger refactor that will separate some modules
functions. This functions will need to be used in both files.

require-ess/src/common.c

+#include <dbAccess.h>
+#include <errno.h>
+#include <error.h>
+#include <limits.h>
+#include <osiFileName.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "common.h"
+
+char *realpathSeparator(const char *location) {
+  size_t size = 0;
+  char *buffer = realpath(location, NULL);
+  if (!buffer) {
+    debug("require: realpath(%s) failed\n", location);
+    perror("require:");
+    return NULL;
+  }
+  size = strnlen(buffer, PATH_MAX);
+  /* linux realpath removes trailing slash */
+  if (buffer[size - 1] != OSI_PATH_SEPARATOR[0]) {
+    char* tmp = realloc(buffer, size + sizeof(OSI_PATH_SEPARATOR));
+    if (!tmp){
+        free(buffer);
+        return NULL;
+    }
+    buffer = tmp;
+    strcpy(buffer + size, OSI_PATH_SEPARATOR);
+  }
+  return buffer;
+}
+
+int putenvprintf(const char *format, ...) {
+  va_list ap;
+  char *var = NULL;
+  char *val = NULL;
+  int status = 0;
+
+  if (!format) return -1;
+  va_start(ap, format);
+  if (vasprintf(&var, format, ap) < 0) {
+    perror("require putenvprintf");
+    return errno;
+  }
+  va_end(ap);
+
+  debug("require: putenv(\"%s\")\n", var);
+
+  val = strchr(var, '=');
+  if (!val) {
+    fprintf(stderr, "putenvprintf: string contains no =: %s\n", var);
+    status = -1;
+  } else {
+    *val++ = 0;
+    if (setenv(var, val, 1) != 0) {
+      perror("require putenvprintf: setenv failed");
+      status = errno;
+    }
+  }
+  free(var);
+  return status;
+}
+
+void pathAdd(const char *varname, const char *dirname) {
+  char *old_path = NULL;
+
+  if (!varname || !dirname) {
+    fprintf(stderr, "usage: pathAdd \"ENVIRONMENT_VARIABLE\",\"directory\"\n");
+    fprintf(stderr,
+            "       Adds or moves the directory to the front of the "
+            "ENVIRONMENT_VARIABLE\n");
+    fprintf(stderr, "       but after a leading \".\".\n");
+    return;
+  }
+
+  /* add directory to front */
+  old_path = getenv(varname);
+  if (old_path == NULL) {
+    putenvprintf("%s=." OSI_PATH_LIST_SEPARATOR "%s", varname, dirname);
+  } else {
+    size_t len = strnlen(dirname, PATH_MAX);
+    char *p = NULL;
+
+    /* skip over "." at the beginning */
+    if (old_path[0] == '.' && old_path[1] == OSI_PATH_LIST_SEPARATOR[0])
+      old_path += 2;
+
+    /* If directory is already in path, move it to front */
+    p = old_path;
+    while ((p = strstr(p, dirname)) != NULL) {
+      if ((p == old_path || *(p - 1) == OSI_PATH_LIST_SEPARATOR[0]) &&
+          (p[len] == 0 || p[len] == OSI_PATH_LIST_SEPARATOR[0])) {
+        if (p == old_path) break; /* already at front, nothing to do */
+        memmove(old_path + len + 1, old_path, p - old_path - 1);
+        strcpy(old_path, dirname);
+        old_path[len] = OSI_PATH_LIST_SEPARATOR[0];
+        debug("require: modified %s=%s\n", varname, old_path);
+        break;
+      }
+      p += len;
+    }
+    if (p == NULL) /* add new directory to the front (after "." )*/
+      putenvprintf("%s=." OSI_PATH_LIST_SEPARATOR "%s" OSI_PATH_LIST_SEPARATOR
+                   "%s",
+                   varname, dirname, old_path);
+  }
+}

require-ess/src/common.h

+#ifndef __COMMON_H__
+#define __COMMON_H__
+#include <stdio.h>
+
+extern int requireDebug;
+
+#define debug(...) \
+  if (requireDebug) printf(__VA_ARGS__)
+
+char *realpathSeparator(const char *location);
+int putenvprintf(const char *format, ...);
+void pathAdd(const char *varname, const char *dirname);
+#endif  /*__COMMON_H_*/

require-ess/src/require.c

@@ -29,6 +29,7 @@
 #include <string.h>
 #include <sys/stat.h>
 
+#include "common.h"
 #include "version.h"
 
 int requireDebug;
@@ -99,9 +100,6 @@ int requireDebug;
 #error OS_CLASS not defined: Try to compile with USR_CFLAGS += -DOS_CLASS='"${OS_CLASS}"'
 #endif  // OS_CLASS
 
-#define debug(...) \
-  if (requireDebug) printf(__VA_ARGS__)
-
 const char osClass[] = OS_CLASS;
 
 /* loadlib (library)
@@ -150,99 +148,6 @@ static unsigned long moduleCount = 0;
 static unsigned long moduleListBufferSize = 1;
 static unsigned long maxModuleNameLength = 0;
 
-int putenvprintf(const char *format, ...) {
-  va_list ap;
-  char *var = NULL;
-  char *val = NULL;
-  int status = 0;
-
-  if (!format) return -1;
-  va_start(ap, format);
-  if (vasprintf(&var, format, ap) < 0) {
-    perror("require putenvprintf");
-    return errno;
-  }
-  va_end(ap);
-
-  debug("require: putenv(\"%s\")\n", var);
-
-  val = strchr(var, '=');
-  if (!val) {
-    fprintf(stderr, "putenvprintf: string contains no =: %s\n", var);
-    status = -1;
-  } else {
-    *val++ = 0;
-    if (setenv(var, val, 1) != 0) {
-      perror("require putenvprintf: setenv failed");
-      status = errno;
-    }
-  }
-  free(var);
-  return status;
-}
-
-void pathAdd(const char *varname, const char *dirname) {
-  char *old_path = NULL;
-
-  if (!varname || !dirname) {
-    fprintf(stderr, "usage: pathAdd \"ENVIRONMENT_VARIABLE\",\"directory\"\n");
-    fprintf(stderr,
-            "       Adds or moves the directory to the front of the "
-            "ENVIRONMENT_VARIABLE\n");
-    fprintf(stderr, "       but after a leading \".\".\n");
-    return;
-  }
-
-  /* add directory to front */
-  old_path = getenv(varname);
-  if (old_path == NULL) {
-    putenvprintf("%s=." OSI_PATH_LIST_SEPARATOR "%s", varname, dirname);
-  } else {
-    size_t len = strnlen(dirname, PATH_MAX);
-    char *p = NULL;
-
-    /* skip over "." at the beginning */
-    if (old_path[0] == '.' && old_path[1] == OSI_PATH_LIST_SEPARATOR[0])
-      old_path += 2;
-
-    /* If directory is already in path, move it to front */
-    p = old_path;
-    while ((p = strstr(p, dirname)) != NULL) {
-      if ((p == old_path || *(p - 1) == OSI_PATH_LIST_SEPARATOR[0]) &&
-          (p[len] == 0 || p[len] == OSI_PATH_LIST_SEPARATOR[0])) {
-        if (p == old_path) break; /* already at front, nothing to do */
-        memmove(old_path + len + 1, old_path, p - old_path - 1);
-        strcpy(old_path, dirname);
-        old_path[len] = OSI_PATH_LIST_SEPARATOR[0];
-        debug("require: modified %s=%s\n", varname, old_path);
-        break;
-      }
-      p += len;
-    }
-    if (p == NULL) /* add new directory to the front (after "." )*/
-      putenvprintf("%s=." OSI_PATH_LIST_SEPARATOR "%s" OSI_PATH_LIST_SEPARATOR
-                   "%s",
-                   varname, dirname, old_path);
-  }
-}
-
-char *realpathSeparator(const char *location) {
-  size_t ll = 0;
-  int buffer_size = PATH_MAX + strlen(OSI_PATH_SEPARATOR);
-  char *buffer = malloc(buffer_size);
-  buffer = realpath(location, buffer);
-  if (!buffer) {
-    debug("require: realpath(%s) failed\n", location);
-    return NULL;
-  }
-  ll = strnlen(buffer, buffer_size);
-  /* linux realpath removes trailing slash */
-  if (buffer[ll - strlen(OSI_PATH_SEPARATOR)] != OSI_PATH_SEPARATOR[0]) {
-    strcpy(buffer + ll + 1 - strlen(OSI_PATH_SEPARATOR), OSI_PATH_SEPARATOR);
-  }
-  return buffer;
-}
-
 int isModuleLoaded(const char *libname);
 
 static int setupDbPath(const char *module, const char *dbdir) {

require.Makefile

@@ -38,6 +38,7 @@ APPDB := $(APP)/Db
 SOURCES += $(APPSRC)/require.c
 SOURCES += $(APPSRC)/version.c
 SOURCES += $(APPSRC)/afterInit.c
+SOURCES += $(APPSRC)/common.c
 DBDS    += $(APPSRC)/require.dbd
 DBDS    += $(APPSRC)/afterInit.dbd