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

Merge recycle.(none):/src/bug22807/my50-bug22807

Browse Source 
into  recycle.(none):/src/mysql-5.0-maint
This commit is contained in:
iggy@recycle.(none) 2007-01-19 13:20:52 -05:00
commit 205f7a0583
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mysys/string.c
View File

@ -131,37 +131,35 @@ my_bool dynstr_append_mem(DYNAMIC_STRING *str, const char *append,
my_bool dynstr_append_os_quoted(DYNAMIC_STRING *str, const char *append, ...) my_bool dynstr_append_os_quoted(DYNAMIC_STRING *str, const char *append, ...)
{ {
#ifdef __WIN__ #ifdef __WIN__
char quote_str[]= "\""; const char *quote_str= "\"";
const uint quote_len= 1;
#else #else
char quote_str[]= "\'"; const char *quote_str= "\'";
const uint quote_len= 1;
#endif /* __WIN__ */ #endif /* __WIN__ */
my_bool ret= TRUE; my_bool ret= TRUE;
va_list dirty_text; va_list dirty_text;
ret&= dynstr_append(str, quote_str); /* Leading quote */ ret&= dynstr_append_mem(str, quote_str, quote_len); /* Leading quote */
va_start(dirty_text,append); va_start(dirty_text, append);
while (append != NullS) while (append != NullS)
{ {
char *cur_pos= append; const char *cur_pos= append;
char *next_pos= cur_pos; const char *next_pos= cur_pos;
/* Search for quote in each string and replace with escaped quote */ /* Search for quote in each string and replace with escaped quote */
while(*(next_pos= strcend(cur_pos, quote_str[0])) != '\0') while(*(next_pos= strcend(cur_pos, quote_str[0])) != '\0')
{ {
char *tmp_buff= my_malloc((next_pos - cur_pos) + 1, MYF(MY_ZEROFILL)); ret&= dynstr_append_mem(str, cur_pos, next_pos - cur_pos);
strnmov(tmp_buff, cur_pos, (next_pos - cur_pos)); ret&= dynstr_append_mem(str ,"\\", 1);
ret&= dynstr_append(str, tmp_buff); ret&= dynstr_append_mem(str, quote_str, quote_len);
my_free((gptr)tmp_buff, MYF(0));
ret&= dynstr_append(str ,"\\");
ret&= dynstr_append(str, quote_str);
cur_pos= next_pos + 1; cur_pos= next_pos + 1;
} }
ret&= dynstr_append(str, cur_pos); ret&= dynstr_append_mem(str, cur_pos, next_pos - cur_pos);
append= va_arg(dirty_text, char *); append= va_arg(dirty_text, char *);
} }
va_end(dirty_text); va_end(dirty_text);
ret&= dynstr_append(str, quote_str); /* Trailing quote */ ret&= dynstr_append_mem(str, quote_str, quote_len); /* Trailing quote */
return ret; return ret;
} }