RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 06:47:35 +00:00
Code Issues Activity Actions

LibCore: Show version and help before parsing positional arguments

Browse source 
This allows `--version` and `--help` to work properly even if we do not
supply the required positional arguments to a command.
This commit is contained in:
TheFightingCatfish 2021-08-21 00:53:14 +08:00 • committed by Andreas Kling
parent 6337eb52d8
commit 9721b7b2dd
1 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Userland/Libraries/LibCore/ArgsParser.cpp
View file

@ -108,7 +108,23 @@ bool ArgsParser::parse(int argc, char* const* argv, FailureBehavior failure_beha
}
}
// We're done processing options, now let's parse positional arguments.
// We're done processing options.
// Now let's show version or help if requested.
if (m_show_version) {
print_version(stdout);
if (failure_behavior == FailureBehavior::Exit || failure_behavior == FailureBehavior::PrintUsageAndExit)
exit(0);
return false;
}
if (m_show_help) {
print_usage(stdout, argv[0]);
if (failure_behavior == FailureBehavior::Exit || failure_behavior == FailureBehavior::PrintUsageAndExit)
exit(0);
return false;
}
// Now let's parse positional arguments.
int values_left = argc - optind;
Vector<int, 16> num_values_for_arg;
@ -153,21 +169,6 @@ bool ArgsParser::parse(int argc, char* const* argv, FailureBehavior failure_beha
}
}
// We're done parsing! :)
// Now let's show version or help if requested.
if (m_show_version) {
print_version(stdout);
if (failure_behavior == FailureBehavior::Exit || failure_behavior == FailureBehavior::PrintUsageAndExit)
exit(0);
return false;
}
if (m_show_help) {
print_usage(stdout, argv[0]);
if (failure_behavior == FailureBehavior::Exit || failure_behavior == FailureBehavior::PrintUsageAndExit)
exit(0);
return false;
}
return true;
}