database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

fixed config parser to recognize correctly strings like following:

Browse Source 
test="\"#no comment here"#real comment
This commit is contained in:
bell@sanja.is.com.ua
2004-03-20 23:50:04 +02:00
parent f657ea978b
commit 8215fbe957
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysys/default.c
View File

@ -449,11 +449,12 @@ static int search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc,
static char *remove_end_comment(char *ptr) static char *remove_end_comment(char *ptr)
{ {
char quote= 0; char quote= 0; /* we are inside quote marks */
char escape= 0; /* symbol is protected by escape chagacter */
for (; *ptr; ptr++) for (; *ptr; ptr++)
{ {
if (*ptr == '\'' || *ptr == '\"') if ((*ptr == '\'' || *ptr == '\"') && !escape)
{ {
if (!quote) if (!quote)
quote= *ptr; quote= *ptr;
@ -465,6 +466,7 @@ static char *remove_end_comment(char *ptr)
*ptr= 0; *ptr= 0;
return ptr; return ptr;
} }
escape= (quote && *ptr == '\\' && !escape);
} }
return ptr; return ptr;
} }