shithub: rgbds

Info  •  Files  •  Log  •  Branches

rgbfix: deal with options and arguments in the right order.

--- a/src/fix/main.c

+++ b/src/fix/main.c

@@ -41,17 +41,6 @@

 	char *ep;

 	/*

-	 * Open the ROM file

-	 */

-

-	if (argc < 2)

-		usage();

-

-	if ((rom = fopen(argv[argc - 1], "rb+")) == NULL) {

-		err(1, "Error opening file %s", argv[argc - 1]);

-	}

-

-	/*

 	 * Parse command-line options

 	 */

@@ -195,6 +184,20 @@

 			usage();

 			/* NOTREACHED */

 		}

+	}

+

+	argc -= optind;

+	argv += optind;

+

+	if (argc == 0)

+		usage();

+

+	/*

+	 * Open the ROM file

+	 */

+

+	if ((rom = fopen(argv[argc - 1], "rb+")) == NULL) {

+		err(1, "Error opening file %s", argv[argc - 1]);

 	}

 	/*