summaryrefslogtreecommitdiff
path: root/lib/rx.c
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>1995-12-15 15:12:58 +0000
committerJim Meyering <jim@meyering.net>1995-12-15 15:12:58 +0000
commit2ab1921d24b571b2299ae08d6bd7cef2dfe09ab6 (patch)
tree8da09cbaa6dba394816b089d02eff8819fe31bda /lib/rx.c
parent1c2d713caba7bab84976b77397a2f8f1b56679cf (diff)
downloadcoreutils-2ab1921d24b571b2299ae08d6bd7cef2dfe09ab6.tar.xz
Update from latest.
Diffstat (limited to 'lib/rx.c')
-rw-r--r--lib/rx.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/lib/rx.c b/lib/rx.c
index 1b94dbf66..54ae3b7f4 100644
--- a/lib/rx.c
+++ b/lib/rx.c
@@ -30,12 +30,8 @@ write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA
#define _GNU_SOURCE
#endif
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-char rx_version_string[] = "GNU Rx version 0.07.1";
+const char *rx_version_string = "GNU Rx version 0.07.2";
/* ``Too hard!''
* -- anon.
@@ -123,6 +119,8 @@ char *alloca ();
extern char *re_syntax_table;
#else /* not SYNTAX_TABLE */
+RX_DECL char re_syntax_table[CHAR_SET_SIZE];
+
#ifdef __STDC__
static void
init_syntax_once (void)
@@ -3672,7 +3670,8 @@ compute_super_edge (rx, dfout, csetout, superstate, chr)
{
struct rx_distinct_future * df;
df = saved;
- df->next_same_super_edge[1]->next_same_super_edge[0] = 0;
+ if (df)
+ df->next_same_super_edge[1]->next_same_super_edge[0] = 0;
while (df)
{
struct rx_distinct_future *dft;
@@ -6250,9 +6249,9 @@ rx_blow_up_fastmap (rxb)
struct re_search_2_closure
{
- __const__ char * string1;
+ __const__ unsigned char * string1;
int size1;
- __const__ char * string2;
+ __const__ unsigned char * string2;
int size2;
};
@@ -6395,7 +6394,7 @@ re_search_2_fetch_char (pos, offset, app_closure, stop)
return *pos->pos;
else
{
- if ( (pos->string == (__const__ unsigned char *) closure->string2)
+ if ( (pos->string == closure->string2)
&& (closure->string1)
&& (closure->size1))
return closure->string1[closure->size1 - 1];
@@ -6882,6 +6881,7 @@ re_comp (s)
/* Match anchors at newlines. */
rx_comp_buf.newline_anchor = 1;
+ rx_comp_buf.fastmap_accurate = 0;
rx_comp_buf.re_nsub = 0;
rx_comp_buf.start = 0;
rx_comp_buf.se_params = 0;
@@ -6891,6 +6891,7 @@ re_comp (s)
rx_comp_buf.rx.nfa_states = 0;
rx_comp_buf.rx.start = 0;
rx_comp_buf.rx.se_list_cmp = posix_se_list_order;
+ rx_comp_buf.rx.start_set = 0;
rx_comp_buf.rx.local_cset_size = 256;
ret = rx_compile (s, strlen (s), re_syntax_options, &rx_comp_buf);