1547e676f3
I started out cleaning up a bit of lint in the recent run-time options handling and discovered that pmatchregex wasn't finished. Finish it and also deal with the version lint. Argument declarations for function definitions in pmatchregex.c have been switched to K&R style. (The ones in posixregex.c have been left in ANSI style.) There wasn't any build rule for pmatchregex.o; now there is (for Unix). posixregex.o is still the default. There isn't any build rule for cppregex.o (again, for Unix); the change to cppregex.cpp is untested.
74 lines
1.5 KiB
C
74 lines
1.5 KiB
C
/* NetHack 3.6 posixregex.c $NHDT-Date: 1434446946 2015/06/16 09:29:06 $ $NHDT-Branch: master $:$NHDT-Revision: 1.1 $ */
|
|
/* Copyright (c) Sean Hunt 2015. */
|
|
/* NetHack may be freely redistributed. See license for details. */
|
|
|
|
#include "hack.h"
|
|
|
|
/* Implementation of the regex engine using pmatch().
|
|
* [Switched to pmatchi() so as to ignore case.]
|
|
*
|
|
* This is a fallback ONLY and should be avoided where possible, as it results
|
|
* in regexes not behaving as POSIX extended regular expressions. As a result,
|
|
* configuration files for NetHacks built with this engine will not be
|
|
* portable to ones built with an alternate regex engine.
|
|
*/
|
|
|
|
const char regex_id[] = "pmatchregex";
|
|
|
|
struct nhregex {
|
|
const char *pat;
|
|
};
|
|
|
|
struct nhregex *
|
|
regex_init()
|
|
{
|
|
struct nhregex *re;
|
|
|
|
re = (struct nhregex *) alloc(sizeof (struct nhregex));
|
|
re->pat = (const char *) 0;
|
|
return re;
|
|
}
|
|
|
|
boolean
|
|
regex_compile(s, re)
|
|
const char *s;
|
|
struct nhregex *re;
|
|
{
|
|
if (!re)
|
|
return FALSE;
|
|
if (re->pat)
|
|
free((genericptr_t) re->pat);
|
|
|
|
re->pat = dupstr(s);
|
|
return TRUE;
|
|
}
|
|
|
|
const char *
|
|
regex_error_desc(re)
|
|
struct nhregex *re UNUSED;
|
|
{
|
|
return "pattern match compilation error";
|
|
}
|
|
|
|
boolean
|
|
regex_match(s, re)
|
|
const char *s;
|
|
struct nhregex *re;
|
|
{
|
|
if (!re || !re->pat || !s)
|
|
return FALSE;
|
|
|
|
return pmatchi(re->pat, s);
|
|
}
|
|
|
|
void
|
|
regex_free(re)
|
|
struct nhregex *re;
|
|
{
|
|
if (re) {
|
|
if (re->pat)
|
|
free((genericptr_t) re->pat);
|
|
free((genericptr_t) re);
|
|
}
|
|
}
|