Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed an option processing bug

Browse source
This commit is contained in:
Seth Hall 2020-10-08 16:11:25 -04:00
parent 2bdc56dfcd
commit 97f7bf784b
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/Options.cc
View file

@ -200,23 +200,23 @@ Options parse_cmdline(int argc, char** argv)
zeek_args.emplace_back(argv[i]); zeek_args.emplace_back(argv[i]);
} }
// If a script is invoked with Zeek as the interpreter, the arguments provided
// directly in the interpreter line of the script won't be broken apart in the
// argv on Linux so we split it up here.
if ( endsWith(argv[i], "--") && zeek_args.size() == 1 )
{
std::istringstream iss(argv[i]);
for ( std::string s; iss >> s; )
{
if ( ! endsWith(s, "--") )
{
zeek_args.emplace_back(s);
}
}
}
if ( i < argc ) if ( i < argc )
{ {
// If a script is invoked with Zeek as the interpreter, the arguments provided
// directly in the interpreter line of the script won't be broken apart in the
// argv on Linux so we split it up here.
if ( endsWith(argv[i], "--") && zeek_args.size() == 1 )
{
std::istringstream iss(argv[i]);
for ( std::string s; iss >> s; )
{
if ( ! endsWith(s, "--") )
{
zeek_args.emplace_back(s);
}
}
}
// There is an additional increment here to skip over the "--" if it was found. // There is an additional increment here to skip over the "--" if it was found.
if ( endsWith(argv[i], "--") ) if ( endsWith(argv[i], "--") )
++i; ++i;