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 bbc5a9327bc0654d3a4a065cfd1e173a85821ff4..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;
@@ -159,6 +159,14 @@ void new_file_suffix(char *result, size_t maxlen, const char *src, const char *n
     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;
@@ -196,16 +204,8 @@ 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)
-    {
-        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;
-    }
+        output_file = build_output_filename(argv[first_input_file], ".dat");
 
     // TODO: Everything :)