diff options
| author | Pádraig Brady <P@draigBrady.com> | 2015-02-03 03:15:10 +0000 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2015-02-03 10:18:28 +0000 |
| commit | 658529a10e05d06524d5f591a08f04c04159b4cc (patch) | |
| tree | 012a365fb870240694613f6a501ccf34b4080f49 /gl/lib/regexec.c.diff | |
| parent | bfb4f5c8b791fdcc3cdba87a5182fc684fa8cd24 (diff) | |
| download | coreutils-658529a10e05d06524d5f591a08f04c04159b4cc.tar.xz | |
build: fix invalid gnulib patch
* gl/lib/tempname.c.diff: Fix recent breakage so it applies again.
Invalid patch was noticed at http://hydra.nixos.org/eval/1172233
* cfg.mk: Exempt diff files from these "id_est" syntax checks.
(sc_ensure_gl_diffs_apply): A new syntax check, to ensure all
patches under gl/ apply cleanly. Note we use --fuzz=0 to check
patches apply cleanly for safety, due to the patch(1) issue detailed
in commit v8.21-117-g46f7e05
* gl/lib/regcomp.c.diff: Rediffed.
* gl/lib/regex_internal.c.diff: Likewise.
* gl/lib/regex_internal.h.diff: Likewise.
* gl/lib/regexec.c.diff: Likewise.
* gl/lib/tempname.h.diff: Likewise.
Diffstat (limited to 'gl/lib/regexec.c.diff')
| -rw-r--r-- | gl/lib/regexec.c.diff | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gl/lib/regexec.c.diff b/gl/lib/regexec.c.diff index 897d24839..1aa3c2477 100644 --- a/gl/lib/regexec.c.diff +++ b/gl/lib/regexec.c.diff @@ -1,17 +1,17 @@ diff --git a/lib/regexec.c b/lib/regexec.c -index 7d130a0..a58d454 100644 +index d3920c4..a8152b5 100644 --- a/lib/regexec.c +++ b/lib/regexec.c -@@ -16,6 +16,8 @@ - You should have received a copy of the GNU General Public License along - with this program; if not, see <http://www.gnu.org/licenses/>. */ +@@ -17,6 +17,8 @@ + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ +#include "verify.h" +#include "intprops.h" static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags, Idx n) internal_function; static void match_ctx_clean (re_match_context_t *mctx) internal_function; -@@ -374,8 +376,11 @@ re_search_2_stub (struct re_pattern_buffer *bufp, +@@ -373,8 +375,11 @@ re_search_2_stub (struct re_pattern_buffer *bufp, Idx len = length1 + length2; char *s = NULL; @@ -25,7 +25,7 @@ index 7d130a0..a58d454 100644 /* Concatenate the strings. */ if (length2 > 0) -@@ -426,11 +431,14 @@ re_search_stub (struct re_pattern_buffer *bufp, +@@ -423,11 +428,14 @@ re_search_stub (struct re_pattern_buffer *bufp, Idx last_start = start + range; /* Check for out-of-range. */ @@ -42,4 +42,4 @@ index 7d130a0..a58d454 100644 + else if (BE (/* last_start < 0 || */ (range < 0 && start <= last_start), 0)) last_start = 0; - __libc_lock_lock (dfa->lock); + lock_lock (dfa->lock); |