build: improve tmpdir management (#15)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
metwork-framework · Jan 1, 2021 · 6a1dd31 · 6a1dd31
1 parent 205f66b
commit 6a1dd31
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/src/mapserverapi.c b/src/mapserverapi.c
@@ -21,15 +21,21 @@ void mapserverapi_init() {
     if (tmp != NULL) {
         __MAPSERVERAPI_TMPDIR = g_strdup(tmp);
     }
-    tmp = g_getenv("TMPDIR");
-    if (tmp != NULL) {
-        __MAPSERVERAPI_TMPDIR = g_strdup(tmp);
-    }
-    tmp = g_getenv("TMP");
-    if (tmp != NULL) {
-        __MAPSERVERAPI_TMPDIR = g_strdup(tmp);
+    else {
+        tmp = g_getenv("TMPDIR");
+        if (tmp != NULL) {
+            __MAPSERVERAPI_TMPDIR = g_strdup(tmp);
+        }
+        else {
+            tmp = g_getenv("TMP");
+            if (tmp != NULL) {
+                __MAPSERVERAPI_TMPDIR = g_strdup(tmp);
+            }
+            else {
+                __MAPSERVERAPI_TMPDIR = g_strdup("/tmp");
+            }
+        }
     }
-    __MAPSERVERAPI_TMPDIR = g_strdup("/tmp");
     if (__MAPSERVER_SETUP == FALSE) {
         msSetup();
         __MAPSERVER_SETUP = TRUE;