Removing some code duplication

[xonotic/gmqcc.git] / main.c

diff --git a/main.c b/main.c
index 1d151c5782152049fc2e1664977c4334bc64e93c..2c14249945cb52744ee13aed23f33a0a0c602ec8 100644 (file)
--- a/main.c
+++ b/main.c
@@ -46,7 +46,7 @@ const oper_info *operators      = NULL;
 size_t           operator_count = 0;
 
 typedef struct { char *filename; int type; } argitem;
-VECTOR_MAKE(argitem, items);
+static argitem *items = NULL;
 
 #define TYPE_QC  0
 #define TYPE_ASM 1
@@ -181,7 +181,10 @@ static void options_set(uint32_t *flags, size_t idx, bool on)
 static bool options_parse(int argc, char **argv) {
     bool argend = false;
     size_t itr;
-    char buffer[1024];
+    char  buffer[1024];
+    char *redirout = (char*)stdout;
+    char *redirerr = (char*)stderr;
+
     while (!argend && argc > 1) {
         char *argarg;
         argitem item;
@@ -215,6 +218,13 @@ static bool options_parse(int argc, char **argv) {
                 opts_forced_crc = strtol(argarg, NULL, 0);
                 continue;
             }
+            if (options_long_gcc("redirout", &argc, &argv, &redirout)) {
+                continue;
+            }
+            if (options_long_gcc("redirerr", &argc, &argv, &redirerr)) {
+                continue;
+            }
+
             if (!strcmp(argv[0]+1, "debug")) {
                 opts_debug = true;
                 continue;
@@ -331,7 +341,7 @@ static bool options_parse(int argc, char **argv) {
                         return false;
                     }
                     item.filename = argarg;
-                    items_add(item);
+                    vec_push(items, item);
                     break;
 
                 case '-':
@@ -368,9 +378,10 @@ static bool options_parse(int argc, char **argv) {
             argitem item;
             item.filename = argv[0];
             item.type     = TYPE_QC;
-            items_add(item);
+            vec_push(items, item);
         }
     }
+    con_change(redirout, redirerr);
     return true;
 }
 
@@ -460,18 +471,18 @@ int main(int argc, char **argv) {
 
     util_debug("COM", "starting ...\n");
 
-    if (items_elements) {
+    if (vec_size(items)) {
         con_out("Mode: manual\n");
-        con_out("There are %lu items to compile:\n", (unsigned long)items_elements);
-        for (itr = 0; itr < items_elements; ++itr) {
+        con_out("There are %lu items to compile:\n", (unsigned long)vec_size(items));
+        for (itr = 0; itr < vec_size(items); ++itr) {
             con_out("  item: %s (%s)\n",
-                   items_data[itr].filename,
-                   ( (items_data[itr].type == TYPE_QC ? "qc" :
-                     (items_data[itr].type == TYPE_ASM ? "asm" :
-                     (items_data[itr].type == TYPE_SRC ? "progs.src" :
+                   items[itr].filename,
+                   ( (items[itr].type == TYPE_QC ? "qc" :
+                     (items[itr].type == TYPE_ASM ? "asm" :
+                     (items[itr].type == TYPE_SRC ? "progs.src" :
                      ("unknown"))))));
 
-            if (!parser_compile_file(items_data[itr].filename))
+            if (!parser_compile_file(items[itr].filename))
             {
                     retval = 1;
                     goto cleanup;
@@ -529,8 +540,8 @@ srcdone:
 
 cleanup:
     util_debug("COM", "cleaning ...\n");
-
-    mem_d(items_data);
+    con_close();
+    vec_free(items);
 
     parser_cleanup();
     if (opts_output_free)