glibc/misc/regexp.c
Ulrich Drepper 0bb258e350 Update.
* posix/regex.c (gettext): Use correct translation domain for glibc.

	* argp/argp-parse.c: Use __dcgettext instead of dcgettext for glibc.
	* argp/argp-help.c: Likewise.
	* inet/getnameinfo.c (getnameinfo): Use __snprintf instead of snprintf.
	* inet/rexec.c (rexec_af): Use __snprintf instead of snprintf.
	* misc/regexp.c (__step): Use __regexec instead of regexec.
	(__advance): Likewise.
	* nss/digits_dots.c: Use __inet_aton instead of inet_aton.
	* misc/daemon.c (daemon): Use __fork instead of fork.
2000-10-28 00:45:40 +00:00

77 lines
2.6 KiB
C

/* Define function and variables for the obsolete <regexp.h> interface.
Copyright (C) 1996, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with the GNU C Library; see the file COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#define __DO_NOT_DEFINE_COMPILE
#include <regexp.h>
/* Define the variables used for the interface. */
char *loc1;
char *loc2;
/* Although we do not support the use we define this variable as well. */
char *locs;
/* Find the next match in STRING. The compiled regular expression is
found in the buffer starting at EXPBUF. `loc1' will return the
first character matched and `loc2' points to the next unmatched
character. */
int
__step (const char *string, const char *expbuf)
{
regmatch_t match; /* We only need info about the full match. */
expbuf += __alignof (regex_t *);
expbuf -= (expbuf - ((const char *) 0)) % __alignof__ (regex_t *);
if (__regexec ((regex_t *) expbuf, string, 1, &match, REG_NOTEOL)
== REG_NOMATCH)
return 0;
loc1 = (char *) string + match.rm_so;
loc2 = (char *) string + match.rm_eo;
return 1;
}
weak_alias (__step, step)
/* Match the beginning of STRING with the compiled regular expression
in EXPBUF. If the match is successful `loc2' will contain the
position of the first unmatched character. */
int
__advance (const char *string, const char *expbuf)
{
regmatch_t match; /* We only need info about the full match. */
expbuf += __alignof__ (regex_t *);
expbuf -= (expbuf - ((const char *) 0)) % __alignof__ (regex_t *);
if (__regexec ((regex_t *) expbuf, string, 1, &match, REG_NOTEOL)
== REG_NOMATCH
/* We have to check whether the check is at the beginning of the
buffer. */
|| match.rm_so != 0)
return 0;
loc2 = (char *) string + match.rm_eo;
return 1;
}
weak_alias (__advance, advance)