Even safer vector macros

[xonotic/gmqcc.git] / main.c

diff --git a/main.c b/main.c
index 8394df45ec3c3192d9f573b56a7cedd79a2b202a..838a26d3cc64301ae860966a68968906f1e36cb3 100644 (file)
--- a/main.c
+++ b/main.c
@@ -139,8 +139,8 @@ static bool options_parse(int argc, char **argv) {
     bool argend = false;
     size_t itr;
     char  buffer[1024];
-    char *redirout = (char*)stdout;
-    char *redirerr = (char*)stderr;
+    char *redirout = NULL;
+    char *redirerr = NULL;
     char *config   = NULL;
 
     while (!argend && argc > 1) {
@@ -206,8 +206,6 @@ static bool options_parse(int argc, char **argv) {
 
             /* show defaults (like pathscale) */
             if (!strcmp(argv[0]+1, "show-defaults")) {
-                size_t itr;
-                char   buffer[1024];
                 for (itr = 0; itr < COUNT_FLAGS; ++itr) {
                     if (!OPTS_FLAG(itr))
                         continue;
@@ -476,7 +474,7 @@ static bool progs_nextline(char **out, size_t *alen,FILE *src) {
     char  *end;
 
     line = *out;
-    len = util_getline(&line, alen, src);
+    len  = file_getline(&line, alen, src);
     if (len == -1)
         return false;
 
@@ -510,6 +508,11 @@ int main(int argc, char **argv) {
         return usage();
     }
 
+    if (OPTS_FLAG(TRUE_EMPTY_STRINGS) && OPTS_FLAG(FALSE_EMPTY_STRINGS)) {
+        con_err("-ftrue-empty-strings and -ffalse-empty-strings are mutually exclusive");
+        exit(1);
+    }
+
     /* the standard decides which set of operators to use */
     if (opts.standard == COMPILER_GMQCC) {
         operators      = c_operators;
@@ -533,7 +536,7 @@ int main(int argc, char **argv) {
                 exit(1);
             }
             operators_free = true;
-            newops = mem_a(sizeof(operators[0]) * operator_count);
+            newops = (oper_info*)mem_a(sizeof(operators[0]) * operator_count);
             memcpy(newops, operators, sizeof(operators[0]) * operator_count);
             memcpy(&newops[operator_count-2], &operators[operator_count-1], sizeof(newops[0]));
             memcpy(&newops[operator_count-1], &operators[operator_count-2], sizeof(newops[0]));
@@ -555,15 +558,16 @@ int main(int argc, char **argv) {
 
     if (opts.pp_only) {
         if (opts_output_wasset) {
-            outfile = util_fopen(opts.output, "wb");
+            outfile = file_open(opts.output, "wb");
             if (!outfile) {
                 con_err("failed to open `%s` for writing\n", opts.output);
                 retval = 1;
                 goto cleanup;
             }
         }
-        else
-            outfile = stdout;
+        else {
+            outfile = con_default_out();
+        }
     }
 
     if (!opts.pp_only) {
@@ -582,6 +586,9 @@ int main(int argc, char **argv) {
         }
     }
 
+    if (OPTS_FLAG(TRUE_EMPTY_STRINGS))
+        type_not_instr[TYPE_STRING] = INSTR_NOT_F;
+
     util_debug("COM", "starting ...\n");
 
     /* add macros */
@@ -603,7 +610,7 @@ int main(int argc, char **argv) {
 
         progs_src = true;
 
-        src = util_fopen("progs.src", "rb");
+        src = file_open("progs.src", "rb");
         if (!src) {
             con_err("failed to open `progs.src` for reading\n");
             retval = 1;
@@ -632,7 +639,7 @@ int main(int argc, char **argv) {
         }
 
 srcdone:
-        fclose(src);
+        file_close(src);
         mem_d(line);
     }
 
@@ -662,7 +669,7 @@ srcdone:
                 }
                 out = ftepp_get();
                 if (out)
-                    fprintf(outfile, "%s", out);
+                    file_printf(outfile, "%s", out);
                 ftepp_flush();
             }
             else {
@@ -674,7 +681,7 @@ srcdone:
                     }
                     data = ftepp_get();
                     if (vec_size(data)) {
-                        if (!parser_compile_string_len(items[itr].filename, data, vec_size(data))) {
+                        if (!parser_compile_string(items[itr].filename, data, vec_size(data))) {
                             retval = 1;
                             goto cleanup;
                         }