Changeset 41c9a96 for global.c

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>

File:

• global.c (modified) (2 diffs)

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