Nigel
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reject command lines that have too many positional arguments passed (e.g., 

'opt x y').  This fixes PR493.

Patch contributed by Owen Anderson!

llvm-svn: 22705
This commit is contained in:
Chris Lattner 2005-08-08 17:25:38 +00:00
parent 14203e85b2
commit d380d8412d
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
llvm/lib/Support/CommandLine.cpp
View File

@ -297,6 +297,10 @@ void cl::ParseCommandLineOptions(int &argc, char **argv,
// Check out the positional arguments to collect information about them. // Check out the positional arguments to collect information about them.
unsigned NumPositionalRequired = 0; unsigned NumPositionalRequired = 0;
// Determine whether or not there are an unlimited number of positionals
bool HasUnlimitedPositionals = false;
Option *ConsumeAfterOpt = 0; Option *ConsumeAfterOpt = 0;
if (!PositionalOpts.empty()) { if (!PositionalOpts.empty()) {
if (PositionalOpts[0]->getNumOccurrencesFlag() == cl::ConsumeAfter) { if (PositionalOpts[0]->getNumOccurrencesFlag() == cl::ConsumeAfter) {
@ -331,6 +335,10 @@ void cl::ParseCommandLineOptions(int &argc, char **argv,
" does not require a value!"); " does not require a value!");
} }
UnboundedFound |= EatsUnboundedNumberOfValues(Opt); UnboundedFound |= EatsUnboundedNumberOfValues(Opt);
if (Opt->getNumOccurrencesFlag() == cl::ZeroOrMore
|| Opt->getNumOccurrencesFlag() == cl::OneOrMore)
HasUnlimitedPositionals = true;
} }
} }
@ -484,7 +492,13 @@ void cl::ParseCommandLineOptions(int &argc, char **argv,
<< "Must specify at least " << NumPositionalRequired << "Must specify at least " << NumPositionalRequired
<< " positional arguments: See: " << argv[0] << " --help\n"; << " positional arguments: See: " << argv[0] << " --help\n";
ErrorParsing = true; ErrorParsing = true;
} else if (!HasUnlimitedPositionals
&& PositionalVals.size() > PositionalOpts.size()) {
std::cerr << ProgramName
<< ": Too many positional arguments specified!\n"
<< "Can specify at most " << PositionalOpts.size()
<< " positional arguments: See: " << argv[0] << " --help\n";
ErrorParsing = true;
} else if (ConsumeAfterOpt == 0) { } else if (ConsumeAfterOpt == 0) {
// Positional args have already been handled if ConsumeAfter is specified... // Positional args have already been handled if ConsumeAfter is specified...