combined approach works, bring back getopt -a -l

tested on OSX and Debian arm64
deater · Jul 24, 2023 · d03c721 · d03c721
1 parent 7c2ad7e
commit d03c721
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/demos/lovebyte_turbo22/planet/planet.bas b/demos/lovebyte_turbo22/planet/planet.bas
diff --git a/music/still_alive/title.bas b/music/still_alive/title.bas
diff --git a/utils/dos33fs-utils/dos33.c b/utils/dos33fs-utils/dos33.c
@@ -1062,13 +1062,22 @@ int main(int argc, char **argv) {
 	int retval=0;
 
 	/* Check command line arguments */
-	while ((c = getopt (argc, argv,"t:s:dhvxy"))!=-1) {
+	while ((c = getopt (argc, argv,"a:l:t:s:dhvxy"))!=-1) {
 		switch (c) {
 
 		case 'd':
 			fprintf(stderr,"DEBUG enabled\n");
 			debug=1;
 			break;
+		case 'a':
+			address=strtol(optarg,&endptr,0);
+			if (debug) fprintf(stderr,"Address=%d\n",address);
+			break;
+		case 'l':
+			length=strtol(optarg,&endptr,0);
+			if (debug) fprintf(stderr,"Length=%d\n",length);
+			break;
+
 #if 0
 		case 't':
 			track=strtol(optarg,&endptr,0);
@@ -1233,8 +1242,9 @@ int main(int argc, char **argv) {
 			goto exit_and_close;
 		}
 
-		// check for optional -a and -l argument in command BSAVE  [-a addr] [-l len] local_file [apple_file],
-		// this is done here instead of through getopt(3), because getopt does not handle sub-arguments
+		// check for optional -a and -l argument in command BSAVE [-a addr] [-l len] local_file [apple_file],
+		// this is done here only for non-linux systems instead of going through getopt(3), where 'optind' is
+		// handleled differently
 		while(optind < argc) {
 			if (strcmp (argv[optind], "-a") == 0) {
 				if (optind + 2 > argc) {

diff --git a/vaporlock/tfv_credits/bishop.bas b/vaporlock/tfv_credits/bishop.bas
diff --git a/vaporlock/tfv_credits/rainbow.bas b/vaporlock/tfv_credits/rainbow.bas