X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=main.c;h=0d9fe04a9f8c043b845c2c1193c78d263f1a56a4;hb=32c928ab6d527199b4404f9789ae8e7a4818e06f;hp=4c8062d7dcdb1b125101c77348c26952c9ac592c;hpb=61fa54318c3aa1ce0c2099f9793d830e5896c016;p=xonotic%2Fgmqcc.git

diff --git a/main.c b/main.c
index 4c8062d..0d9fe04 100644
--- a/main.c
+++ b/main.c
@@ -32,6 +32,7 @@ const char *opts_output   = "progs.dat";
 int         opts_standard = COMPILER_GMQCC;
 bool        opts_debug    = false;
 bool        opts_memchk   = false;
+bool        opts_dumpfin  = false;
 bool        opts_dump     = false;
 bool        opts_werror   = false;
 bool        opts_forcecrc = false;
@@ -221,13 +222,38 @@ static bool options_parse(int argc, char **argv) {
                 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;
             }
             
-            con_change(redirout, redirerr);
+            /* 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;
+                        
+                    memset(buffer, 0, sizeof(buffer));
+                    util_strtononcmd(opts_flag_list[itr].name, buffer, strlen(opts_flag_list[itr].name) + 1);
+    
+                    con_out("-f%s ", buffer);
+                }
+                for (itr = 0; itr < COUNT_WARNINGS; ++itr) {
+                    if (!OPTS_WARN(itr))
+                        continue;
+                    
+                    memset(buffer, 0, sizeof(buffer));
+                    util_strtononcmd(opts_warn_list[itr].name, buffer, strlen(opts_warn_list[itr].name) + 1);
+                    con_out("-W%s ", buffer);
+                }
+                con_out("\n");
+                exit(0);
+            }
 
             if (!strcmp(argv[0]+1, "debug")) {
                 opts_debug = true;
@@ -237,6 +263,10 @@ static bool options_parse(int argc, char **argv) {
                 opts_dump = true;
                 continue;
             }
+            if (!strcmp(argv[0]+1, "dumpfin")) {
+                opts_dumpfin = true;
+                continue;
+            }
             if (!strcmp(argv[0]+1, "memchk")) {
                 opts_memchk = true;
                 continue;
@@ -251,7 +281,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;
@@ -260,7 +290,7 @@ static bool options_parse(int argc, char **argv) {
                 /* handle all -fflags */
                 case 'f':
                     util_strtocmd(argv[0]+2, argv[0]+2, strlen(argv[0]+2)+1);
-                    if (!strcmp(argv[0]+2, "HELP")) {
+                    if (!strcmp(argv[0]+2, "HELP") || *(argv[0]+2) == '?') {
                         con_out("Possible flags:\n");
                         for (itr = 0; itr < COUNT_FLAGS; ++itr) {
                             util_strtononcmd(opts_flag_list[itr].name, buffer, sizeof(buffer));
@@ -281,7 +311,7 @@ static bool options_parse(int argc, char **argv) {
                     break;
                 case 'W':
                     util_strtocmd(argv[0]+2, argv[0]+2, strlen(argv[0]+2)+1);
-                    if (!strcmp(argv[0]+2, "HELP")) {
+                    if (!strcmp(argv[0]+2, "HELP") || *(argv[0]+2) == '?') {
                         con_out("Possible warnings:\n");
                         for (itr = 0; itr < COUNT_WARNINGS; ++itr) {
                             util_strtononcmd(opts_warn_list[itr].name, buffer, sizeof(buffer));
@@ -379,7 +409,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);
@@ -442,6 +471,7 @@ int main(int argc, char **argv) {
     options_set(opts_warn, WARN_ASSIGN_FUNCTION_TYPES, true);
     options_set(opts_warn, WARN_PREPROCESSOR, true);
     options_set(opts_warn, WARN_MULTIFILE_IF, true);
+    options_set(opts_warn, WARN_DOUBLE_DECLARATION, true);
 
     options_set(opts_flags, ADJUST_VECTOR_FIELDS, true);
     options_set(opts_flags, FTEPP, false);
@@ -454,6 +484,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;
@@ -560,11 +593,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 {