Changeset bc08664 for functions.c

Timestamp:

Oct 26, 2003, 4:11:37 PM (21 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

995eb4b

Parents:

e3d9c77

Message:

zpunt now works wtih weird regex characters
	CVS: ----------------------------------------------------------------------

File:

• functions.c (modified) (4 diffs)

functions.c

@@ -2660 +2660 @@
   }
 
-  mclass = owl_message_get_class(m);
-  minst = owl_message_get_instance(m);
+  mclass = owl_text_quote(owl_message_get_class(m), OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
+  minst = owl_text_quote(owl_message_get_instance(m), OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
   if (!mclass || !*mclass || *mclass==' '
       || (!strcasecmp(mclass, "message") && !strcasecmp(minst, "personal"))
@@ -2681 +2681 @@
     owl_free(cmd);
   }
+  owl_free(mclass);
+  owl_free(minst);
 }
 
@@ -2734 +2736 @@
   owl_list *fl;
   char *buff;
+  char *quoted;
   int ret, i, j;
 
@@ -2745 +2748 @@
     strcat(buff, " .*");
   } else {
-    sprintf(buff, "%s ^%s$", buff, class);
+    quoted=owl_text_quote(class, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
+    sprintf(buff, "%s ^%s$", buff, quoted);
+    owl_free(quoted);
   }
   if (!strcmp(inst, "*")) {
     strcat(buff, " and instance .*");
   } else {
-    sprintf(buff, "%s and instance ^%s$", buff, inst);
+    quoted=owl_text_quote(inst, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
+    sprintf(buff, "%s and instance ^%s$", buff, quoted);
+    owl_free(quoted);
   }
   if (strcmp(recip, "*")) {
-    sprintf(buff, "%s and recipient ^%s$", buff, recip);
+    quoted=owl_text_quote(recip, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
+    sprintf(buff, "%s and recipient ^%s$", buff, quoted);
+    owl_free(quoted);
   }