Look for include files in the currently #included file's directory first

[xonotic/gmqcc.git] / main.c

diff --git a/main.c b/main.c
index 2078079ad6beb33c3a4629f2d61e24d3007c7a5c..a73f3f1df3f7e29f6d4c4992e6e94a1598355ca4 100644 (file)
--- a/main.c
+++ b/main.c
@@ -256,7 +256,7 @@ static bool options_parse(int argc, char **argv) {
                 case 'h':
                     usage();
                     exit(0);
-                    break;
+                    /* break; never reached because of exit(0) */
 
                 case 'E':
                     opts_pp_only = true;
@@ -384,7 +384,6 @@ static bool options_parse(int argc, char **argv) {
         else
         {
             /* it's a QC filename */
-            argitem item;
             item.filename = argv[0];
             item.type     = TYPE_QC;
             vec_push(items, item);
@@ -459,6 +458,9 @@ int main(int argc, char **argv) {
     if (opts_standard == COMPILER_GMQCC) {
         operators = c_operators;
         operator_count = c_operator_count;
+    } else if (opts_standard == COMPILER_FTEQCC) {
+        operators = fte_operators;
+        operator_count = fte_operator_count;
     } else {
         operators = qcc_operators;
         operator_count = qcc_operator_count;
@@ -565,11 +567,14 @@ srcdone:
             }
 
             if (opts_pp_only) {
+                const char *out;
                 if (!ftepp_preprocess_file(items[itr].filename)) {
                     retval = 1;
                     goto cleanup;
                 }
-                fprintf(outfile, "%s", ftepp_get());
+                out = ftepp_get();
+                if (out)
+                    fprintf(outfile, "%s", out);
                 ftepp_flush();
             }
             else {