PATCH: pattern matching should be interruptible

[Bart Schaefer <schaefer@brasslantern.com>]

On Mar 18,  2:42pm, Bart Schaefer wrote:
}
} You could also try something with the (#a) glob qualifier (approximate
} matching) but it's VERY expensive for strings as long as some of your
} example file names and is entirely impossible to interrupt once it is
} started ("kill -9" territory).

It has been noted before that it is annoying that one cannot interrupt
pattern matching.  Does this fix it?  Are there places inside the "we
were lazy" if-block that need queue_signals/unqueue_signals wrapping?


diff --git a/Src/pattern.c b/Src/pattern.c
index b79c3b4..94a299e 100644
--- a/Src/pattern.c
+++ b/Src/pattern.c
@@ -2223,6 +2223,8 @@ pattryrefs(Patprog prog, char *string, int stringlen, int unmetalen,
 
 	return ret;
     } else {
+	int q = queue_signal_level();
+
 	/*
 	 * Test for a `must match' string, unless we're scanning for a match
 	 * in which case we don't need to do this each time.
@@ -2270,6 +2272,8 @@ pattryrefs(Patprog prog, char *string, int stringlen, int unmetalen,
 
 	patinput = patinstart;
 
+	dont_queue_signals();
+
 	if (patmatch((Upat)progstr)) {
 	    /*
 	     * we were lazy and didn't save the globflags if an exclusion
@@ -2406,6 +2410,8 @@ pattryrefs(Patprog prog, char *string, int stringlen, int unmetalen,
 	} else
 	    ret = 0;
 
+	restore_queue_signals(q);
+
 	if (tryalloced)
 	    zfree(tryalloced, unmetalen + unmetalenp);
 
@@ -2485,7 +2491,7 @@ patmatch(Upat prog)
     zrange_t from, to, comp;
     patint_t nextch;
 
-    while  (scan) {
+    while  (scan && !errflag) {
 	next = PATNEXT(scan);
 
 	if (!globdots && P_NOTDOT(scan) && patinput == patinstart &&