Make -E print to stdout by default and honor -o, changed handling of source list...

[xonotic/gmqcc.git] / main.c

diff --git a/main.c b/main.c
index d1ac7f12e46560dde15d5d94bd50e7dd23f9b733..1301e7549b70da667312bf89e2e27f6acb0e5731 100644 (file)
--- a/main.c
+++ b/main.c
@@ -415,6 +415,7 @@ int main(int argc, char **argv) {
     size_t itr;
     int retval = 0;
     bool opts_output_free = false;
+    bool progs_src = false;
 
     app_name = argv[0];
     con_init();
@@ -473,54 +474,31 @@ int main(int argc, char **argv) {
         }
     }
     if (opts_pp_only || opts_standard == COMPILER_FTEQCC) {
-        if (!ftepp_init()) {
-            con_err("failed to initialize parser\n");
-            retval = 1;
-            goto cleanup;
-        }
-    }
-
-    util_debug("COM", "starting ...\n");
-
-    if (vec_size(items)) {
-        if (!opts_pp_only) {
-            con_out("Mode: manual\n");
-            con_out("There are %lu items to compile:\n", (unsigned long)vec_size(items));
-        }
-        for (itr = 0; itr < vec_size(items); ++itr) {
-            if (!opts_pp_only) {
-                con_out("  item: %s (%s)\n",
-                       items[itr].filename,
-                       ( (items[itr].type == TYPE_QC ? "qc" :
-                         (items[itr].type == TYPE_ASM ? "asm" :
-                         (items[itr].type == TYPE_SRC ? "progs.src" :
-                         ("unknown"))))));
-            }
-
-            if (opts_pp_only) {
-                if (!ftepp_preprocess_file(items[itr].filename)) {
-                    retval = 1;
-                    goto cleanup;
-                }
-            }
-            else if (!parser_compile_file(items[itr].filename)) {
+        FILE *out = NULL;
+        if (opts_output_wasset) {
+            out = util_fopen(opts_output, "wb");
+            if (!out) {
+                con_err("failed to open `%s` for writing\n", opts_output);
                 retval = 1;
                 goto cleanup;
             }
         }
-
-        if (!parser_finish(opts_output)) {
+        if (!ftepp_init(out)) {
+            con_err("failed to initialize parser\n");
             retval = 1;
             goto cleanup;
         }
+    }
 
-    } else {
+    util_debug("COM", "starting ...\n");
+
+    if (!vec_size(items)) {
         FILE *src;
         char *line;
         size_t linelen = 0;
 
-        if (!opts_pp_only)
-            con_out("Mode: progs.src\n");
+        progs_src = true;
+
         src = util_fopen("progs.src", "rb");
         if (!src) {
             con_err("failed to open `progs.src` for reading\n");
@@ -541,27 +519,68 @@ int main(int argc, char **argv) {
         }
 
         while (progs_nextline(&line, &linelen, src)) {
+            argitem item;
             if (!line[0] || (line[0] == '/' && line[1] == '/'))
                 continue;
-            if (!opts_pp_only)
-                con_out("  src: %s\n", line);
-            if (!parser_compile_file(line)) {
-                retval = 1;
-                goto srcdone;
-            }
+            item.filename = util_strdup(line);
+            item.type     = TYPE_QC;
+            vec_push(items, item);
         }
 
-        parser_finish(opts_output);
-
 srcdone:
         fclose(src);
         mem_d(line);
     }
 
+    if (retval)
+        goto cleanup;
+
+    if (vec_size(items)) {
+        if (!opts_pp_only) {
+            con_out("Mode: %s\n", (progs_src ? "progs.src" : "manual"));
+            con_out("There are %lu items to compile:\n", (unsigned long)vec_size(items));
+        }
+        for (itr = 0; itr < vec_size(items); ++itr) {
+            if (!opts_pp_only) {
+                con_out("  item: %s (%s)\n",
+                       items[itr].filename,
+                       ( (items[itr].type == TYPE_QC ? "qc" :
+                         (items[itr].type == TYPE_ASM ? "asm" :
+                         (items[itr].type == TYPE_SRC ? "progs.src" :
+                         ("unknown"))))));
+            }
+
+            if (opts_pp_only) {
+                if (!ftepp_preprocess_file(items[itr].filename)) {
+                    retval = 1;
+                    goto cleanup;
+                }
+            }
+            else if (!parser_compile_file(items[itr].filename)) {
+                retval = 1;
+                goto cleanup;
+            }
+
+            if (progs_src) {
+                mem_d(items[itr].filename);
+                items[itr].filename = NULL;
+            }
+        }
+
+        ftepp_finish();
+        if (!opts_pp_only) {
+            if (!parser_finish(opts_output)) {
+                retval = 1;
+                goto cleanup;
+            }
+        }
+    }
+
     /* stuff */
 
 cleanup:
     util_debug("COM", "cleaning ...\n");
+    ftepp_finish();
     con_close();
     vec_free(items);