--- src/search.c 2008-12-20 20:56:09.000000000 +0100 +++ src/search.c.oden 2008-12-20 20:56:21.000000000 +0100 @@ -280,6 +280,8 @@ EXECUTE_FCT(EGexecute) char eol = eolbyte; int backref, start, len, best_len; struct kwsmatch kwsm; + static int use_dfa; + static int use_dfa_checked = 0; size_t i, ret_val; #ifdef MBS_SUPPORT int mb_cur_max = MB_CUR_MAX; @@ -287,6 +289,26 @@ EXECUTE_FCT(EGexecute) memset (&mbs, '\0', sizeof (mbstate_t)); #endif /* MBS_SUPPORT */ + if (!use_dfa_checked) + { + char *grep_use_dfa = getenv ("GREP_USE_DFA"); + if (!grep_use_dfa) + { +#ifdef MBS_SUPPORT + /* Turn off DFA when processing multibyte input. */ + use_dfa = (MB_CUR_MAX == 1); +#else + use_dfa = 1; +#endif /* MBS_SUPPORT */ + } + else + { + use_dfa = atoi (grep_use_dfa); + } + + use_dfa_checked = 1; + } + buflim = buf + size; for (beg = end = buf; end < buflim; beg = end) @@ -355,7 +377,8 @@ EXECUTE_FCT(EGexecute) #endif /* MBS_SUPPORT */ (kwsm.index < kwset_exact_matches)) goto success; - if (dfaexec (&dfa, beg, end - beg, &backref) == (size_t) -1) + if (use_dfa && + dfaexec (&dfa, beg, end - beg, &backref) == (size_t) -1) continue; } else @@ -364,7 +387,9 @@ EXECUTE_FCT(EGexecute) #ifdef MBS_SUPPORT size_t bytes_left = 0; #endif /* MBS_SUPPORT */ - size_t offset = dfaexec (&dfa, beg, buflim - beg, &backref); + size_t offset = 0; + if (use_dfa) + offset = dfaexec (&dfa, beg, buflim - beg, &backref); if (offset == (size_t) -1) break; /* Narrow down to the line we've found. */ @@ -406,7 +431,7 @@ EXECUTE_FCT(EGexecute) --beg; } /* Successful, no backreferences encountered! */ - if (!backref) + if (use_dfa && !backref) goto success; } else