mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 10:09:43 +01:00
Code Issues Releases Wiki Activity

De-duplicate and add safety checks to CLI args, fix brace style

Browse source 
The command-line argument parsing code has a lot of copy-paste. This
copy-paste would get even worse if I added safety checks to make sure
you couldn't index argv out-of-bounds by having an argument like
`-renderer` without having anything after it, i.e. you'd be doing the
command `./VVVVVV -renderer`.

Previously, only the playtest arguments (apart from the recently-added
`playassets`) had this safety check, but the message it printed whenever
the safety check failed was always "-playing option requires one
argument" regardless of whatever argument actually failed to be parsed.
So I fixed it so that all arguments actually output the correct
corresponding failed argument instead.

Also, `strcmp(argv[i], <name>) == 0` is really kind of noisy, even if
you understand what it does perfectly well.

So I refactored it with a bunch of macros. ARG() just does the strcmp()
char* comparison, and ARG_INNER() does the safety check and returns 1,
along with printing a message, if the safety check fails.
This commit is contained in:
Misa 2020-06-21 16:15:28 -07:00 committed by Ethan Lee
parent 93b13cadac
commit 9001a68833
1 changed files with 61 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
desktop_version/src/main.cpp
View file

@ -73,57 +73,72 @@ int main(int argc, char *argv[])
char* baseDir = NULL; char* baseDir = NULL;
char* assetsPath = NULL; char* assetsPath = NULL;
for (int i = 1; i < argc; ++i) { for (int i = 1; i < argc; ++i)
if (strcmp(argv[i], "-renderer") == 0) { {
++i; #define ARG(name) (strcmp(argv[i], name) == 0)
#define ARG_INNER(code) \
if (i + 1 < argc) \
{ \
i++; \
code \
} \
else \
{ \
printf("%s option requires one argument.\n", argv[i]); \
return 1; \
}
if (ARG("-renderer"))
{
ARG_INNER({
SDL_SetHintWithPriority(SDL_HINT_RENDER_DRIVER, argv[i], SDL_HINT_OVERRIDE); SDL_SetHintWithPriority(SDL_HINT_RENDER_DRIVER, argv[i], SDL_HINT_OVERRIDE);
} else if (strcmp(argv[i], "-basedir") == 0) { })
++i; }
else if (ARG("-basedir"))
{
ARG_INNER({
baseDir = argv[i]; baseDir = argv[i];
} else if (strcmp(argv[i], "-assets") == 0) { })
++i; }
else if (ARG("-assets"))
{
ARG_INNER({
assetsPath = argv[i]; assetsPath = argv[i];
} else if (strcmp(argv[i], "-playing") == 0 || strcmp(argv[i], "-p") == 0) { })
if (i + 1 < argc) { }
else if (ARG("-playing") || ARG("-p"))
{
ARG_INNER({
startinplaytest = true; startinplaytest = true;
i++;
playtestname = std::string("levels/"); playtestname = std::string("levels/");
playtestname.append(argv[i]); playtestname.append(argv[i]);
playtestname.append(std::string(".vvvvvv")); playtestname.append(std::string(".vvvvvv"));
} else { })
printf("-playing option requires one argument.\n");
return 1;
} }
} else if (strcmp(argv[i], "-playx") == 0 || else if (ARG("-playx") || ARG("-playy") ||
strcmp(argv[i], "-playy") == 0 || ARG("-playrx") || ARG("-playry") ||
strcmp(argv[i], "-playrx") == 0 || ARG("-playgc") || ARG("-playmusic"))
strcmp(argv[i], "-playry") == 0 || {
strcmp(argv[i], "-playgc") == 0 || ARG_INNER({
strcmp(argv[i], "-playmusic") == 0) {
if (i + 1 < argc) {
savefileplaytest = true; savefileplaytest = true;
int v = std::atoi(argv[i+1]); int v = std::atoi(argv[i]);
if (strcmp(argv[i], "-playx") == 0) savex = v; if (ARG("-playx")) savex = v;
else if (strcmp(argv[i], "-playy") == 0) savey = v; else if (ARG("-playy")) savey = v;
else if (strcmp(argv[i], "-playrx") == 0) saverx = v; else if (ARG("-playrx")) saverx = v;
else if (strcmp(argv[i], "-playry") == 0) savery = v; else if (ARG("-playry")) savery = v;
else if (strcmp(argv[i], "-playgc") == 0) savegc = v; else if (ARG("-playgc")) savegc = v;
else if (strcmp(argv[i], "-playmusic") == 0) savemusic = v; else if (ARG("-playmusic")) savemusic = v;
i++; })
} else {
printf("-playing option requires one argument.\n");
return 1;
} }
} else if (strcmp(argv[i], "-playassets") == 0) { else if (ARG("-playassets"))
if (i + 1 < argc) { {
i++;
// Even if this is a directory, FILESYSTEM_mountassets() expects '.vvvvvv' on the end // Even if this is a directory, FILESYSTEM_mountassets() expects '.vvvvvv' on the end
ARG_INNER({
playassets = "levels/" + std::string(argv[i]) + ".vvvvvv"; playassets = "levels/" + std::string(argv[i]) + ".vvvvvv";
} else { })
printf("%s option requires one argument.\n", argv[i]);
return 1;
}
} }
#undef ARG_INNER
#undef ARG_IS
} }
if(!FILESYSTEM_init(argv[0], baseDir, assetsPath)) if(!FILESYSTEM_init(argv[0], baseDir, assetsPath))