mirror of
https://github.com/apache/httpd.git
synced 2025-08-03 16:33:59 +00:00
Change the indentation to resemble the rest of the project. No code change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1125816 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Fritsch
@ -1,6 +1,6 @@
|
||||
/*************************************************
|
||||
* Perl-Compatible Regular Expressions *
|
||||
*************************************************/
|
||||
* Perl-Compatible Regular Expressions *
|
||||
*************************************************/
|
||||
|
||||
/*
|
||||
This is a library of functions to support regular expressions whose syntax
|
||||
@ -55,180 +55,196 @@ POSSIBILITY OF SUCH DAMAGE.
|
||||
#endif
|
||||
|
||||
/* Table of error strings corresponding to POSIX error codes; must be
|
||||
* kept in synch with include/ap_regex.h's AP_REG_E* definitions. */
|
||||
* kept in synch with include/ap_regex.h's AP_REG_E* definitions.
|
||||
*/
|
||||
|
||||
static const char *const pstring[] = {
|
||||
"", /* Dummy for value 0 */
|
||||
"internal error", /* AP_REG_ASSERT */
|
||||
"failed to get memory", /* AP_REG_ESPACE */
|
||||
"bad argument", /* AP_REG_INVARG */
|
||||
"match failed" /* AP_REG_NOMATCH */
|
||||
"", /* Dummy for value 0 */
|
||||
"internal error", /* AP_REG_ASSERT */
|
||||
"failed to get memory", /* AP_REG_ESPACE */
|
||||
"bad argument", /* AP_REG_INVARG */
|
||||
"match failed" /* AP_REG_NOMATCH */
|
||||
};
|
||||
|
||||
AP_DECLARE(apr_size_t) ap_regerror(int errcode, const ap_regex_t *preg,
|
||||
char *errbuf, apr_size_t errbuf_size)
|
||||
{
|
||||
const char *message, *addmessage;
|
||||
apr_size_t length, addlength;
|
||||
const char *message, *addmessage;
|
||||
apr_size_t length, addlength;
|
||||
|
||||
message = (errcode >= (int)(sizeof(pstring)/sizeof(char *)))?
|
||||
"unknown error code" : pstring[errcode];
|
||||
length = strlen(message) + 1;
|
||||
message = (errcode >= (int)(sizeof(pstring) / sizeof(char *))) ?
|
||||
"unknown error code" : pstring[errcode];
|
||||
length = strlen(message) + 1;
|
||||
|
||||
addmessage = " at offset ";
|
||||
addlength = (preg != NULL && (int)preg->re_erroffset != -1)?
|
||||
strlen(addmessage) + 6 : 0;
|
||||
addmessage = " at offset ";
|
||||
addlength = (preg != NULL && (int)preg->re_erroffset != -1) ?
|
||||
strlen(addmessage) + 6 : 0;
|
||||
|
||||
if (errbuf_size > 0)
|
||||
{
|
||||
if (addlength > 0 && errbuf_size >= length + addlength)
|
||||
apr_snprintf(errbuf, errbuf_size,
|
||||
"%s%s%-6d", message, addmessage, (int)preg->re_erroffset);
|
||||
else
|
||||
apr_cpystrn(errbuf, message, errbuf_size);
|
||||
}
|
||||
if (errbuf_size > 0) {
|
||||
if (addlength > 0 && errbuf_size >= length + addlength)
|
||||
apr_snprintf(errbuf, errbuf_size, "%s%s%-6d", message, addmessage,
|
||||
(int)preg->re_erroffset);
|
||||
else
|
||||
apr_cpystrn(errbuf, message, errbuf_size);
|
||||
}
|
||||
|
||||
return length + addlength;
|
||||
return length + addlength;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/*************************************************
|
||||
* Free store held by a regex *
|
||||
*************************************************/
|
||||
* Free store held by a regex *
|
||||
*************************************************/
|
||||
|
||||
AP_DECLARE(void) ap_regfree(ap_regex_t *preg)
|
||||
{
|
||||
(pcre_free)(preg->re_pcre);
|
||||
(pcre_free)(preg->re_pcre);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/*************************************************
|
||||
* Compile a regular expression *
|
||||
*************************************************/
|
||||
* Compile a regular expression *
|
||||
*************************************************/
|
||||
|
||||
/*
|
||||
Arguments:
|
||||
preg points to a structure for recording the compiled expression
|
||||
pattern the pattern to compile
|
||||
cflags compilation flags
|
||||
|
||||
Returns: 0 on success
|
||||
various non-zero codes on failure
|
||||
* Arguments:
|
||||
* preg points to a structure for recording the compiled expression
|
||||
* pattern the pattern to compile
|
||||
* cflags compilation flags
|
||||
*
|
||||
* Returns: 0 on success
|
||||
* various non-zero codes on failure
|
||||
*/
|
||||
|
||||
AP_DECLARE(int) ap_regcomp(ap_regex_t *preg, const char *pattern, int cflags)
|
||||
AP_DECLARE(int) ap_regcomp(ap_regex_t * preg, const char *pattern, int cflags)
|
||||
{
|
||||
const char *errorptr;
|
||||
int erroffset;
|
||||
int options = 0;
|
||||
const char *errorptr;
|
||||
int erroffset;
|
||||
int options = 0;
|
||||
|
||||
if ((cflags & AP_REG_ICASE) != 0) options |= PCRE_CASELESS;
|
||||
if ((cflags & AP_REG_NEWLINE) != 0) options |= PCRE_MULTILINE;
|
||||
if ((cflags & AP_REG_DOTALL) != 0) options |= PCRE_DOTALL;
|
||||
if ((cflags & AP_REG_ICASE) != 0)
|
||||
options |= PCRE_CASELESS;
|
||||
if ((cflags & AP_REG_NEWLINE) != 0)
|
||||
options |= PCRE_MULTILINE;
|
||||
if ((cflags & AP_REG_DOTALL) != 0)
|
||||
options |= PCRE_DOTALL;
|
||||
|
||||
preg->re_pcre = pcre_compile(pattern, options, &errorptr, &erroffset, NULL);
|
||||
preg->re_erroffset = erroffset;
|
||||
preg->re_pcre =
|
||||
pcre_compile(pattern, options, &errorptr, &erroffset, NULL);
|
||||
preg->re_erroffset = erroffset;
|
||||
|
||||
if (preg->re_pcre == NULL) return AP_REG_INVARG;
|
||||
if (preg->re_pcre == NULL)
|
||||
return AP_REG_INVARG;
|
||||
|
||||
preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL);
|
||||
return 0;
|
||||
preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/*************************************************
|
||||
* Match a regular expression *
|
||||
*************************************************/
|
||||
* Match a regular expression *
|
||||
*************************************************/
|
||||
|
||||
/* Unfortunately, PCRE requires 3 ints of working space for each captured
|
||||
substring, so we have to get and release working store instead of just using
|
||||
the POSIX structures as was done in earlier releases when PCRE needed only 2
|
||||
ints. However, if the number of possible capturing brackets is small, use a
|
||||
block of store on the stack, to reduce the use of malloc/free. The threshold is
|
||||
in a macro that can be changed at configure time. */
|
||||
* substring, so we have to get and release working store instead of just using
|
||||
* the POSIX structures as was done in earlier releases when PCRE needed only 2
|
||||
* ints. However, if the number of possible capturing brackets is small, use a
|
||||
* block of store on the stack, to reduce the use of malloc/free. The threshold
|
||||
* is in a macro that can be changed at configure time.
|
||||
*/
|
||||
AP_DECLARE(int) ap_regexec(const ap_regex_t *preg, const char *string,
|
||||
apr_size_t nmatch, ap_regmatch_t *pmatch,
|
||||
int eflags)
|
||||
{
|
||||
return ap_regexec_len(preg, string, strlen(string), nmatch, pmatch, eflags);
|
||||
return ap_regexec_len(preg, string, strlen(string), nmatch, pmatch,
|
||||
eflags);
|
||||
}
|
||||
|
||||
AP_DECLARE(int) ap_regexec_len(const ap_regex_t *preg, const char *buff,
|
||||
apr_size_t len, apr_size_t nmatch,
|
||||
ap_regmatch_t *pmatch, int eflags)
|
||||
{
|
||||
int rc;
|
||||
int options = 0;
|
||||
int *ovector = NULL;
|
||||
int small_ovector[POSIX_MALLOC_THRESHOLD * 3];
|
||||
int allocated_ovector = 0;
|
||||
int rc;
|
||||
int options = 0;
|
||||
int *ovector = NULL;
|
||||
int small_ovector[POSIX_MALLOC_THRESHOLD * 3];
|
||||
int allocated_ovector = 0;
|
||||
|
||||
if ((eflags & AP_REG_NOTBOL) != 0) options |= PCRE_NOTBOL;
|
||||
if ((eflags & AP_REG_NOTEOL) != 0) options |= PCRE_NOTEOL;
|
||||
if ((eflags & AP_REG_NOTBOL) != 0)
|
||||
options |= PCRE_NOTBOL;
|
||||
if ((eflags & AP_REG_NOTEOL) != 0)
|
||||
options |= PCRE_NOTEOL;
|
||||
|
||||
((ap_regex_t *)preg)->re_erroffset = (apr_size_t)(-1); /* Only has meaning after compile */
|
||||
((ap_regex_t *)preg)->re_erroffset = (apr_size_t)(-1); /* Only has meaning after compile */
|
||||
|
||||
if (nmatch > 0)
|
||||
{
|
||||
if (nmatch <= POSIX_MALLOC_THRESHOLD)
|
||||
{
|
||||
ovector = &(small_ovector[0]);
|
||||
if (nmatch > 0) {
|
||||
if (nmatch <= POSIX_MALLOC_THRESHOLD) {
|
||||
ovector = &(small_ovector[0]);
|
||||
}
|
||||
else {
|
||||
ovector = (int *)malloc(sizeof(int) * nmatch * 3);
|
||||
if (ovector == NULL)
|
||||
return AP_REG_ESPACE;
|
||||
allocated_ovector = 1;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
ovector = (int *)malloc(sizeof(int) * nmatch * 3);
|
||||
if (ovector == NULL) return AP_REG_ESPACE;
|
||||
allocated_ovector = 1;
|
||||
|
||||
rc = pcre_exec((const pcre *)preg->re_pcre, NULL, buff, (int)len,
|
||||
0, options, ovector, nmatch * 3);
|
||||
|
||||
if (rc == 0)
|
||||
rc = nmatch; /* All captured slots were filled in */
|
||||
|
||||
if (rc >= 0) {
|
||||
apr_size_t i;
|
||||
for (i = 0; i < (apr_size_t)rc; i++) {
|
||||
pmatch[i].rm_so = ovector[i * 2];
|
||||
pmatch[i].rm_eo = ovector[i * 2 + 1];
|
||||
}
|
||||
if (allocated_ovector)
|
||||
free(ovector);
|
||||
for (; i < nmatch; i++)
|
||||
pmatch[i].rm_so = pmatch[i].rm_eo = -1;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
rc = pcre_exec((const pcre *)preg->re_pcre, NULL, buff, (int)len,
|
||||
0, options, ovector, nmatch * 3);
|
||||
|
||||
if (rc == 0) rc = nmatch; /* All captured slots were filled in */
|
||||
|
||||
if (rc >= 0)
|
||||
{
|
||||
apr_size_t i;
|
||||
for (i = 0; i < (apr_size_t)rc; i++)
|
||||
{
|
||||
pmatch[i].rm_so = ovector[i*2];
|
||||
pmatch[i].rm_eo = ovector[i*2+1];
|
||||
}
|
||||
if (allocated_ovector) free(ovector);
|
||||
for (; i < nmatch; i++) pmatch[i].rm_so = pmatch[i].rm_eo = -1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
if (allocated_ovector) free(ovector);
|
||||
switch(rc)
|
||||
{
|
||||
case PCRE_ERROR_NOMATCH: return AP_REG_NOMATCH;
|
||||
case PCRE_ERROR_NULL: return AP_REG_INVARG;
|
||||
case PCRE_ERROR_BADOPTION: return AP_REG_INVARG;
|
||||
case PCRE_ERROR_BADMAGIC: return AP_REG_INVARG;
|
||||
case PCRE_ERROR_UNKNOWN_NODE: return AP_REG_ASSERT;
|
||||
case PCRE_ERROR_NOMEMORY: return AP_REG_ESPACE;
|
||||
else {
|
||||
if (allocated_ovector)
|
||||
free(ovector);
|
||||
switch (rc) {
|
||||
case PCRE_ERROR_NOMATCH:
|
||||
return AP_REG_NOMATCH;
|
||||
case PCRE_ERROR_NULL:
|
||||
return AP_REG_INVARG;
|
||||
case PCRE_ERROR_BADOPTION:
|
||||
return AP_REG_INVARG;
|
||||
case PCRE_ERROR_BADMAGIC:
|
||||
return AP_REG_INVARG;
|
||||
case PCRE_ERROR_UNKNOWN_NODE:
|
||||
return AP_REG_ASSERT;
|
||||
case PCRE_ERROR_NOMEMORY:
|
||||
return AP_REG_ESPACE;
|
||||
#ifdef PCRE_ERROR_MATCHLIMIT
|
||||
case PCRE_ERROR_MATCHLIMIT: return AP_REG_ESPACE;
|
||||
case PCRE_ERROR_MATCHLIMIT:
|
||||
return AP_REG_ESPACE;
|
||||
#endif
|
||||
#ifdef PCRE_ERROR_BADUTF8
|
||||
case PCRE_ERROR_BADUTF8: return AP_REG_INVARG;
|
||||
case PCRE_ERROR_BADUTF8:
|
||||
return AP_REG_INVARG;
|
||||
#endif
|
||||
#ifdef PCRE_ERROR_BADUTF8_OFFSET
|
||||
case PCRE_ERROR_BADUTF8_OFFSET: return AP_REG_INVARG;
|
||||
case PCRE_ERROR_BADUTF8_OFFSET:
|
||||
return AP_REG_INVARG;
|
||||
#endif
|
||||
default: return AP_REG_ASSERT;
|
||||
default:
|
||||
return AP_REG_ASSERT;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* End of pcreposix.c */
|
||||
|
||||
Reference in New Issue
Block a user