mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
cd1c6e220d
Bug#57995: Compiler flag change build error on OSX 10.4: my_getncpus.c Bug#57996: Compiler flag change build error on OSX 10.5 : bind.c Bug#57994: Compiler flag change build error : my_redel.c Bug#57993: Compiler flag change build error on FreeBsd 7.0 : regexec.c Bug#57992: Compiler flag change build error on FreeBsd : mf_keycache.c Bug#57997: Compiler flag change build error on OSX 10.6: debug_sync.cc Fix assorted compiler generated warnings. cmd-line-utils/readline/bind.c: Bug#57996: Compiler flag change build error on OSX 10.5 : bind.c Initialize variable to work around a false positive warning. include/m_string.h: Bug#57994: Compiler flag change build error : my_redel.c The expansion of stpcpy (in glibc) causes warnings if the return value of strmov is not being used. Since stpcpy is a GNU extension and the expansion ends up using a built-in provided by GCC, use the compiler provided built-in directly when possible. include/my_compiler.h: Define a dummy MY_GNUC_PREREQ when not compiling with GCC. libmysql/libmysql.c: Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failure Variable might not be used in some cases. So, tag it as unused. mysys/mf_keycache.c: Bug#57992: Compiler flag change build error on FreeBsd : mf_keycache.c Use UNINIT_VAR to work around a false positive warning. mysys/my_getncpus.c: Bug#57995: Compiler flag change build error on OSX 10.4: my_getncpus.c Declare variable in the same block where it is used. regex/regexec.c: Bug#57993: Compiler flag change build error on FreeBsd 7.0 : regexec.c Work around a compiler bug which causes the cast to not be enforced. sql/debug_sync.cc: Bug#57997: Compiler flag change build error on OSX 10.6: debug_sync.cc Use UNINIT_VAR to work around a false positive warning. sql/handler.cc: Use UNINIT_VAR to work around a false positive warning. sql/slave.cc: Use UNINIT_VAR to work around a false positive warning. sql/sql_partition.cc: Use UNINIT_VAR to work around a false positive warning. storage/myisam/ft_nlq_search.c: Use UNINIT_VAR to work around a false positive warning. storage/myisam/mi_create.c: Use UNINIT_VAR to work around a false positive warning. storage/myisammrg/myrg_open.c: Use UNINIT_VAR to work around a false positive warning. tests/mysql_client_test.c: Change function to take a pointer to const, no need for a cast.
140 lines
4.2 KiB
C
140 lines
4.2 KiB
C
/*
|
|
* the outer shell of regexec()
|
|
*
|
|
* This file includes engine.c *twice*, after muchos fiddling with the
|
|
* macros that code uses. This lets the same code operate on two different
|
|
* representations for state sets.
|
|
*/
|
|
#include <my_global.h>
|
|
#include <m_string.h>
|
|
#include <m_ctype.h>
|
|
#ifdef __WIN__
|
|
#include <limits.h>
|
|
#endif
|
|
#include "my_regex.h"
|
|
#include "utils.h"
|
|
#include "regex2.h"
|
|
|
|
/* for use in asserts */
|
|
#define nope 0
|
|
|
|
/* macros for manipulating states, small version */
|
|
#define states long
|
|
#define states1 long /* for later use in regexec() decision. Ensure Win64 definition is correct.*/
|
|
#define CLEAR(v) ((v) = 0)
|
|
#define SET0(v, n) ((v) &= ~((states) 1 << (n)))
|
|
#define SET1(v, n) ((v) |= (states) 1 << (n))
|
|
#define ISSET(v, n) ((v) & ((states) 1 << (n)))
|
|
#define ASSIGN(d, s) ((d) = (s))
|
|
#define EQ(a, b) ((a) == (b))
|
|
#define STATEVARS int dummy /* dummy version */
|
|
#define STATESETUP(m, n) /* nothing */
|
|
#define STATETEARDOWN(m) /* nothing */
|
|
#define SETUP(v) ((v) = 0)
|
|
#define onestate long /* Changed from int by Monty */
|
|
#define INIT(o, n) ((o) = (unsigned states)1 << (n))
|
|
#define INC(o) ((o) <<= 1)
|
|
#define ISSTATEIN(v, o) ((v) & (o))
|
|
/* some abbreviations; note that some of these know variable names! */
|
|
/* do "if I'm here, I can also be there" etc without branches */
|
|
#define FWD(dst, src, n) ((dst) |= ((unsigned states)(src)&(here)) << (n))
|
|
#define BACK(dst, src, n) ((dst) |= ((unsigned states)(src)&(here)) >> (n))
|
|
#define ISSETBACK(v, n) ((v) & ((unsigned states)here >> (n)))
|
|
/* function names */
|
|
#define SNAMES /* engine.c looks after details */
|
|
|
|
#include "engine.c"
|
|
|
|
/* now undo things */
|
|
#undef states
|
|
#undef CLEAR
|
|
#undef SET0
|
|
#undef SET1
|
|
#undef ISSET
|
|
#undef ASSIGN
|
|
#undef EQ
|
|
#undef STATEVARS
|
|
#undef STATESETUP
|
|
#undef STATETEARDOWN
|
|
#undef SETUP
|
|
#undef onestate
|
|
#undef INIT
|
|
#undef INC
|
|
#undef ISSTATEIN
|
|
#undef FWD
|
|
#undef BACK
|
|
#undef ISSETBACK
|
|
#undef SNAMES
|
|
|
|
/* macros for manipulating states, large version */
|
|
#define states char *
|
|
#define CLEAR(v) memset(v, 0, m->g->nstates)
|
|
#define SET0(v, n) ((v)[n] = 0)
|
|
#define SET1(v, n) ((v)[n] = 1)
|
|
#define ISSET(v, n) ((v)[n])
|
|
#define ASSIGN(d, s) memcpy(d, s, m->g->nstates)
|
|
#define EQ(a, b) (memcmp(a, b, m->g->nstates) == 0)
|
|
#define STATEVARS int vn; char *space
|
|
#define STATESETUP(m, nv) { (m)->space = malloc((nv)*(m)->g->nstates); \
|
|
if ((m)->space == NULL) return(REG_ESPACE); \
|
|
(m)->vn = 0; }
|
|
#define STATETEARDOWN(m) { free((m)->space); }
|
|
#define SETUP(v) ((v) = &m->space[m->vn++ * m->g->nstates])
|
|
#define onestate int
|
|
#define INIT(o, n) ((o) = (n))
|
|
#define INC(o) ((o)++)
|
|
#define ISSTATEIN(v, o) ((v)[o])
|
|
/* some abbreviations; note that some of these know variable names! */
|
|
/* do "if I'm here, I can also be there" etc without branches */
|
|
#define FWD(dst, src, n) ((dst)[here+(n)] |= (src)[here])
|
|
#define BACK(dst, src, n) ((dst)[here-(n)] |= (src)[here])
|
|
#define ISSETBACK(v, n) ((v)[here - (n)])
|
|
/* function names */
|
|
#define LNAMES /* flag */
|
|
|
|
#include "engine.c"
|
|
|
|
/*
|
|
- regexec - interface for matching
|
|
= extern int regexec(const regex_t *, const char *, size_t, \
|
|
= regmatch_t [], int);
|
|
= #define REG_NOTBOL 00001
|
|
= #define REG_NOTEOL 00002
|
|
= #define REG_STARTEND 00004
|
|
= #define REG_TRACE 00400 // tracing of execution
|
|
= #define REG_LARGE 01000 // force large representation
|
|
= #define REG_BACKR 02000 // force use of backref code
|
|
*
|
|
* We put this here so we can exploit knowledge of the state representation
|
|
* when choosing which matcher to call. Also, by this point the matchers
|
|
* have been prototyped.
|
|
*/
|
|
int /* 0 success, REG_NOMATCH failure */
|
|
my_regexec(preg, str, nmatch, pmatch, eflags)
|
|
const my_regex_t *preg;
|
|
const char *str;
|
|
size_t nmatch;
|
|
my_regmatch_t pmatch[];
|
|
int eflags;
|
|
{
|
|
char *pstr = (char *) str;
|
|
register struct re_guts *g = preg->re_g;
|
|
#ifdef REDEBUG
|
|
# define GOODFLAGS(f) (f)
|
|
#else
|
|
# define GOODFLAGS(f) ((f)&(REG_NOTBOL|REG_NOTEOL|REG_STARTEND))
|
|
#endif
|
|
|
|
if (preg->re_magic != MAGIC1 || g->magic != MAGIC2)
|
|
return(REG_BADPAT);
|
|
assert(!(g->iflags&BAD));
|
|
if (g->iflags&BAD) /* backstop for no-debug case */
|
|
return(REG_BADPAT);
|
|
eflags = GOODFLAGS(eflags);
|
|
|
|
if ((size_t) g->nstates <= CHAR_BIT*sizeof(states1) &&
|
|
!(eflags®_LARGE))
|
|
return(smatcher(preg->charset, g, pstr, nmatch, pmatch, eflags));
|
|
else
|
|
return(lmatcher(preg->charset, g, pstr, nmatch, pmatch, eflags));
|
|
}
|