Move stuff from main() to new build_output_filename(); bugfix +1

[zilutils.git] / zilasm / main.c

diff --git a/zilasm/main.c b/zilasm/main.c
index 558130c60c868248b39b249858ace05dc11b4fad..409e16b186c62b70305371bdf747011fd984974c 100644 (file)
--- a/zilasm/main.c
+++ b/zilasm/main.c
@@ -79,7 +79,7 @@ void print_usage(int failed)
            "--version  Display program version and exit\n"
            "--help     Display this help\n"
            "\n"
-           "--zversion (accepts numbers 1 - 8, defaults to 1 if not specified)\n"
+           "--zversion (accepts numbers 1 - 8, defaults to 6 if not specified)\n"
            "--zorkid   (integer between 0 and 65535, defaults to 0 if not specified)\n"
            "--serial   (six characters of ASCII, defaults to current date\n"
            "            in the form YYMMDD if not specified)\n"
@@ -133,7 +133,7 @@ void parse_zserial(void)
         char *p = optarg;
         while (*p && isalnum(*p))
             p++;
-        if (!*p)    /* ..optarg contains alphanumeric only? */
+        if (!*p)      /* ..optarg contains alphanumeric only? */
         {
             strncpy(Config.zserial, optarg, sizeof(Config.zserial));
             return;
@@ -142,9 +142,35 @@ void parse_zserial(void)
     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;
+}
+
+char *build_output_filename(const char basename[], const char *suffix)
+{
+    int n = strlen(basename) + strlen(suffix);
+    char *ofile = malloc(n + 1);  /* todo!!! check for NULL. free. */
+    new_file_suffix(ofile, n, basename, suffix);
+    return ofile;
+}
+
 int main(int argc, char *argv[], char *envp[])
 {
     const char *output_file = NULL;
+    int i;
 
     fill_config();
 
@@ -159,7 +185,7 @@ int main(int argc, char *argv[], char *envp[])
             print_version();
         case 'o'     :
             if (output_file) wrong_arg("Output file must be given once\n");
-            output_file = argv[optind];
+            output_file = optarg;
             break;
         case ZVERSION:
             parse_intarg(&Config.zversion, "zversion", 1, 8,      1);
@@ -175,9 +201,19 @@ int main(int argc, char *argv[], char *envp[])
         }
     }
 
+    int first_input_file = optind;
+    if (first_input_file >= argc)
+        wrong_arg("Missing input file\n");
+    if (!output_file)
+        output_file = build_output_filename(argv[first_input_file], ".dat");
+
     // TODO: Everything :)
 
-    printf("Output file: %s\n\n", output_file ? output_file : "MISSING");
+    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"