mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 15:45:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge bk-internal.mysql.com:/home/bk/mysql-4.1

Browse source 
into mishka.local:/home/my/mysql-4.1
This commit is contained in:
monty@mishka.local 2004-10-20 02:55:03 +03:00
commit 7af65592c7
43 changed files with 373 additions and 261 deletions
Download patch file Download diff file Expand all files Collapse all files

2
strings/Makefile.am
View file

@ -57,7 +57,7 @@ EXTRA_DIST = ctype-big5.c ctype-czech.c ctype-euc_kr.c ctype-win1250ch.c \
t_ctype.h
libmystrings_a_LIBADD=
conf_to_src_SOURCES = conf_to_src.c xml.c ctype.c
conf_to_src_SOURCES = conf_to_src.c xml.c ctype.c bcmp.c
conf_to_src_LDADD=
#force static linking of conf_to_src - essential when linking against
#custom installation of libc

7
strings/xml.c
View file

@ -81,10 +81,11 @@ static int my_xml_scan(MY_XML_PARSER *p,MY_XML_ATTR *a)
a->beg=p->cur;
a->end=p->cur;
if (!memcmp(p->cur,"<!--",4))
if (!bcmp(p->cur,"<!--",4))
{
for( ; (p->cur < p->end) && memcmp(p->cur, "-->", 3); p->cur++);
if(!memcmp(p->cur, "-->", 3))
for( ; (p->cur < p->end) && bcmp(p->cur, "-->", 3); p->cur++)
{}
if (!bcmp(p->cur, "-->", 3))
p->cur+=3;
a->end=p->cur;
lex=MY_XML_COMMENT;