mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
1aa8f771d8
There are two main changes:
1. The regex code now creates and uses its own stack (env->mst)
instead of using the shared standard stack (stkstd). That seems
likely to be a good thing.
2. Missing mbinit() calls were inserted. The 93v- code uses a
completely different multibyte characters API, so these needed
to be translated back to the older API. But, as mbinit() is no
longer a no-op as of 300cd199, these calls do stop things from
breaking if a previous operation is interrupted mid-character.
I think there might be a couple of off-by-one errors fixed as well,
as there are two instances of this change:
- while ((index += skip[buf[index]]) < mid);
+ while (index < mid)
+ index += skip[buf[index]];
96 lines
3.5 KiB
C
96 lines
3.5 KiB
C
/***********************************************************************
|
|
* *
|
|
* This software is part of the ast package *
|
|
* Copyright (c) 1985-2012 AT&T Intellectual Property *
|
|
* Copyright (c) 2020-2021 Contributors to ksh 93u+m *
|
|
* and is licensed under the *
|
|
* Eclipse Public License, Version 1.0 *
|
|
* by AT&T Intellectual Property *
|
|
* *
|
|
* A copy of the License is available at *
|
|
* http://www.eclipse.org/org/documents/epl-v10.html *
|
|
* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
|
|
* *
|
|
* Information and Software Systems Research *
|
|
* AT&T Research *
|
|
* Florham Park NJ *
|
|
* *
|
|
* Glenn Fowler <gsf@research.att.com> *
|
|
* David Korn <dgk@research.att.com> *
|
|
* Phong Vo <kpv@research.att.com> *
|
|
* *
|
|
***********************************************************************/
|
|
#pragma prototyped
|
|
|
|
/*
|
|
* POSIX regex error message handler
|
|
*/
|
|
|
|
static const char id[] = "\n@(#)$Id: regex (AT&T Research) 2012-09-27 $\0\n";
|
|
|
|
#include "reglib.h"
|
|
|
|
static const char* reg_error[] =
|
|
{
|
|
/* REG_ENOSYS */ "not supported",
|
|
/* REG_SUCCESS */ "success",
|
|
/* REG_NOMATCH */ "no match",
|
|
/* REG_BADPAT */ "invalid regular expression",
|
|
/* REG_ECOLLATE */ "invalid collation element",
|
|
/* REG_ECTYPE */ "invalid character class",
|
|
/* REG_EESCAPE */ "trailing \\ in pattern",
|
|
/* REG_ESUBREG */ "invalid \\digit backreference",
|
|
/* REG_EBRACK */ "[...] imbalance",
|
|
/* REG_EPAREN */ "\\(...\\) or (...) imbalance",
|
|
/* REG_EBRACE */ "\\{...\\} or {...} imbalance",
|
|
/* REG_BADBR */ "invalid {...} digits",
|
|
/* REG_ERANGE */ "invalid [...] range endpoint",
|
|
/* REG_ESPACE */ "out of memory",
|
|
/* REG_BADRPT */ "unary op not preceded by re",
|
|
/* REG_ENULL */ "empty subexpr in pattern",
|
|
/* REG_ECOUNT */ "re component count overflow",
|
|
/* REG_BADESC */ "invalid \\char escape",
|
|
/* REG_VERSIONID*/ &id[10],
|
|
/* REG_EFLAGS */ "conflicting flags",
|
|
/* REG_EDELIM */ "invalid or omitted delimiter",
|
|
/* REG_PANIC */ "unrecoverable internal error",
|
|
};
|
|
|
|
size_t
|
|
regerror(int code, const regex_t* p, char* buf, size_t size)
|
|
{
|
|
const char* s;
|
|
|
|
NoP(p);
|
|
if (code++ == REG_VERSIONID)
|
|
s = (const char*)fmtident(&id[1]);
|
|
else if (code >= 0 && code < elementsof(reg_error))
|
|
s = reg_error[code];
|
|
else
|
|
s = (const char*)"unknown error";
|
|
if (size)
|
|
{
|
|
strlcpy(buf, s, size);
|
|
buf[size - 1] = 0;
|
|
}
|
|
else
|
|
buf = (char*)s;
|
|
return strlen(buf) + 1;
|
|
}
|
|
|
|
/*
|
|
* discipline error intercept
|
|
*/
|
|
|
|
int
|
|
fatal(regdisc_t* disc, int code, const char* pattern)
|
|
{
|
|
if (disc->re_errorf)
|
|
{
|
|
if (pattern)
|
|
(*disc->re_errorf)(NiL, disc, disc->re_errorlevel, "regular expression: %s: %s", pattern, reg_error[code+1]);
|
|
else
|
|
(*disc->re_errorf)(NiL, disc, disc->re_errorlevel, "regular expression: %s", reg_error[code+1]);
|
|
}
|
|
return code;
|
|
}
|