Changeset 41c9a96 for regex.c

Timestamp:

Jul 24, 2009, 12:59:23 AM (16 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

64c9165

Parents:

ab225e0

git-author:

Anders Kaseorg <andersk@mit.edu> (07/24/09 00:51:10)

git-committer:

Anders Kaseorg <andersk@mit.edu> (07/24/09 00:59:23)

Message:

Reimplement search in terms of owl_regex.

The current implementation of stristr has problems and there isn’t a
good replacement available.  This was its only caller, so we can get
rid of it now.

Also, this will make it possible to search with arbitrary regexes if
someone feels like coming up with a syntax.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

File:

• regex.c (modified) (3 diffs)

regex.c

@@ -46 +46 @@
 }
 
-int owl_regex_compare(owl_regex *re, char *string)
+int owl_regex_compare(owl_regex *re, char *string, int *start, int *end)
 {
   int out, ret;
+  regmatch_t match;
 
   /* if the regex is not set we match */
@@ -55 +56 @@
   }
   
-  ret=regexec(&(re->re), string, 0, NULL, 0);
+  ret=regexec(&(re->re), string, 1, &match, 0);
   out=ret;
   if (re->negate) {
     out=!out;
+    match.rm_so = 0;
+    match.rm_eo = strlen(string);
   }
+  if (start != NULL) *start = match.rm_so;
+  if (end != NULL) *end = match.rm_eo;
   return(out);
 }
@@ -76 +81 @@
 void owl_regex_copy(owl_regex *a, owl_regex *b)
 {
-  b->negate=a->negate;
-  b->string=owl_strdup(a->string);
-  memcpy(&(b->re), &(a->re), sizeof(regex_t));
+  owl_regex_create(b, a->string);
 }