parser_const_string now uses hashtables; hashtables may want to dup an empty string...

[xonotic/gmqcc.git] / test.c

diff --git a/test.c b/test.c
index ebd7bfa89c97310674a5ebde1c4bab6e73da3f8d..5ee02c344eb834dfe995e7d8f0d2945d1a49eb5b 100644 (file)
--- a/test.c
+++ b/test.c
@@ -644,9 +644,9 @@ bool task_propagate(const char *curdir, size_t *pad, const char *defs) {
     char             buffer[4096];
     size_t           found = 0;
 
     char             buffer[4096];
     size_t           found = 0;
 

-    dir = opendir(curdir);
+    dir = fs_dir_open(curdir);

 
 

-    while ((files = readdir(dir))) {
+    while ((files = fs_dir_read(dir))) {

         snprintf(buffer,   sizeof(buffer), "%s/%s", curdir, files->d_name);
 
         if (stat(buffer, &directory) == -1) {
         snprintf(buffer,   sizeof(buffer), "%s/%s", curdir, files->d_name);
 
         if (stat(buffer, &directory) == -1) {


@@ -679,7 +679,8 @@ bool task_propagate(const char *curdir, size_t *pad, const char *defs) {
              * Generate a temportary file name for the output binary
              * so we don't trample over an existing one.
              */
              * Generate a temportary file name for the output binary
              * so we don't trample over an existing one.
              */

-            tmpl->tempfilename = tempnam(curdir, "TMPDAT");
+            tmpl->tempfilename = NULL;
+            util_asprintf(&tmpl->tempfilename, "%s/TMPDAT.%s", curdir, files->d_name);

 
             /*
              * Additional QCFLAGS enviroment variable may be used
 
             /*
              * Additional QCFLAGS enviroment variable may be used


@@ -777,7 +778,7 @@ bool task_propagate(const char *curdir, size_t *pad, const char *defs) {
         found
     );
 
         found
     );
 

-    closedir(dir);
+    fs_dir_close(dir);

     return success;
 }
 
     return success;
 }
 


@@ -790,9 +791,9 @@ void task_precleanup(const char *curdir) {
     struct dirent   *files;
     char             buffer[4096];
 
     struct dirent   *files;
     char             buffer[4096];
 

-    dir = opendir(curdir);
+    dir = fs_dir_open(curdir);

 
 

-    while ((files = readdir(dir))) {
+    while ((files = fs_dir_read(dir))) {

         if (strstr(files->d_name, "TMP")     ||
             strstr(files->d_name, ".stdout") ||
             strstr(files->d_name, ".stderr"))
         if (strstr(files->d_name, "TMP")     ||
             strstr(files->d_name, ".stdout") ||
             strstr(files->d_name, ".stderr"))


@@ -805,7 +806,7 @@ void task_precleanup(const char *curdir) {
         }
     }
 
         }
     }
 

-    closedir(dir);
+    fs_dir_close(dir);

 }
 
 void task_destroy(void) {
 }
 
 void task_destroy(void) {