oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

util/OptionParser: loop in ParseNext() until a new option is found

Browse Source
This commit is contained in:
Max Kellermann
2018-01-16 11:25:18 +01:00
parent 68f660dbcc
commit 5ab086e337
4 changed files with 24 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/util/OptionParser.cxx
View File

@@ -39,23 +39,23 @@ OptionParser::CheckOption(const OptionDef &opt) const noexcept
bool
OptionParser::ParseNext() noexcept
{
assert(HasEntries());
const char *arg = args.shift();
if (arg[0] == '-') {
if (arg[1] == '-') {
option = arg + 2;
is_long = true;
while (!args.empty()) {
const char *arg = args.shift();
if (arg[0] == '-') {
if (arg[1] == '-') {
option = arg + 2;
is_long = true;
}
else {
option = arg + 1;
is_long = false;
}
option_raw = arg;
return true;
}
else {
option = arg + 1;
is_long = false;
}
option_raw = arg;
return true;
*remaining_tail++ = arg;
}
option = nullptr;
option_raw = nullptr;
*remaining_tail++ = arg;
return false;
}