[core] chunkqueue_env_tmpdir()

centralize tempdir logic: initialize env_tmpdir at startup using TMPDIR, then TEMP (on _WIN32), and finally falling back to "/var/tmp"
HybridOS2 · Jul 26, 2023 · 567f225 · 567f225
1 parent 9abba32
commit 567f225
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 12 deletions.
diff --git a/src/chunk.c b/src/chunk.c
@@ -69,6 +69,7 @@ static chunk *chunk_buffers;
 static int chunks_oversized_n;
 static const array *chunkqueue_default_tempdirs = NULL;
 static off_t chunkqueue_default_tempfile_size = DEFAULT_TEMPFILE_SIZE;
+static const char *env_tmpdir = NULL;
 
 void chunkqueue_set_chunk_size (size_t sz)
 {
@@ -669,6 +670,12 @@ void chunkqueue_set_tempdirs_default (const array *tempdirs, off_t upload_temp_f
         upload_temp_file_size = DEFAULT_TEMPFILE_SIZE;
     chunkqueue_default_tempdirs = tempdirs;
     chunkqueue_default_tempfile_size = upload_temp_file_size;
+
+    env_tmpdir = getenv("TMPDIR");
+    #ifdef _WIN32
+    if (NULL == env_tmpdir) env_tmpdir = getenv("TEMP");
+    #endif
+    if (NULL == env_tmpdir) env_tmpdir = "/var/tmp";
 }
 
 void chunkqueue_set_tempdirs(chunkqueue * const restrict cq, const array * const restrict tempdirs, off_t upload_temp_file_size) {
@@ -679,6 +686,11 @@ void chunkqueue_set_tempdirs(chunkqueue * const restrict cq, const array * const
     cq->tempdir_idx = 0;
 }
 
+const char *chunkqueue_env_tmpdir(void) {
+    /*(chunkqueue_set_tempdirs_default() must have been called at startup)*/
+    return env_tmpdir;
+}
+
 __attribute_noinline__
 static void chunkqueue_dup_file_chunk_fd (chunk * const restrict d, const chunk * const restrict c) {
     /*assert(d != c);*/
@@ -775,8 +787,9 @@ static chunk *chunkqueue_get_append_newtempfile(chunkqueue * const restrict cq,
         }
     }
     else {
+        const char *tmpdir = chunkqueue_env_tmpdir();
         c->file.fd =
-          chunkqueue_get_append_mkstemp(template, CONST_STR_LEN("/var/tmp"));
+          chunkqueue_get_append_mkstemp(template, tmpdir, strlen(tmpdir));
         if (-1 != c->file.fd) return c;
     }
 

diff --git a/src/chunk.h b/src/chunk.h
@@ -83,6 +83,9 @@ void chunkqueue_set_tempdirs_default (const array *tempdirs, off_t upload_temp_f
 
 void chunkqueue_set_tempdirs(chunkqueue * restrict cq, const array * restrict tempdirs, off_t upload_temp_file_size);
 
+__attribute_cold__
+const char *chunkqueue_env_tmpdir(void);
+
 void chunkqueue_append_file(chunkqueue * restrict cq, const buffer * restrict fn, off_t offset, off_t len); /* copies "fn" */
 void chunkqueue_append_file_fd(chunkqueue * restrict cq, const buffer * restrict fn, int fd, off_t offset, off_t len); /* copies "fn" */
 void chunkqueue_append_mem(chunkqueue * restrict cq, const char * restrict mem, size_t len); /* copies memory */

diff --git a/src/configfile.c b/src/configfile.c
@@ -2664,13 +2664,13 @@ int config_set_defaults(server *srv) {
 		}
 	}
 
+	chunkqueue_set_tempdirs_default(
+		srv->srvconf.upload_tempdirs,
+		srv->srvconf.upload_temp_file_size);
+
 	if (!srv->srvconf.upload_tempdirs->used) {
-		const char *tmpdir = getenv("TMPDIR");
-	  #ifdef _WIN32
-		if (NULL == tmpdir) tmpdir = getenv("TEMP");
-	  #endif
-		if (NULL == tmpdir) tmpdir = "/var/tmp";
-		array_insert_value(srv->srvconf.upload_tempdirs, tmpdir, strlen(tmpdir));
+		const char *tmpdir = chunkqueue_env_tmpdir();
+		array_insert_value(srv->srvconf.upload_tempdirs,tmpdir,strlen(tmpdir));
 	}
 
 	if (srv->srvconf.upload_tempdirs->used) {
@@ -2699,10 +2699,6 @@ int config_set_defaults(server *srv) {
 		}
 	}
 
-	chunkqueue_set_tempdirs_default(
-		srv->srvconf.upload_tempdirs,
-		srv->srvconf.upload_temp_file_size);
-
 	if (!s->document_root || buffer_is_blank(s->document_root)) {
 		log_error(srv->errh, __FILE__, __LINE__, "server.document-root is not set");
 		return -1;

diff --git a/src/mod_deflate.c b/src/mod_deflate.c
@@ -1523,7 +1523,7 @@ static int mod_deflate_using_libdeflate (handler_ctx * const hctx, const plugin_
             buffer_copy_string_len(fn, BUF_PTR_LEN(&ds->value));
         }
         else
-            buffer_copy_string_len(fn, CONST_STR_LEN("/var/tmp"));
+            buffer_copy_string(fn, chunkqueue_env_tmpdir());
         buffer_append_path_len(fn, CONST_STR_LEN("lighttpd-XXXXXX"));
         fd = fdevent_mkostemp(fn->ptr, 0);
         if (-1 == fd) return 0;

diff --git a/src/t/test_mod.c b/src/t/test_mod.c
@@ -3,6 +3,8 @@
 #undef NDEBUG
 #include <assert.h>
 
+#include "chunk.h"
+
 void test_mod_access (void);
 void test_mod_alias (void);
 void test_mod_evhost (void);
@@ -13,6 +15,8 @@ void test_mod_staticfile (void);
 void test_mod_userdir (void);
 
 int main(void) {
+    chunkqueue_set_tempdirs_default(NULL, 0);
+
     test_mod_access();
     test_mod_alias();
     test_mod_evhost();