Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This commit was generated by cvs2svn to compensate for changes in r2634,

Browse Source 
which included commits to RCS files with non-trunk default branches.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
1999-06-02 01:53:30 +00:00
parent 858cde9dbf
commit 294645ebe8
2 changed files with 128 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

179
src/regex/regerror.c
View File

@@ -1,126 +1,109 @@
#include <sys/types.h>
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include <limits.h>
#include <stdlib.h>
#include <regex.h>
#include "utils.h"
#include "regerror.ih"
/* /*
= #define REG_OKAY 0 * regerror - error-code expansion
= #define REG_NOMATCH 1 *
= #define REG_BADPAT 2 * Copyright (c) 1998, 1999 Henry Spencer. All rights reserved.
= #define REG_ECOLLATE 3 *
= #define REG_ECTYPE 4 * Development of this software was funded, in part, by Cray Research Inc.,
= #define REG_EESCAPE 5 * UUNET Communications Services Inc., Sun Microsystems Inc., and Scriptics
= #define REG_ESUBREG 6 * Corporation, none of whom are responsible for the results. The author
= #define REG_EBRACK 7 * thanks all of them.
= #define REG_EPAREN 8 *
= #define REG_EBRACE 9 * Redistribution and use in source and binary forms -- with or without
= #define REG_BADBR 10 * modification -- are permitted for any purpose, provided that
= #define REG_ERANGE 11 * redistributions in source form retain this entire copyright notice and
= #define REG_ESPACE 12 * indicate the origin and nature of any modifications.
= #define REG_BADRPT 13 *
= #define REG_EMPTY 14 * I'd appreciate being given credit for this package in the documentation
= #define REG_ASSERT 15 * of software which uses it, but that is not a requirement.
= #define REG_INVARG 16 *
= #define REG_ATOI 255 // convert name to number (!) * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
= #define REG_ITOA 0400 // convert number to name (!) * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
* HENRY SPENCER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/ */
#include "regguts.h"
/* unknown-error explanation */
static char unk[] = "*** unknown regex error code 0x%x ***";
/* struct to map among codes, code names, and explanations */
static struct rerr { static struct rerr {
int code; int code;
char *name; char *name;
char *explain; char *explain;
} rerrs[] = { } rerrs[] = {
REG_OKAY, "REG_OKAY", "no errors detected", /* the actual table is built from regex.h */
REG_NOMATCH, "REG_NOMATCH", "regexec() failed to match", # include "regerrs.h"
REG_BADPAT, "REG_BADPAT", "invalid regular expression", { -1, "", "oops" }, /* explanation special-cased in code */
REG_ECOLLATE, "REG_ECOLLATE", "invalid collating element",
REG_ECTYPE, "REG_ECTYPE", "invalid character class",
REG_EESCAPE, "REG_EESCAPE", "trailing backslash (\\)",
REG_ESUBREG, "REG_ESUBREG", "invalid backreference number",
REG_EBRACK, "REG_EBRACK", "brackets ([ ]) not balanced",
REG_EPAREN, "REG_EPAREN", "parentheses not balanced",
REG_EBRACE, "REG_EBRACE", "braces not balanced",
REG_BADBR, "REG_BADBR", "invalid repetition count(s)",
REG_ERANGE, "REG_ERANGE", "invalid character range",
REG_ESPACE, "REG_ESPACE", "out of memory",
REG_BADRPT, "REG_BADRPT", "repetition-operator operand invalid",
REG_EMPTY, "REG_EMPTY", "empty (sub)expression",
REG_ASSERT, "REG_ASSERT", "\"can't happen\" -- you found a bug",
REG_INVARG, "REG_INVARG", "invalid argument to regex routine",
-1, "", "*** unknown regexp error code ***",
}; };
/* /*
- regerror - the interface to error numbers - regerror - the interface to error numbers
= extern size_t regerror(int, const regex_t *, char *, size_t);
*/ */
/* ARGSUSED */ /* ARGSUSED */
size_t size_t /* actual space needed (including NUL) */
regerror(errcode, preg, errbuf, errbuf_size) regerror(errcode, preg, errbuf, errbuf_size)
int errcode; int errcode; /* error code, or REG_ATOI or REG_ITOA */
const regex_t *preg; CONST regex_t *preg; /* associated regex_t (unused at present) */
char *errbuf; char *errbuf; /* result buffer (unless errbuf_size==0) */
size_t errbuf_size; size_t errbuf_size; /* available space in errbuf, can be 0 */
{ {
register struct rerr *r; struct rerr *r;
register size_t len; char *msg;
register int target = errcode &~ REG_ITOA; char convbuf[sizeof(unk)+50]; /* 50 = plenty for int */
register char *s; size_t len;
char convbuf[50]; int icode;
if (errcode == REG_ATOI) switch (errcode) {
s = regatoi(preg, convbuf); case REG_ATOI: /* convert name to number */
else {
for (r = rerrs; r->code >= 0; r++) for (r = rerrs; r->code >= 0; r++)
if (r->code == target) if (strcmp(r->name, errbuf) == 0)
break;
sprintf(convbuf, "%d", r->code); /* -1 for unknown */
msg = convbuf;
break;
case REG_ITOA: /* convert number to name */
icode = atoi(errbuf); /* not our problem if this fails */
for (r = rerrs; r->code >= 0; r++)
if (r->code == icode)
break; break;
if (errcode&REG_ITOA) {
if (r->code >= 0) if (r->code >= 0)
(void) strcpy(convbuf, r->name); msg = r->name;
else else { /* unknown; tell him the number */
sprintf(convbuf, "REG_0x%x", target); sprintf(convbuf, "REG_%u", (unsigned)icode);
assert(strlen(convbuf) < sizeof(convbuf)); msg = convbuf;
s = convbuf; }
} else break;
s = r->explain; default: /* a real, normal error code */
for (r = rerrs; r->code >= 0; r++)
if (r->code == errcode)
break;
if (r->code >= 0)
msg = r->explain;
else { /* unknown; say so */
sprintf(convbuf, unk, errcode);
msg = convbuf;
}
break;
} }
len = strlen(s) + 1; len = strlen(msg) + 1; /* space needed, including NUL */
if (errbuf_size > 0) { if (errbuf_size > 0) {
if (errbuf_size > len) if (errbuf_size > len)
(void) strcpy(errbuf, s); strcpy(errbuf, msg);
else { else { /* truncate to fit */
(void) strncpy(errbuf, s, errbuf_size-1); strncpy(errbuf, msg, errbuf_size-1);
errbuf[errbuf_size-1] = '\0'; errbuf[errbuf_size-1] = '\0';
} }
} }
return(len); return len;
}
/*
- regatoi - internal routine to implement REG_ATOI
== static char *regatoi(const regex_t *preg, char *localbuf);
*/
static char *
regatoi(preg, localbuf)
const regex_t *preg;
char *localbuf;
{
register struct rerr *r;
for (r = rerrs; r->code >= 0; r++)
if (strcmp(r->name, preg->re_endp) == 0)
break;
if (r->code < 0)
return("0");
sprintf(localbuf, "%d", r->code);
return(localbuf);
} }

76
src/regex/regfree.c
View File

@@ -1,37 +1,53 @@
#include <sys/types.h> /*
#include <stdio.h> * regfree - free an RE
#include <stdlib.h> *
#include <regex.h> * Copyright (c) 1998, 1999 Henry Spencer. All rights reserved.
*
* Development of this software was funded, in part, by Cray Research Inc.,
* UUNET Communications Services Inc., Sun Microsystems Inc., and Scriptics
* Corporation, none of whom are responsible for the results. The author
* thanks all of them.
*
* Redistribution and use in source and binary forms -- with or without
* modification -- are permitted for any purpose, provided that
* redistributions in source form retain this entire copyright notice and
* indicate the origin and nature of any modifications.
*
* I'd appreciate being given credit for this package in the documentation
* of software which uses it, but that is not a requirement.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
* HENRY SPENCER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
*
* You might think that this could be incorporated into regcomp.c, and
* that would be a reasonable idea... except that this is a generic
* function (with a generic name), applicable to all compiled REs
* regardless of the size of their characters, whereas the stuff in
* regcomp.c gets compiled once per character size.
*/
#include "utils.h" #include "regguts.h"
#include "regex2.h"
/* /*
- regfree - free everything - regfree - free an RE (generic function, punts to RE-specific function)
= extern void regfree(regex_t *); *
* Ignoring invocation with NULL is a convenience.
*/ */
void VOID
regfree(preg) regfree(re)
regex_t *preg; regex_t *re;
{ {
register struct re_guts *g; if (re == NULL)
if (preg->re_magic != MAGIC1) /* oops */
return; /* nice to complain, but hard */
g = preg->re_g;
if (g == NULL || g->magic != MAGIC2) /* oops again */
return; return;
preg->re_magic = 0; /* mark it invalid */ (*((struct fns *)re->re_fns)->free)(re);
g->magic = 0; /* mark it invalid */
if (g->strip != NULL)
free((char *)g->strip);
if (g->sets != NULL)
free((char *)g->sets);
if (g->setbits != NULL)
free((char *)g->setbits);
if (g->must != NULL)
free(g->must);
free((char *)g);
} }