From 14367b1549478e0383e97ee63691e16daa9d429f Mon Sep 17 00:00:00 2001 From: bbbbbr Date: Fri, 11 Oct 2024 23:03:43 -0700 Subject: [PATCH] Options: Allow filename at any location in option arguments --- Changelog.md | 1 + src/romusage.c | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Changelog.md b/Changelog.md index 8e23c49..9d8ed3a 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,6 +4,7 @@ Changelog # Version 1.3.0 - `-b:HEXVAL:[...]` Set hex bytes treated as Empty in ROM files (.gb/etc) (default `FF`(255), ex use 255 AND 0: `-b:FF:00` - Improve error messaging +- Allow filename at any location in option arguments # Version 1.2.9 - `-nMEM` Hide memory regions with case sensitive substring (ex hide all RAM: `-nMEM:RAM`) diff --git a/src/romusage.c b/src/romusage.c index f54f491..bce142b 100644 --- a/src/romusage.c +++ b/src/romusage.c @@ -130,12 +130,8 @@ int handle_args(int argc, char * argv[]) { return false; } - // Copy input filename (if not preceded with option dash) - if (argv[1][0] != '-') - snprintf(filename_in, sizeof(filename_in), "%s", argv[1]); - // Start at first optional argument, argc is zero based - for (i = 1; i <= (argc -1); i++ ) { + for (i = 0; i <= (argc -1); i++ ) { if (strstr(argv[i], "-h") == argv[i]) { display_help(HELP_FULL); @@ -238,6 +234,10 @@ int handle_args(int argc, char * argv[]) { return false; } + // Copy input filename (if not preceded with option dash) + else if (argv[i][0] != '-') { + snprintf(filename_in, sizeof(filename_in), "%s", argv[i]); + } } return true;