mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
16115af97c
Fixed problem with LIKE with latin1_de Added parsing support of UNSIGNED LONG LONG Docs/manual.texi: Changelog client/client_priv.h: Changed to use my_global.h client/completion_hash.cc: Changed to use my_global.h client/errmsg.c: Changed to use my_global.h client/get_password.c: Changed to use my_global.h client/mysqldump.c: Changed to use my_global.h client/mysqlshow.c: Changed to use my_global.h client/mysqltest.c: Changed to use my_global.h client/password.c: Changed to use my_global.h client/readline.cc: Changed to use my_global.h client/sql_string.cc: Changed to use my_global.h client/thimble.cc: Changed to use my_global.h client/thread_test.c: Changed to use my_global.h dbug/dbug.c: Changed to use my_global.h dbug/dbug_analyze.c: Changed to use my_global.h dbug/example1.c: Changed to use my_global.h dbug/example2.c: Changed to use my_global.h dbug/example3.c: Changed to use my_global.h dbug/factorial.c: Changed to use my_global.h dbug/main.c: Changed to use my_global.h dbug/sanity.c: Changed to use my_global.h extra/comp_err.c: Changed to use my_global.h extra/my_print_defaults.c: Changed to use my_global.h extra/perror.c: Changed to use my_global.h extra/replace.c: Changed to use my_global.h extra/resolve_stack_dump.c: Changed to use my_global.h extra/resolveip.c: Changed to use my_global.h fs/libmysqlfs.h: Changed to use my_global.h fs/mysqlcorbafs.h: Changed to use my_global.h heap/hp_test1.c: Changed to use my_global.h include/Makefile.am: Changed to use my_global.h include/m_ctype.h: Changed to use my_global.h include/my_base.h: Changed to use my_global.h innobase/include/univ.i: Changed to use my_global.h libmysql/dll.c: Changed to use my_global.h libmysql/errmsg.c: Changed to use my_global.h libmysql/get_password.c: Changed to use my_global.h libmysql/libmysql.c: Changed to use my_global.h libmysql/net.c: Changed to use my_global.h libmysql/password.c: Changed to use my_global.h libmysqld/lib_sql.cc: Changed to use my_global.h libmysqld/lib_vio.c: Changed to use my_global.h libmysqld/libmysqld.c: Changed to use my_global.h mysql-test/mysql-test-run.sh: Changed to use latin1 as default character set mysql-test/r/ctype_latin1_de.result: Changed to use my_global.h mysql-test/r/func_like.result: New test mysql-test/t/ctype_latin1_de.test: Added test of part keys mysql-test/t/func_like.test: New test mysys/checksum.c: Changed to use my_global.h mysys/getopt.c: Changed to use my_global.h mysys/getopt1.c: Changed to use my_global.h mysys/make-conf.c: Changed to use my_global.h mysys/my_alloc.c: Changed to use my_global.h mysys/my_clock.c: Changed to use my_global.h mysys/my_compress.c: Changed to use my_global.h mysys/mysys_priv.h: Changed to use my_global.h mysys/test_charset.c: Changed to use my_global.h mysys/testhash.c: Changed to use my_global.h mysys/thr_alarm.c: Changed to use my_global.h mysys/thr_mutex.c: Changed to use my_global.h regex/debug.c: Changed to use my_global.h regex/main.c: Changed to use my_global.h regex/regcomp.c: Changed to use my_global.h regex/regerror.c: Changed to use my_global.h regex/regexec.c: Changed to use my_global.h regex/regexp.c: Changed to use my_global.h regex/regfree.c: Changed to use my_global.h regex/reginit.c: Changed to use my_global.h sql/cache_manager.cc: Changed to use my_global.h sql/gen_lex_hash.cc: Changed to use my_global.h sql/ha_berkeley.cc: Fixed problem with UNIQUE keys that could contain NULL sql/ha_gemini.h: Changed to use my_global.h sql/handler.cc: Fixed problem after merge sql/item.cc: Added Item_unit sql/item.h: Added Item_uint sql/matherr.c: Changed to use my_global.h sql/md5.c: Changed to use my_global.h sql/mini_client.cc: Changed to use my_global.h sql/my_lock.c: Changed to use my_global.h sql/mysql_priv.h: Changed to use my_global.h sql/net_serv.cc: Changed to use my_global.h sql/password.c: Changed to use my_global.h sql/sql_lex.cc: Added parsing support of UNSIGNED LONG LONG sql/sql_show.cc: Changed to use my_global.h sql/sql_string.cc: Changed to use my_global.h sql/sql_yacc.yy: Added usage of Int_uint sql/stacktrace.c: Changed to use my_global.h sql/udf_example.cc: Changed to use my_global.h strings/atof.c: Changed to use my_global.h strings/bchange.c: Changed to use my_global.h strings/bcmp.c: Changed to use my_global.h strings/bfill.c: Changed to use my_global.h strings/bmove.c: Changed to use my_global.h strings/bmove512.c: Changed to use my_global.h strings/bmove_upp.c: Changed to use my_global.h strings/ctype-big5.c: Changed to use my_global.h strings/ctype-czech.c: Changed to use my_global.h strings/ctype-euc_kr.c: Changed to use my_global.h strings/ctype-gb2312.c: Changed to use my_global.h strings/ctype-gbk.c: Changed to use my_global.h strings/ctype-latin1_de.c: Fixed problem with LIKE strings/ctype-sjis.c: Changed to use my_global.h strings/ctype-tis620.c: Changed to use my_global.h strings/ctype-ujis.c: Changed to use my_global.h strings/ctype.c: Changed to use my_global.h strings/do_ctype.c: Changed to use my_global.h strings/int2str.c: Changed to use my_global.h strings/is_prefix.c: Changed to use my_global.h strings/llstr.c: Changed to use my_global.h strings/longlong2str.c: Changed to use my_global.h strings/r_strinstr.c: Changed to use my_global.h strings/str2int.c: Changed to use my_global.h strings/str_test.c: Changed to use my_global.h strings/strappend.c: Changed to use my_global.h strings/strcend.c: Changed to use my_global.h strings/strcont.c: Changed to use my_global.h strings/strend.c: Changed to use my_global.h strings/strfill.c: Changed to use my_global.h strings/strings-not-used.h: Changed to use my_global.h strings/strinstr.c: Changed to use my_global.h strings/strmake.c: Changed to use my_global.h strings/strmov.c: Changed to use my_global.h strings/strnlen.c: Changed to use my_global.h strings/strnmov.c: Changed to use my_global.h strings/strstr.c: Changed to use my_global.h strings/strto.c: Changed to use my_global.h strings/strtol.c: Changed to use my_global.h strings/strtoll.c: Changed to use my_global.h strings/strtoul.c: Changed to use my_global.h strings/strtoull.c: Changed to use my_global.h strings/strxmov.c: Changed to use my_global.h strings/strxnmov.c: Changed to use my_global.h strings/udiv.c: Changed to use my_global.h tools/mysqlmanager.c: Changed to use my_global.h vio/test-ssl.c: Changed to use my_global.h vio/test-sslclient.c: Changed to use my_global.h vio/test-sslserver.c: Changed to use my_global.h vio/test-ssl: Changed to use my_global.h vio/vio.c: Changed to use my_global.h vio/viosocket.c: Changed to use my_global.h vio/viossl.c: Changed to use my_global.h vio/viosslfactories.c: Changed to use my_global.h vio/viotest-ssl.c: Changed to use my_global.h
243 lines
5.1 KiB
C
243 lines
5.1 KiB
C
#include <my_global.h>
|
|
#include <m_ctype.h>
|
|
#include <m_string.h>
|
|
#include <sys/types.h>
|
|
#include <regex.h>
|
|
#include "utils.h"
|
|
#include "regex2.h"
|
|
#include "debug.ih"
|
|
|
|
/* Added extra paramter to regchar to remove static buffer ; Monty 96.11.27 */
|
|
|
|
/*
|
|
- regprint - print a regexp for debugging
|
|
== void regprint(regex_t *r, FILE *d);
|
|
*/
|
|
void
|
|
regprint(r, d)
|
|
regex_t *r;
|
|
FILE *d;
|
|
{
|
|
register struct re_guts *g = r->re_g;
|
|
register int i;
|
|
register int c;
|
|
register int last;
|
|
int nincat[NC];
|
|
char buf[10];
|
|
|
|
fprintf(d, "%ld states, %d categories", (long)g->nstates,
|
|
g->ncategories);
|
|
fprintf(d, ", first %ld last %ld", (long)g->firststate,
|
|
(long)g->laststate);
|
|
if (g->iflags&USEBOL)
|
|
fprintf(d, ", USEBOL");
|
|
if (g->iflags&USEEOL)
|
|
fprintf(d, ", USEEOL");
|
|
if (g->iflags&BAD)
|
|
fprintf(d, ", BAD");
|
|
if (g->nsub > 0)
|
|
fprintf(d, ", nsub=%ld", (long)g->nsub);
|
|
if (g->must != NULL)
|
|
fprintf(d, ", must(%ld) `%*s'", (long)g->mlen, (int)g->mlen,
|
|
g->must);
|
|
if (g->backrefs)
|
|
fprintf(d, ", backrefs");
|
|
if (g->nplus > 0)
|
|
fprintf(d, ", nplus %ld", (long)g->nplus);
|
|
fprintf(d, "\n");
|
|
s_print(g, d);
|
|
for (i = 0; i < g->ncategories; i++) {
|
|
nincat[i] = 0;
|
|
for (c = CHAR_MIN; c <= CHAR_MAX; c++)
|
|
if (g->categories[c] == i)
|
|
nincat[i]++;
|
|
}
|
|
fprintf(d, "cc0#%d", nincat[0]);
|
|
for (i = 1; i < g->ncategories; i++)
|
|
if (nincat[i] == 1) {
|
|
for (c = CHAR_MIN; c <= CHAR_MAX; c++)
|
|
if (g->categories[c] == i)
|
|
break;
|
|
fprintf(d, ", %d=%s", i, regchar(c,buf));
|
|
}
|
|
fprintf(d, "\n");
|
|
for (i = 1; i < g->ncategories; i++)
|
|
if (nincat[i] != 1) {
|
|
fprintf(d, "cc%d\t", i);
|
|
last = -1;
|
|
for (c = CHAR_MIN; c <= CHAR_MAX+1; c++) /* +1 does flush */
|
|
if (c <= CHAR_MAX && g->categories[c] == i) {
|
|
if (last < 0) {
|
|
fprintf(d, "%s", regchar(c,buf));
|
|
last = c;
|
|
}
|
|
} else {
|
|
if (last >= 0) {
|
|
if (last != c-1)
|
|
fprintf(d, "-%s",
|
|
regchar(c-1,buf));
|
|
last = -1;
|
|
}
|
|
}
|
|
fprintf(d, "\n");
|
|
}
|
|
}
|
|
|
|
/*
|
|
- s_print - print the strip for debugging
|
|
== static void s_print(register struct re_guts *g, FILE *d);
|
|
*/
|
|
static void
|
|
s_print(g, d)
|
|
register struct re_guts *g;
|
|
FILE *d;
|
|
{
|
|
register sop *s;
|
|
register cset *cs;
|
|
register int i;
|
|
register int done = 0;
|
|
register sop opnd;
|
|
register int col = 0;
|
|
register int last;
|
|
register sopno offset = 2;
|
|
char buf[10];
|
|
# define GAP() { if (offset % 5 == 0) { \
|
|
if (col > 40) { \
|
|
fprintf(d, "\n\t"); \
|
|
col = 0; \
|
|
} else { \
|
|
fprintf(d, " "); \
|
|
col++; \
|
|
} \
|
|
} else \
|
|
col++; \
|
|
offset++; \
|
|
}
|
|
|
|
if (OP(g->strip[0]) != OEND)
|
|
fprintf(d, "missing initial OEND!\n");
|
|
for (s = &g->strip[1]; !done; s++) {
|
|
opnd = OPND(*s);
|
|
switch (OP(*s)) {
|
|
case OEND:
|
|
fprintf(d, "\n");
|
|
done = 1;
|
|
break;
|
|
case OCHAR:
|
|
if (strchr("\\|()^$.[+*?{}!<> ", (char)opnd) != NULL)
|
|
fprintf(d, "\\%c", (char)opnd);
|
|
else
|
|
fprintf(d, "%s", regchar((char)opnd,buf));
|
|
break;
|
|
case OBOL:
|
|
fprintf(d, "^");
|
|
break;
|
|
case OEOL:
|
|
fprintf(d, "$");
|
|
break;
|
|
case OBOW:
|
|
fprintf(d, "\\{");
|
|
break;
|
|
case OEOW:
|
|
fprintf(d, "\\}");
|
|
break;
|
|
case OANY:
|
|
fprintf(d, ".");
|
|
break;
|
|
case OANYOF:
|
|
fprintf(d, "[(%ld)", (long)opnd);
|
|
cs = &g->sets[opnd];
|
|
last = -1;
|
|
for (i = 0; i < g->csetsize+1; i++) /* +1 flushes */
|
|
if (CHIN(cs, i) && i < g->csetsize) {
|
|
if (last < 0) {
|
|
fprintf(d, "%s", regchar(i,buf));
|
|
last = i;
|
|
}
|
|
} else {
|
|
if (last >= 0) {
|
|
if (last != i-1)
|
|
fprintf(d, "-%s",
|
|
regchar(i-1,buf));
|
|
last = -1;
|
|
}
|
|
}
|
|
fprintf(d, "]");
|
|
break;
|
|
case OBACK_:
|
|
fprintf(d, "(\\<%ld>", (long)opnd);
|
|
break;
|
|
case O_BACK:
|
|
fprintf(d, "<%ld>\\)", (long)opnd);
|
|
break;
|
|
case OPLUS_:
|
|
fprintf(d, "(+");
|
|
if (OP(*(s+opnd)) != O_PLUS)
|
|
fprintf(d, "<%ld>", (long)opnd);
|
|
break;
|
|
case O_PLUS:
|
|
if (OP(*(s-opnd)) != OPLUS_)
|
|
fprintf(d, "<%ld>", (long)opnd);
|
|
fprintf(d, "+)");
|
|
break;
|
|
case OQUEST_:
|
|
fprintf(d, "(?");
|
|
if (OP(*(s+opnd)) != O_QUEST)
|
|
fprintf(d, "<%ld>", (long)opnd);
|
|
break;
|
|
case O_QUEST:
|
|
if (OP(*(s-opnd)) != OQUEST_)
|
|
fprintf(d, "<%ld>", (long)opnd);
|
|
fprintf(d, "?)");
|
|
break;
|
|
case OLPAREN:
|
|
fprintf(d, "((<%ld>", (long)opnd);
|
|
break;
|
|
case ORPAREN:
|
|
fprintf(d, "<%ld>))", (long)opnd);
|
|
break;
|
|
case OCH_:
|
|
fprintf(d, "<");
|
|
if (OP(*(s+opnd)) != OOR2)
|
|
fprintf(d, "<%ld>", (long)opnd);
|
|
break;
|
|
case OOR1:
|
|
if (OP(*(s-opnd)) != OOR1 && OP(*(s-opnd)) != OCH_)
|
|
fprintf(d, "<%ld>", (long)opnd);
|
|
fprintf(d, "|");
|
|
break;
|
|
case OOR2:
|
|
fprintf(d, "|");
|
|
if (OP(*(s+opnd)) != OOR2 && OP(*(s+opnd)) != O_CH)
|
|
fprintf(d, "<%ld>", (long)opnd);
|
|
break;
|
|
case O_CH:
|
|
if (OP(*(s-opnd)) != OOR1)
|
|
fprintf(d, "<%ld>", (long)opnd);
|
|
fprintf(d, ">");
|
|
break;
|
|
default:
|
|
fprintf(d, "!%ld(%ld)!", OP(*s), opnd);
|
|
break;
|
|
}
|
|
if (!done)
|
|
GAP();
|
|
}
|
|
}
|
|
|
|
/*
|
|
- regchar - make a character printable
|
|
== static char *regchar(int ch);
|
|
*/
|
|
static char * /* -> representation */
|
|
regchar(ch,buf)
|
|
int ch;
|
|
char *buf;
|
|
{
|
|
|
|
if (isprint(ch) || ch == ' ')
|
|
sprintf(buf, "%c", ch);
|
|
else
|
|
sprintf(buf, "\\%o", ch);
|
|
return(buf);
|
|
}
|