Changeset 41c9a96

Timestamp:

Jul 24, 2009, 12:59:23 AM (15 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>

Files:

• filterelement.c (modified) (1 diff)
• fmtext.c (modified) (4 diffs)
• functions.c (modified) (2 diffs)
• global.c (modified) (2 diffs)
• message.c (modified) (1 diff)
• owl.h (modified) (1 diff)
• regex.c (modified) (3 diffs)

filterelement.c

@@ -61 +61 @@
 {
   char * val = owl_filterelement_get_field(m, fe->field);
-  return !owl_regex_compare(&(fe->re), val);
+  return !owl_regex_compare(&(fe->re), val, NULL, NULL);
 }
 

fmtext.c

@@ -285 +285 @@
   char attr;
   short fg, bg, pair;
-  int search_results, search_len;
   
   if (w==NULL) {
@@ -292 +291 @@
   }
 
-  search_results = (do_search
-                    ? owl_fmtext_search(f, owl_global_get_search_string(&g))
-                    : 0);
-  search_len = (search_results
-                ? strlen(owl_global_get_search_string(&g))
-                : 0);
   s = f->textbuff;
   /* Set default attributes. */
@@ -316 +309 @@
       tmp = p[0];
       p[0] = '\0';
-      if (search_results) {
+      if (owl_global_is_search_active(&g)) {
         /* Search is active, so highlight search results. */
-        char tmp2, *ss;
-        ss = stristr(s, owl_global_get_search_string(&g));
-        while (ss) {
+        char tmp2;
+        int start, end;
+        while (owl_regex_compare(owl_global_get_search_re(&g), s, &start, &end) == 0) {
           /* Found search string, highlight it. */
 
-          tmp2 = ss[0];
-          ss[0] = '\0';
+          tmp2 = s[start];
+          s[start] = '\0';
           waddstr(w, s);
-          ss[0] = tmp2;
+          s[start] = tmp2;
 
           _owl_fmtext_wattrset(w, attr ^ OWL_FMTEXT_ATTR_REVERSE);
           _owl_fmtext_wcolor_set(w, pair);
           
-          tmp2 = ss[search_len];
-          ss[search_len] = '\0';
-          waddstr(w, ss);
-          ss[search_len] = tmp2;
+          tmp2 = s[end];
+          s[end] = '\0';
+          waddstr(w, s + start);
+          s[end] = tmp2;
 
           _owl_fmtext_wattrset(w, attr);
           _owl_fmtext_wcolor_set(w, pair);
 
-          s = ss + search_len;
-          ss = stristr(s, owl_global_get_search_string(&g));
+          s += end;
         }
       }
@@ -563 +555 @@
  *  insensitive search.
  */
-int owl_fmtext_search(owl_fmtext *f, char *string)
-{
-  if (stristr(f->textbuff, string)) return(1);
+int owl_fmtext_search(owl_fmtext *f, owl_regex *re)
+{
+  if (owl_regex_compare(re, f->textbuff, NULL, NULL) == 0) return(1);
   return(0);
 }

functions.c

@@ -2967 +2967 @@
   /* direction is OWL_DIRECTION_DOWNWARDS or OWL_DIRECTION_UPWARDS or
    * OWL_DIRECTION_NONE */
-  owl_global_set_search_string(&g, string);
+  owl_regex re;
+
+  if (string && owl_regex_create_quoted(&re, string) == 0) {
+    owl_global_set_search_re(&g, &re);
+    owl_regex_free(&re);
+  } else {
+    owl_global_set_search_re(&g, NULL);
+  }
 
   if (direction == OWL_DIRECTION_NONE)
@@ -3020 +3027 @@
   for (i=start; i<viewsize && i>=0;) {
     m=owl_view_get_element(v, i);
-    if (owl_message_search(m, owl_global_get_search_string(&g))) {
+    if (owl_message_search(m, owl_global_get_search_re(&g))) {
       owl_global_set_curmsg(&g, i);
       owl_function_calculate_topmsg(direction);

global.c

@@ -65 +65 @@
   owl_fmtext_init_colorpair_mgr(&(g->cpmgr));
   g->debug=OWL_DEBUG;
-  g->searchstring=NULL;
+  owl_regex_init(&g->search_re);
   g->starttime=time(NULL); /* assumes we call init only a start time */
   g->lastinputtime=g->starttime;
@@ -708 +708 @@
 
 int owl_global_is_search_active(owl_global *g) {
-  if (g->searchstring != NULL) return(1);
-  return(0);
-}
-
-void owl_global_set_search_string(owl_global *g, char *string) {
-  if (g->searchstring != NULL) owl_free(g->searchstring);
-  g->searchstring = string ? owl_strdup(string) : NULL;
-}
-
-char *owl_global_get_search_string(owl_global *g) {
-  if (g->searchstring==NULL) return("");
-  return(g->searchstring);
+  if (owl_regex_is_set(&g->search_re)) return(1);
+  return(0);
+}
+
+void owl_global_set_search_re(owl_global *g, owl_regex *re) {
+  if (owl_regex_is_set(&g->search_re)) {
+    owl_regex_free(&g->search_re);
+    owl_regex_init(&g->search_re);
+  }
+  if (re != NULL)
+    owl_regex_copy(re, &g->search_re);
+}
+
+owl_regex *owl_global_get_search_re(owl_global *g) {
+  return &g->search_re;
 }
 

message.c

@@ -673 +673 @@
  * case insensitive because the functions it uses are
  */
-int owl_message_search(owl_message *m, char *string)
+int owl_message_search(owl_message *m, owl_regex *re)
 {
 
   owl_message_format(m); /* is this necessary? */
   
-  return (owl_fmtext_search(&(m->fmtext->fmtext), string));
+  return (owl_fmtext_search(&(m->fmtext->fmtext), re));
 }
 

owl.h

@@ -547 +547 @@
   int newmsgproc_pid;
   int malloced, freed;
-  char *searchstring;
+  owl_regex search_re;
   aim_session_t aimsess;
   aim_conn_t bosconn;

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);
 }