Implemented a optimized hash-set that can be used in various parts of the compiler...

[xonotic/gmqcc.git] / test.c

diff --git a/test.c b/test.c
index ed0abc1f85c51062763c015fc7643b98deca17b2..bf32885a19fb31a306f8c5b784eb99d4e0f1441b 100644 (file)
--- a/test.c
+++ b/test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012
+ * Copyright (C) 2012, 2013
  *     Dale Weiler
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -121,16 +121,12 @@ FILE ** task_popen(const char *command, const char *mode) {
         close(2), dup(errhandle[1]);
 
         execvp(*argv, argv);
-        exit(1);
+        exit(EXIT_FAILURE);
     } else {
         /* fork failed */
         goto task_popen_error_3;
     }
 
-    if (argv)
-        vec_free(argv);
-    return data->handles;
-
 task_popen_error_3: close(errhandle[0]), close(errhandle[1]);
 task_popen_error_2: close(outhandle[0]), close(outhandle[1]);
 task_popen_error_1: close(inhandle [0]), close(inhandle [1]);
@@ -156,13 +152,40 @@ int task_pclose(FILE **handles) {
     return status;
 }
 #else
-#      ifdef __MINGW32__
+#    define _WIN32_LEAN_AND_MEAN
+#    define popen  _popen
+#    define pclose _pclose
+#    include <windows.h>
+#   include <io.h>
+#    include <fcntl.h>
+    /*
+     * Bidirectional piping implementation for windows using CreatePipe and DuplicateHandle +
+     * other hacks.
+     */
+
+    typedef struct {
+        int __dummy;
+        /* TODO: implement */
+    } popen_t;
+
+    FILE **task_popen(const char *command, const char *mode) {
+        (void)command;
+        (void)mode;
+
+        /* TODO: implement */
+        return NULL;
+    }
+
+    void task_pclose(FILE **files) {
+        /* TODO: implement */
+        (void)files;
+        return;
+    }
+
+#    ifdef __MINGW32__
         /* mingw32 has dirent.h */
-#              include <dirent.h>
-#      elif defined (_MSC_VER)
-#              define _WIN32_LEAN_AND_MEAN
-#              include <Windows.h>
-#              include <io.h>
+#        include <dirent.h>
+#    elif defined (_MSC_VER)
         /* 
          * visual studio lacks dirent.h it's a posix thing
          * so we emulate it with the WinAPI.
@@ -235,7 +258,14 @@ int task_pclose(FILE **handles) {
             }
             return data;
         }
-#      endif
+
+        /*
+         * Visual studio also lacks S_ISDIR for sys/stat.h, so we emulate this as well
+         * which is not hard at all.
+         */
+#        undef  S_ISDIR /* undef just incase */
+#        define S_ISDIR(X) ((X)&_S_IFDIR)
+#    endif
 #endif
 
 #define TASK_COMPILE 0
@@ -380,7 +410,10 @@ bool task_template_generate(task_template_t *template, char tag, const char *fil
      * Value will contain a newline character at the end, we need to strip
      * this otherwise kaboom, seriously, kaboom :P
      */
-    *strrchr(value, '\n')='\0';
+    if (strchr(value, '\n'))
+        *strrchr(value, '\n')='\0';
+    else /* cppcheck: possible nullpointer dereference */
+        abort();
 
     /*
      * Now allocate and set the actual value for the specific tag. Which
@@ -401,7 +434,7 @@ bool task_template_parse(const char *file, task_template_t *template, FILE *fp)
         return false;
 
     /* top down parsing */
-    while (util_getline(&back, &size, fp) != EOF) {
+    while (file_getline(&back, &size, fp) != EOF) {
         /* skip whitespace */
         data = back;
         if (*data && (*data == ' ' || *data == '\t'))
@@ -481,7 +514,10 @@ bool task_template_parse(const char *file, task_template_t *template, FILE *fp)
                  * Value will contain a newline character at the end, we need to strip
                  * this otherwise kaboom, seriously, kaboom :P
                  */
-                *strrchr(value, '\n')='\0';
+                if (strrchr(value, '\n'))
+                    *strrchr(value, '\n')='\0';
+                else /* cppcheck: possible null pointer dereference */
+                    abort();
 
                 vec_push(template->comparematch, util_strdup(value));
 
@@ -539,7 +575,7 @@ task_template_t *task_template_compile(const char *file, const char *dir) {
     memset  (fullfile, 0, sizeof(fullfile));
     snprintf(fullfile,    sizeof(fullfile), "%s/%s", dir, file);
 
-    tempfile = fopen(fullfile, "r");
+    tempfile = file_open(fullfile, "r");
     template = mem_a(sizeof(task_template_t));
     task_template_nullify(template);
 
@@ -614,7 +650,7 @@ task_template_t *task_template_compile(const char *file, const char *dir) {
     }
 
 success:
-    fclose(tempfile);
+    file_close(tempfile);
     return template;
 
 failure:
@@ -623,7 +659,7 @@ failure:
      * so the check to see if it's not null here is required.
      */
     if (tempfile)
-        fclose(tempfile);
+        file_close(tempfile);
     mem_d (template);
 
     return NULL;
@@ -759,7 +795,7 @@ bool task_propagate(const char *curdir) {
             memset  (buf,0,sizeof(buf));
             snprintf(buf,  sizeof(buf), "%s.stdout", template->tempfilename);
             task.stdoutlogfile = util_strdup(buf);
-            if (!(task.stdoutlog     = fopen(buf, "w"))) {
+            if (!(task.stdoutlog     = file_open(buf, "w"))) {
                 con_err("error opening %s for stdout\n", buf);
                 continue;
             }
@@ -767,7 +803,7 @@ bool task_propagate(const char *curdir) {
             memset  (buf,0,sizeof(buf));
             snprintf(buf,  sizeof(buf), "%s.stderr", template->tempfilename);
             task.stderrlogfile = util_strdup(buf);
-            if (!(task.stderrlog     = fopen(buf, "w"))) {
+            if (!(task.stderrlog     = file_open(buf, "w"))) {
                 con_err("error opening %s for stderr\n", buf);
                 continue;
             }
@@ -851,8 +887,8 @@ void task_destroy(const char *curdir) {
          * annoying to have to do all this cleanup work.
          */
         if (task_tasks[i].runhandles) task_pclose(task_tasks[i].runhandles);
-        if (task_tasks[i].stdoutlog)  fclose     (task_tasks[i].stdoutlog);
-        if (task_tasks[i].stderrlog)  fclose     (task_tasks[i].stderrlog);
+        if (task_tasks[i].stdoutlog)  file_close (task_tasks[i].stdoutlog);
+        if (task_tasks[i].stderrlog)  file_close (task_tasks[i].stderrlog);
 
         /*
          * Only remove the log files if the test actually compiled otherwise
@@ -930,7 +966,7 @@ bool task_execute(task_template_t *template, char ***line) {
         char  *data    = NULL;
         size_t size    = 0;
         size_t compare = 0;
-        while (util_getline(&data, &size, execute) != EOF) {
+        while (file_getline(&data, &size, execute) != EOF) {
             if (!strcmp(data, "No main function found\n")) {
                 con_err("test failure: `%s` [%s] (No main function found)\n",
                     template->description,
@@ -1006,8 +1042,8 @@ void task_schedualize() {
          * Read data from stdout first and pipe that stuff into a log file
          * then we do the same for stderr.
          */
-        while (util_getline(&data, &size, task_tasks[i].runhandles[1]) != EOF) {
-            fputs(data, task_tasks[i].stdoutlog);
+        while (file_getline(&data, &size, task_tasks[i].runhandles[1]) != EOF) {
+            file_puts(task_tasks[i].stdoutlog, data);
 
             if (strstr(data, "failed to open file")) {
                 task_tasks[i].compiled = false;
@@ -1016,7 +1052,7 @@ void task_schedualize() {
 
             fflush(task_tasks[i].stdoutlog);
         }
-        while (util_getline(&data, &size, task_tasks[i].runhandles[2]) != EOF) {
+        while (file_getline(&data, &size, task_tasks[i].runhandles[2]) != EOF) {
             /*
              * If a string contains an error we just dissalow execution
              * of it in the vm.
@@ -1030,7 +1066,7 @@ void task_schedualize() {
                 task_tasks[i].compiled = false;
             }
 
-            fputs(data, task_tasks[i].stderrlog);
+            file_puts(task_tasks[i].stderrlog, data);
             fflush(task_tasks[i].stdoutlog);
         }