Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[chip-tool] Make sure the multiple arguments separator for multiple w… #20492

Merged
merged 2 commits into from
Jul 9, 2022
Merged

[chip-tool] Make sure the multiple arguments separator for multiple w… #20492

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28f92f8
[chip-tool] Make sure the multiple arguments separator for multiple w…
vivien-apple Jul 8, 2022
53a39f3
Restyled by clang-format (#20493)
restyled-io[bot] Jul 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions examples/chip-tool/commands/common/Command.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ bool Command::InitArguments(int argc, char ** argv)
}
}

VerifyOrExit((size_t)(argc) >= mandatoryArgsCount && (argvExtraArgsCount == 0 || (argvExtraArgsCount && optionalArgsCount)),
VerifyOrExit((size_t) (argc) >= mandatoryArgsCount && (argvExtraArgsCount == 0 || (argvExtraArgsCount && optionalArgsCount)),
ChipLogError(chipTool, "InitArgs: Wrong arguments number: %d instead of %u", argc,
static_cast<unsigned int>(mandatoryArgsCount)));

Expand Down Expand Up @@ -312,7 +312,11 @@ bool Command::InitArgument(size_t argIndex, char * argValue)
while (ss.good())
{
std::string valueAsString;
getline(ss, valueAsString, ',');
// By default the parameter separator is ";" in order to not collapse with the argument itself if it contains commas
// (e.g a struct argument with multiple fields). In case one needs to use ";" it can be overriden with the following
// environment variable.
constexpr const char * kSeparatorVariable = "CHIPTOOL_CUSTOM_ARGUMENTS_SEPARATOR";
getline(ss, valueAsString, getenv(kSeparatorVariable) ? getenv(kSeparatorVariable)[0] : ';');

CustomArgument * customArgument = new CustomArgument();
vectorArgument->push_back(customArgument);
Expand Down