More cleanup

[xonotic/gmqcc.git] / main.c

diff --git a/main.c b/main.c
index 9a027bd73a11e592e8b59c3e725c2c3d3e939d6b..bfdadda21f3994a436ff8110c174569fd52536cf 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,26 +1,3 @@
-/*
- * Copyright (C) 2012, 2013, 2014, 2015
- *     Dale Weiler
- *     Wolfgang Bumiller
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 #include <stdlib.h>
 #include <string.h>
 
@@ -145,8 +122,6 @@ static bool options_parse(int argc, char **argv) {
     bool argend = false;
     size_t itr;
     char  buffer[1024];
-    char *redirout    = NULL;
-    char *redirerr    = NULL;
     char *config      = NULL;
     char *memdumpcols = NULL;
 
@@ -223,14 +198,6 @@ static bool options_parse(int argc, char **argv) {
                 opts_set(opts.flags, EMULATE_STATE, true);
                 continue;
             }
-            if (options_long_gcc("redirout", &argc, &argv, &redirout)) {
-                con_change(redirout, redirerr);
-                continue;
-            }
-            if (options_long_gcc("redirerr", &argc, &argv, &redirerr)) {
-                con_change(redirout, redirerr);
-                continue;
-            }
             if (options_long_gcc("config", &argc, &argv, &argarg)) {
                 config = argarg;
                 continue;
@@ -498,14 +465,6 @@ static bool options_parse(int argc, char **argv) {
                         OPTS_OPTION_BOOL(OPTION_QUIET) = true;
                         break;
                     }
-                    else if (!strcmp(argv[0]+2, "correct")) {
-                        OPTS_OPTION_BOOL(OPTION_CORRECTION) = true;
-                        break;
-                    }
-                    else if (!strcmp(argv[0]+2, "no-correct")) {
-                        OPTS_OPTION_BOOL(OPTION_CORRECTION) = false;
-                        break;
-                    }
                     else if (!strcmp(argv[0]+2, "add-info")) {
                         OPTS_OPTION_BOOL(OPTION_ADD_INFO) = true;
                         break;
@@ -540,14 +499,14 @@ static bool options_parse(int argc, char **argv) {
 }
 
 /* returns the line number, or -1 on error */
-static bool progs_nextline(char **out, size_t *alen, fs_file_t *src) {
+static bool progs_nextline(char **out, size_t *alen, FILE *src) {
     int    len;
     char  *line;
     char  *start;
     char  *end;
 
     line = *out;
-    len  = fs_file_getline(&line, alen, src);
+    len  = util_getline(&line, alen, src);
     if (len == -1)
         return false;
 
@@ -570,7 +529,7 @@ int main(int argc, char **argv) {
     int             retval           = 0;
     bool            operators_free   = false;
     bool            progs_src        = false;
-    fs_file_t       *outfile         = NULL;
+    FILE       *outfile         = NULL;
     struct parser_s *parser          = NULL;
     struct ftepp_s  *ftepp           = NULL;
 
@@ -634,7 +593,7 @@ int main(int argc, char **argv) {
 
     if (OPTS_OPTION_BOOL(OPTION_PP_ONLY)) {
         if (opts_output_wasset) {
-            outfile = fs_file_open(OPTS_OPTION_STR(OPTION_OUTPUT), "wb");
+            outfile = fopen(OPTS_OPTION_STR(OPTION_OUTPUT), "wb");
             if (!outfile) {
                 con_err("failed to open `%s` for writing\n", OPTS_OPTION_STR(OPTION_OUTPUT));
                 retval = 1;
@@ -675,14 +634,14 @@ int main(int argc, char **argv) {
     }
 
     if (!vec_size(items)) {
-        fs_file_t *src;
+        FILE *src;
         char      *line    = NULL;
         size_t     linelen = 0;
         bool       hasline = false;
 
         progs_src = true;
 
-        src = fs_file_open(OPTS_OPTION_STR(OPTION_PROGSRC), "rb");
+        src = fopen(OPTS_OPTION_STR(OPTION_PROGSRC), "rb");
         if (!src) {
             con_err("failed to open `%s` for reading\n", OPTS_OPTION_STR(OPTION_PROGSRC));
             retval = 1;
@@ -705,7 +664,7 @@ int main(int argc, char **argv) {
             }
         }
 
-        fs_file_close(src);
+        fclose(src);
         mem_d(line);
     }
 
@@ -737,7 +696,7 @@ int main(int argc, char **argv) {
                 }
                 out = ftepp_get(ftepp);
                 if (out)
-                    fs_file_printf(outfile, "%s", out);
+                    fprintf(outfile, "%s", out);
                 ftepp_flush(ftepp);
             }
             else {
@@ -799,7 +758,6 @@ cleanup:
         mem_d((void*)operators);
 
     lex_cleanup();
-    stat_info();
 
     if (!retval && compile_errors)
         retval = 1;