Merge branch 'master' of github.com:graphitemaster/gmqcc

[xonotic/gmqcc.git] / main.c

diff --git a/main.c b/main.c
index 558edc339ef25b52393176f8fa780592b503482a..107098a6e582acf312b9663b2511ec651c2500aa 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];
     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) {
     char *config   = NULL;
 
     while (!argend && argc > 1) {


@@ -474,7 +474,7 @@ static bool progs_nextline(char **out, size_t *alen,FILE *src) {
     char  *end;
 
     line = *out;
     char  *end;
 
     line = *out;

-    len = util_getline(&line, alen, src);
+    len  = file_getline(&line, alen, src);

     if (len == -1)
         return false;
 
     if (len == -1)
         return false;
 


@@ -558,15 +558,16 @@ int main(int argc, char **argv) {
 
     if (opts.pp_only) {
         if (opts_output_wasset) {
 
     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;
             }
         }
             if (!outfile) {
                 con_err("failed to open `%s` for writing\n", opts.output);
                 retval = 1;
                 goto cleanup;
             }
         }

-        else
-            outfile = stdout;
+        else {
+         /* TODO: stdout without stdout .. */
+        }

     }
 
     if (!opts.pp_only) {
     }
 
     if (!opts.pp_only) {


@@ -609,7 +610,7 @@ int main(int argc, char **argv) {
 
         progs_src = true;
 
 
         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;
         if (!src) {
             con_err("failed to open `progs.src` for reading\n");
             retval = 1;


@@ -638,7 +639,7 @@ int main(int argc, char **argv) {
         }
 
 srcdone:
         }
 
 srcdone:

-        fclose(src);
+        file_close(src);

         mem_d(line);
     }
 
         mem_d(line);
     }
 


@@ -668,7 +669,7 @@ srcdone:
                 }
                 out = ftepp_get();
                 if (out)
                 }
                 out = ftepp_get();
                 if (out)

-                    fprintf(outfile, "%s", out);
+                    file_printf(outfile, "%s", out);

                 ftepp_flush();
             }
             else {
                 ftepp_flush();
             }
             else {