pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-01-04 09:41:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

client/cmd_line_parser: fix wrong reporting of bad argument in --bla=val case

Browse Source 
We use get_opt_long, which allows non ambiguous abbreviations, but
since we didn't like that we have code that checks for abbreviations and
issues an error. But that code only handled separate argument and key like:
--bla value
and didn't handle them in the same arguemnts, like:
--bla=value
This patch fixes that, and gives a slightly better error report (it still
contains the =value part though)
This commit is contained in:
Alon Levy 2011-01-06 12:54:28 +02:00 committed by Hans de Goede
parent c55e5a5be3
commit 967a4a9cbb
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/cmd_line_parser.cpp
View File

@ -346,10 +346,13 @@ int CmdLineParser::get_option(char** val)
}
#ifdef DISABLE_ABBREVIATE
int name_pos = (opt_obj->type == REQUIRED_ARGUMENT) ? optind - 2 : optind - 1;
int name_pos =
(opt_obj->type == REQUIRED_ARGUMENT && optarg[-1] != '=')
? optind - 2
: optind - 1;
std::string cmd_name(_argv[name_pos] + 2);
if (cmd_name.find(opt_obj->name) != 0) {
Platform::term_printf("%s: invalid option '--%s'\n", _argv[0], cmd_name.c_str());
Platform::term_printf("%s: invalid abbreviated option '--%s'\n", _argv[0], cmd_name.c_str());
return OPTION_ERROR;
}
#endif