gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 18:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

use getopt(3) instead of our hand-rolled flag parsing

Browse Source 
Simplify and standardize the code by using the standard getopt()
function for parsing command-line flags.

This is a backwards-incompatible change.
This commit is contained in:
anthony
2010-01-12 14:25:54 -07:00
parent 8f5e767615
commit 16c7a49ffa
1 changed files with 75 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/fix/main.c
View File

@@ -224,6 +224,9 @@ MBC_String(unsigned char mbc_type)
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
int ch;
char *ep;
int argn = 1; int argn = 1;
char filename[512]; char filename[512];
char cartname[32]; char cartname[32];
@@ -239,56 +242,37 @@ main(int argc, char *argv[])
if (argc == 1) if (argc == 1)
PrintUsage(); PrintUsage();
while (argn < argc) { while ((ch = getopt(argc, argv, "b:cdjk:m:op:qrst:v")) != -1) {
if (argv[argn][0] == '-') { switch (ch) {
switch (argv[argn][1]) {
case '?':
case 'h':
PrintUsage();
break;
case 'd': case 'd':
ulOptions |= OPTF_DEBUG; ulOptions |= OPTF_DEBUG;
break; break;
case 'm': case 'm':
ulOptions |= OPTF_RAMSIZE; ulOptions |= OPTF_RAMSIZE;
if (strlen(argv[argn] + 2) > 0 && strlen(argv[argn] + 2) <= 2) { ram_size = strtoul(optarg, &ep, 0);
int result; if (optarg[0] == '\0' || *ep != '\0')
result = sscanf(argv[argn] + 2,"%x", &ram_size);
if (!((result == EOF) || (result == 1))) {
FatalError("Invalid argument for option 'm'"); FatalError("Invalid argument for option 'm'");
} if (ram_size < 0 || ram_size > 0xFF)
} else if (strlen(argv[argn] + 2) > 0) { FatalError("Argument for option 'm' must be between 0 and 0xFF");
FatalError("RAM size must be between 0 and FF");
} else {
FatalError("Invalid argument for option 'm'");
}
break; break;
case 'j': case 'j':
ulOptions |= OPTF_JAPAN; ulOptions |= OPTF_JAPAN;
break; break;
case 'b': case 'b':
ulOptions |= OPTF_MBCTYPE; ulOptions |= OPTF_MBCTYPE;
if (strlen(argv[argn] + 2) > 0 && strlen(argv[argn] + 2) <= 2) { mbc_type = strtoul(optarg, &ep, 0);
int result; if (optarg[0] == '\0' || *ep != '\0')
result = sscanf(argv[argn] + 2, "%x", &mbc_type);
if (!((result == EOF) || (result == 1))) {
FatalError("Invalid argument for option 'b'"); FatalError("Invalid argument for option 'b'");
} if (mbc_type < 0 || mbc_type > 0xFF)
} else if (strlen(argv[argn] + 2) > 0) { FatalError("Argument for option 'b' must be between 0 and 0xFF");
FatalError("MBC type must be between 0 and FF");
} else {
FatalError("Invalid argument for option 'b'");
}
break; break;
case 'p': case 'p':
ulOptions |= OPTF_PAD; ulOptions |= OPTF_PAD;
if (strlen(argv[argn] + 2) > 0 && strlen(argv[argn] + 2) <= 2) { pad_value = strtoul(optarg, &ep, 0);
int result; if (optarg[0] == '\0' || *ep != '\0')
result = sscanf(argv[argn] + 2, "%x", &pad_value);
if (!((result == EOF) || (result == 1))) {
FatalError("Invalid argument for option 'p'"); FatalError("Invalid argument for option 'p'");
} if (pad_value < 0 || pad_value > 0xFF)
} FatalError("Argument for option 'p' must be between 0 and 0xFF");
break; break;
case 'r': case 'r':
ulOptions |= OPTF_TRUNCATE; ulOptions |= OPTF_TRUNCATE;
@@ -297,11 +281,11 @@ main(int argc, char *argv[])
ulOptions |= OPTF_VALIDATE; ulOptions |= OPTF_VALIDATE;
break; break;
case 't': case 't':
strncpy(cartname, argv[argn] + 2, 16); strncpy(cartname, optarg, 16);
ulOptions |= OPTF_TITLE; ulOptions |= OPTF_TITLE;
break; break;
case 'k': case 'k':
strncpy(nlicensee, argv[argn] + 2, 2); strncpy(nlicensee, optarg, 2);
ulOptions |= OPTF_NLICENSEE; ulOptions |= OPTF_NLICENSEE;
break; break;
case 'q': case 'q':
@@ -324,12 +308,15 @@ main(int argc, char *argv[])
case 's': case 's':
ulOptions |= OPTF_SGBMODE; ulOptions |= OPTF_SGBMODE;
break; break;
default:
PrintUsage();
/* NOTREACHED */
} }
} }
argn++; argc -= optind;
} argv += optind;
if (argv[argc - 1][0] == '-') if (argc == 0)
PrintUsage(); PrintUsage();
strcpy(filename, argv[argc - 1]); strcpy(filename, argv[argc - 1]);