diff options
Diffstat (limited to 'release/src/router/busybox/libbb/xregcomp.c')
| -rw-r--r-- | release/src/router/busybox/libbb/xregcomp.c | 53 |
1 files changed, 16 insertions, 37 deletions
diff --git a/release/src/router/busybox/libbb/xregcomp.c b/release/src/router/busybox/libbb/xregcomp.c index 6f5e2f0c..61efb5bc 100644 --- a/release/src/router/busybox/libbb/xregcomp.c +++ b/release/src/router/busybox/libbb/xregcomp.c @@ -2,52 +2,31 @@ /* * Utility routines. * - * Copyright (C) tons of folks. Tracking down who wrote what - * isn't something I'm going to worry about... If you wrote something - * here, please feel free to acknowledge your work. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Based in part on code from sash, Copyright (c) 1999 by David I. Bell - * Permission has been granted to redistribute this code under the GPL. + * Copyright (C) many different people. + * If you wrote this, please acknowledge your work. * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include <stdio.h> #include "libbb.h" -#include <regex.h> - - +#include "xregex.h" -void xregcomp(regex_t *preg, const char *regex, int cflags) +char* FAST_FUNC regcomp_or_errmsg(regex_t *preg, const char *regex, int cflags) { - int ret; - if ((ret = regcomp(preg, regex, cflags)) != 0) { + int ret = regcomp(preg, regex, cflags); + if (ret) { int errmsgsz = regerror(ret, preg, NULL, 0); char *errmsg = xmalloc(errmsgsz); regerror(ret, preg, errmsg, errmsgsz); - error_msg_and_die("xregcomp: %s", errmsg); + return errmsg; } + return NULL; } - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ +void FAST_FUNC xregcomp(regex_t *preg, const char *regex, int cflags) +{ + char *errmsg = regcomp_or_errmsg(preg, regex, cflags); + if (errmsg) { + bb_error_msg_and_die("bad regex '%s': %s", regex, errmsg); + } +} |