Mercurial > hg > octave-shane > gnulib-hg
view lib/regex-quote.c @ 17381:915d2ad64b47
qacl: new module, broken out from the acl module
This is for GNU Emacs, which wants the acl functions but does
not want 'error' invoked when they fail.
* lib/acl-internal.h: Do not include error.h, quote.h.
(ENOSYS, ENOTSUP): Remove; no longer needed.
(ACL_NOT_WELL_SUPPORTED): Remove; replaced by acl_errno_valid.
* lib/acl.h: Include <stdbool.h>.
(acl_errno_valid): New function.
* lib/copy-acl.c, lib/set-acl.c: Include errno,h, not acl-internal.h.
* lib/copy-acl.c (qcopy_acl): Move to lib/qcopy-acl.c.
* lib/set-acl.c: Rename from lib/set-mode-acl.c.
(chmod_or_fchmod, qset_acl): Move to lib/qset-acl.c.
(ACL_INTERNAL_INLINE): Remove; no longer needed.
* lib/file-has-acl.c (file_has_acl):
* lib/qcopy-acl.c (qcopy_acl):
* lib/qset-acl.c (qset_acl):
Use acl_errno_valid instead of ACL_NOT_WELL_SUPPORTED.
* modules/acl (Files): Move lib/acl.h, lib/acl-internal.h,
lib/acl_entries.c, lib/set-mode-acl.c (renamed to lib/set-acl.c),
lib/file-has-acl.c, m4/acl.m4 to qacl module.
Add lib/set-acl.c.
(Depends-on): Move extern-inline, fstat, sys_stat to qacl module.
Add qacl.
(configure.ac): Move gl_FUNC_ACL to qacl module.
(lib_SOURCES): Remove file-has-acl.c (moved to qacl module).
Rename set-mode-acl.c to set-acl.c.
* lib/acl-errno-valid.c: New file.
* lib/qcopy-acl.c: New file, moved from the old lib/copy-acl.c; the
copy_acl function remains in copy-acl.c.
* lib/qcopy-acl.c, lib/qset-acl.c: Do not include gettext.h.
(_): Remove; not needed.
* lib/qset-acl.c: New file, moved from the old lib/set-mode-acl.c; the
set_acl function remains in set-acl.c (renamed from set-mode-acl.c).
* modules/qacl: New file, moved from the old modules/acl.
(Files, lib_SOURCES): Add acl-errno-valid.c, qcopy-acl.c, qset-acl.c.
Remove set-mode-acl.c, copy-acl.c.
(Depends-on): Remove error, gettext-h, quote. Add stdbool.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Sat, 27 Apr 2013 17:39:07 -0700 |
parents | e542fd46ad6f |
children | 3f6cda9d617f |
line wrap: on
line source
/* Construct a regular expression from a literal string. Copyright (C) 1995, 2010-2013 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2010. 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 3 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, see <http://www.gnu.org/licenses/>. */ #include <config.h> /* Specification. */ #include "regex-quote.h" #include <string.h> #include "mbuiter.h" #include "xalloc.h" /* Characters that are special in a BRE. */ static const char bre_special[] = "$^.*[]\\"; /* Characters that are special in an ERE. */ static const char ere_special[] = "$^.*[]\\+?{}()|"; struct regex_quote_spec regex_quote_spec_posix (int cflags, bool anchored) { struct regex_quote_spec result; strcpy (result.special, cflags != 0 ? ere_special : bre_special); result.multibyte = true; result.anchored = anchored; return result; } /* Syntax bit values, defined in GNU <regex.h>. We don't include it here, otherwise this module would need to depend on gnulib module 'regex'. */ #define RE_BK_PLUS_QM 0x00000002 #define RE_INTERVALS 0x00000200 #define RE_LIMITED_OPS 0x00000400 #define RE_NEWLINE_ALT 0x00000800 #define RE_NO_BK_BRACES 0x00001000 #define RE_NO_BK_PARENS 0x00002000 #define RE_NO_BK_VBAR 0x00008000 struct regex_quote_spec regex_quote_spec_gnu (unsigned long /*reg_syntax_t*/ syntax, bool anchored) { struct regex_quote_spec result; char *p; p = result.special; memcpy (p, bre_special, sizeof (bre_special) - 1); p += sizeof (bre_special) - 1; if ((syntax & RE_LIMITED_OPS) == 0 && (syntax & RE_BK_PLUS_QM) == 0) { *p++ = '+'; *p++ = '?'; } if ((syntax & RE_INTERVALS) != 0 && (syntax & RE_NO_BK_BRACES) != 0) { *p++ = '{'; *p++ = '}'; } if ((syntax & RE_NO_BK_PARENS) != 0) { *p++ = '('; *p++ = ')'; } if ((syntax & RE_LIMITED_OPS) == 0 && (syntax & RE_NO_BK_VBAR) != 0) *p++ = '|'; if ((syntax & RE_NEWLINE_ALT) != 0) *p++ = '\n'; *p = '\0'; result.multibyte = true; result.anchored = anchored; return result; } /* Characters that are special in a PCRE. */ static const char pcre_special[] = "$^.*[]\\+?{}()|"; /* Options bit values, defined in <pcre.h>. We don't include it here, because it is not a standard header. */ #define PCRE_ANCHORED 0x00000010 #define PCRE_EXTENDED 0x00000008 struct regex_quote_spec regex_quote_spec_pcre (int options, bool anchored) { struct regex_quote_spec result; char *p; p = result.special; memcpy (p, bre_special, sizeof (pcre_special) - 1); p += sizeof (pcre_special) - 1; if (options & PCRE_EXTENDED) { *p++ = ' '; *p++ = '\t'; *p++ = '\n'; *p++ = '\v'; *p++ = '\f'; *p++ = '\r'; *p++ = '#'; } *p = '\0'; /* PCRE regular expressions consist of UTF-8 characters of options contains PCRE_UTF8 and of single bytes otherwise. */ result.multibyte = false; /* If options contains PCRE_ANCHORED, the anchoring is implicit. */ result.anchored = (options & PCRE_ANCHORED ? 0 : anchored); return result; } size_t regex_quote_length (const char *string, const struct regex_quote_spec *spec) { const char *special = spec->special; size_t length; length = 0; if (spec->anchored) length += 2; /* for '^' at the beginning and '$' at the end */ if (spec->multibyte) { mbui_iterator_t iter; for (mbui_init (iter, string); mbui_avail (iter); mbui_advance (iter)) { /* We know that special contains only ASCII characters. */ if (mb_len (mbui_cur (iter)) == 1 && strchr (special, * mbui_cur_ptr (iter))) length += 1; length += mb_len (mbui_cur (iter)); } } else { const char *iter; for (iter = string; *iter != '\0'; iter++) { if (strchr (special, *iter)) length += 1; length += 1; } } return length; } char * regex_quote_copy (char *p, const char *string, const struct regex_quote_spec *spec) { const char *special = spec->special; if (spec->anchored) *p++ = '^'; if (spec->multibyte) { mbui_iterator_t iter; for (mbui_init (iter, string); mbui_avail (iter); mbui_advance (iter)) { /* We know that special contains only ASCII characters. */ if (mb_len (mbui_cur (iter)) == 1 && strchr (special, * mbui_cur_ptr (iter))) *p++ = '\\'; memcpy (p, mbui_cur_ptr (iter), mb_len (mbui_cur (iter))); p += mb_len (mbui_cur (iter)); } } else { const char *iter; for (iter = string; *iter != '\0'; iter++) { if (strchr (special, *iter)) *p++ = '\\'; *p++ = *iter++; } } if (spec->anchored) *p++ = '$'; return p; } char * regex_quote (const char *string, const struct regex_quote_spec *spec) { size_t length = regex_quote_length (string, spec); char *result = XNMALLOC (length + 1, char); char *p; p = result; p = regex_quote_copy (p, string, spec); *p = '\0'; return result; }