Changeset 2f01162 for functions.c

Timestamp:

Mar 29, 2009, 3:08:14 PM (15 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

owl

Children:

a0bde15

Parents:

2ace81e

Message:

new classinstfilt that uses ^(un)*%s(\\.d) style matching

File:

• functions.c (modified) (5 diffs)

functions.c

@@ -2488 +2488 @@
  * name of the filter, which the caller must free.
  */
-char *owl_function_classinstfilt(char *class, char *instance) 
+char *owl_function_classinstfilt(char *c, char *i) 
 {
   owl_list *fl;
@@ -2494 +2494 @@
   char *argbuff, *filtname;
   char *tmpclass, *tmpinstance = NULL;
-  int len;
+  char *class, *instance = NULL;
+
+  class = owl_util_baseclass(c);
+  if(i) {
+    instance = owl_util_baseclass(i);
+  }
 
   fl=owl_global_get_filterlist(&g);
 
   /* name for the filter */
-  len=strlen(class)+30;
-  if (instance) len+=strlen(instance);
-  filtname=owl_malloc(len);
   if (!instance) {
-    sprintf(filtname, "class-%s", class);
-  } else {
-    sprintf(filtname, "class-%s-instance-%s", class, instance);
+    filtname = owl_sprintf("class-%s", class);
+  } else {
+    filtname = owl_sprintf("class-%s-instance-%s", class, instance);
   }
   /* downcase it */
-  downstr(filtname);
+  {
+    char *temp = g_utf8_strdown(filtname, -1);
+    if (temp) {
+      owl_free(filtname);
+      filtname = temp;
+    }
+  }
   /* turn spaces, single quotes, and double quotes into dots */
   owl_text_tr(filtname, ' ', '.');
@@ -2520 +2528 @@
 
   /* create the new filter */
-  argbuff=owl_malloc(len+20);
   tmpclass=owl_text_quote(class, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
   owl_text_tr(tmpclass, ' ', '.');
@@ -2531 +2538 @@
     owl_text_tr(tmpinstance, '"', '.');
   }
-  sprintf(argbuff, "( class ^%s$ )", tmpclass);
+
+  argbuff = owl_sprintf("class ^(un)*%s(\\.d)*$", tmpclass);
   if (tmpinstance) {
-    sprintf(argbuff, "%s and ( instance ^%s$ )", argbuff, tmpinstance);
+    char *tmp = argbuff;
+    argbuff = owl_sprintf("%s and ( instance ^(un)*%s(\\.d)*$ )", tmp, tmpinstance);
+    owl_free(tmp);
   }
   owl_free(tmpclass);
@@ -2545 +2555 @@
 
   owl_free(argbuff);
+  owl_free(class);
+  if (instance) {
+    owl_free(instance);
+  }
   return(filtname);
 }