1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Made check for structured option handling more robust and faster.

Browse Source 
Earlier it could have failed in some special cases.
This commit is contained in:
jani@rhols221.adsl.netsonic.fi 2003-06-30 15:49:29 +03:00
parent 7c799b17b6
commit 1c38e1790a
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mysys/my_getopt.c
View File

@ -458,17 +458,19 @@ int handle_options(int *argc, char ***argv,
static char *check_struct_option(char *cur_arg, char *key_name)
{
char *ptr, *ptr2;
char *ptr, *end;
ptr= strcend(cur_arg, '.');
ptr2= strcend(cur_arg, '=');
ptr= strcend(cur_arg + 1, '.'); // Skip the first character
end= strcend(cur_arg, '=');
/*
Minimum length for a struct option is 3 (--a.b)
If the (first) dot is after an equal sign, then it is part
If the first dot is after an equal sign, then it is part
of a variable value and the option is not a struct option.
Also, if the last character in the string before the ending
NULL, or the character right before equal sign is the first
dot found, the option is not a struct option.
*/
if (strlen(ptr) >= 3 && ptr2 - ptr > 0)
if (end - ptr > 1)
{
uint len= ptr - cur_arg;
strnmov(key_name, cur_arg, len);