Merging upstream version 1.2~rc1.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
bf5f23daeb
commit
fb976cb29b
17 changed files with 288 additions and 217 deletions
|
@ -120,7 +120,7 @@ bool Arg_parser::parse_short_option( const char * const opt, const char * const
|
|||
|
||||
if( index < 0 )
|
||||
{
|
||||
error_ = "invalid option -- "; error_ += c;
|
||||
error_ = "invalid option -- '"; error_ += c; error_ += '\'';
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -135,7 +135,8 @@ bool Arg_parser::parse_short_option( const char * const opt, const char * const
|
|||
{
|
||||
if( !arg || !arg[0] )
|
||||
{
|
||||
error_ = "option requires an argument -- "; error_ += c;
|
||||
error_ = "option requires an argument -- '"; error_ += c;
|
||||
error_ += '\'';
|
||||
return false;
|
||||
}
|
||||
data.back().argument = arg; ++argind; cind = 0;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue