X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=zilasm%2Fmain.c;h=bbc5a9327bc0654d3a4a065cfd1e173a85821ff4;hb=ae5b2223ee645045d847073f3c9b173aea52d1ed;hp=16216762177fdb16012e306824e524745b8eb879;hpb=59a5f290b66f5f9cefe6092fe721674a5a90b141;p=zilutils.git diff --git a/zilasm/main.c b/zilasm/main.c index 1621676..bbc5a93 100644 --- a/zilasm/main.c +++ b/zilasm/main.c @@ -20,6 +20,7 @@ #include #include +#include #include #include #include @@ -33,6 +34,7 @@ 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 }, @@ -41,26 +43,32 @@ static struct option const long_options[] = struct { - int zversion; /* 0 - 8 */ - int zorkid; /* 0 - 255 */ - char zserial[7]; /* YYMMDD */ + int zversion; /* 0 - 8 */ + int zorkid; /* 0 - 65535 */ + 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); } void print_version() { - printf(PACKAGE_STRING "\n" - "License AGPLv3+: GNU AGPL version 3 or later\n" - "\n" - "This is free software: you are free to change and redistribute it.\n" - "There is NO WARRANTY, to the extent permitted by law.\n" + printf( PACKAGE_STRING "\n" + "License AGPLv3+: GNU AGPL version 3 or later\n" + "\n" + "This is free software: you are free to change and redistribute it.\n" + "There is NO WARRANTY, to the extent permitted by law.\n" ); - exit(0); } @@ -72,11 +80,10 @@ void print_usage(int failed) "--help Display this help\n" "\n" "--zversion (accepts numbers 1 - 8, defaults to 1 if not specified)\n" - "--zorkid (accepts digits, defaults to 0 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" ); - exit(failed); } @@ -84,14 +91,14 @@ void fill_zserial(void) { time_t t; struct tm *timeinfo; - time(&t); + time (&t); timeinfo = localtime(&t); - strftime(Config.zserial, sizeof(Config.zserial), "%y%m%d", timeinfo); + strftime (Config.zserial, sizeof(Config.zserial), "%y%m%d", timeinfo); } void fill_config(void) { - Config.zversion = 1; + Config.zversion = 6; Config.zorkid = 0; fill_zserial(); } @@ -103,17 +110,14 @@ void parse_intarg(int *dest, const char name[], int min, int max, int defval) *dest = defval; return; } - int n = atoi(optarg); if (n >= min && n <= max) { *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) @@ -123,54 +127,94 @@ void parse_zserial(void) fill_zserial(); return; } - size_t n = strlen(optarg); if (n == sizeof(Config.zserial) - 1) { 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; } } + wrong_arg("Wrong zserial value %s, must be 6 ascii characters\n", optarg); +} - fprintf(stderr, "Wrong zserial value %s, must be 6 ASCII characters\n", optarg); - wrong_arg(); +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) + switch(opt) { case 'h' : 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); + parse_intarg(&Config.zversion, "zversion", 1, 8, 1); break; case ZORKID : - parse_intarg(&Config.zorkid, "zorkid", 0, 255, 0); + parse_intarg(&Config.zorkid, "zorkid", 0, 0xFFFF, 0); break; case ZSERIAL : 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"