From 28aeb43eee402f13bec56cd16c1e075a26211260 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 8 Nov 2015 05:37:28 +0100 Subject: Merging upstream version 1.3~pre1. Signed-off-by: Daniel Baumann --- arg_parser.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'arg_parser.cc') diff --git a/arg_parser.cc b/arg_parser.cc index 7d98ffe..ef4bbd0 100644 --- a/arg_parser.cc +++ b/arg_parser.cc @@ -4,7 +4,7 @@ This library is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or + the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, @@ -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; -- cgit v1.2.3