X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=zilasm%2Fmain.c;h=bbc5a9327bc0654d3a4a065cfd1e173a85821ff4;hb=ae5b2223ee645045d847073f3c9b173aea52d1ed;hp=a6bfa68feeecca39c8f8cac8d89daa91ac61ba66;hpb=96b70de7e75c4a903ee686385a101894403c99b0;p=zilutils.git

diff --git a/zilasm/main.c b/zilasm/main.c
index a6bfa68..bbc5a93 100644
--- a/zilasm/main.c
+++ b/zilasm/main.c
@@ -20,6 +20,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdarg.h>
 #include <string.h>
 #include <getopt.h>
 #include <time.h>
@@ -33,11 +34,11 @@ static struct option const long_options[] =
 {
     { "help",     no_argument,       NULL, 'h' },
     { "version",  no_argument,       NULL, 'V' },
+    { "output",   required_argument, NULL, 'o' },
     { "zversion", required_argument, NULL, ZVERSION },
     { "zorkid",   required_argument, NULL, ZORKID   },
     { "serial",   required_argument, NULL, ZSERIAL  },
     { NULL, 0, NULL, 0 }
-
 };
 
 struct
@@ -47,8 +48,15 @@ struct
     char zserial[7];   /* YYMMDD    */
 } Config;
 
-void wrong_arg()
+void wrong_arg(const char *err, ...)
 {
+    if (err)
+    {
+        va_list ap;
+        va_start(ap, err);
+        vfprintf(stderr, err, ap);
+        va_end(ap);
+    }
     fprintf(stderr, "Try `" PACKAGE_NAME " --help' for more information.\n");
     exit(1);
 }
@@ -108,9 +116,8 @@ void parse_intarg(int *dest, const char name[], int min, int max, int defval)
         *dest = n;
         return;
     }
-    fprintf(stderr, "Wrong %s value %s, must be integer between %d and %d\n",
-            name, optarg, min, max);
-    wrong_arg();
+    wrong_arg("Wrong %s value %s, must be integer between %d and %d\n",
+              name, optarg, min, max);
 }
 
 void parse_zserial(void)
@@ -132,16 +139,35 @@ void parse_zserial(void)
             return;
         }
     }
-    fprintf(stderr, "Wrong zserial value %s, must be 6 ascii characters\n", optarg);
-    wrong_arg();
+    wrong_arg("Wrong zserial value %s, must be 6 ascii characters\n", optarg);
+}
+
+void new_file_suffix(char *result, size_t maxlen, const char *src, const char *newsuffix)
+{
+    strncpy(result, src, maxlen);
+    char *p = strrchr(result, '.');
+    if (p && strchr(p, '/'))
+        p = NULL;
+    if (p)
+    {
+        strncpy(p, newsuffix, maxlen - (p - result));
+    }
+    else
+    {
+        strncat(result, newsuffix, maxlen);
+    }
+    result[maxlen] = 0;
 }
 
 int main(int argc, char *argv[], char *envp[])
 {
+    const char *output_file = NULL;
+    int i;
+
     fill_config();
 
     int opt = 0;
-    while ((opt = getopt_long (argc, argv, "hV", long_options, NULL)) != -1)
+    while ((opt = getopt_long (argc, argv, "hVo:", long_options, NULL)) != -1)
     {
         switch(opt)
         {
@@ -149,6 +175,10 @@ int main(int argc, char *argv[], char *envp[])
             print_usage(0);
         case 'V'     :
             print_version();
+        case 'o'     :
+            if (output_file) wrong_arg("Output file must be given once\n");
+            output_file = optarg;
+            break;
         case ZVERSION:
             parse_intarg(&Config.zversion, "zversion", 1, 8,      1);
             break;
@@ -159,12 +189,32 @@ int main(int argc, char *argv[], char *envp[])
             parse_zserial();
             break;
         default      :
-            wrong_arg();
+            wrong_arg(0);
         }
     }
 
+    int first_input_file = optind;
+    if (first_input_file >= argc)
+        wrong_arg("Missing input file\n");
+
+    if (!output_file)
+    {
+        const char suffix[] = ".dat";
+        const char *input_file = argv[first_input_file];
+        int n = strlen(input_file) + strlen(suffix);
+        char *ofile = malloc(n);  /* todo!!! check for NULL. free. */
+        new_file_suffix(ofile, n, input_file, suffix);
+        output_file = ofile;
+    }
+
     // TODO: Everything :)
 
+    printf("Input files:\n");
+    for (i = optind; i < argc; i++)
+        printf("\t%s\n", argv[i]);
+
+    printf("Output file: %s\n\n", output_file);
+
     printf("Config:\n"
            "- ZVersion: %d\n"
            "- ZorkID:   %d\n"