Changeset 5bb6c21

Timestamp:

Jun 27, 2003, 9:16:44 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:

dff8d8a

Parents:

1d3e925

Message:

Fixed bug that caused a crash on zpunt with '*' for an instance

Files:

• ChangeLog (modified) (1 diff)
• functions.c (modified) (2 diffs)

ChangeLog

@@ -7 +7 @@
         Special cased replies for webzephyr users on classes and
           login notifications for webzephyr users
+        Fixed bug that caused a crash on zpunt with '*' for an instance
         
 2.0.4

functions.c

@@ -2584 +2584 @@
 }
 
+/* add the given class, inst, recip to the punt list for filtering.
+ *   if direction==0 then punt
+ *   if direction==1 then unpunt
+ */
 void owl_function_zpunt(char *class, char *inst, char *recip, int direction)
 {
-  /* add the given class, inst, recip to the punt list for filtering.
-   *   if direction==0 then punt
-   *   if direction==1 then unpunt */
   owl_filter *f;
   owl_list *fl;
@@ -2599 +2600 @@
   f=malloc(sizeof(owl_filter));
   buff=malloc(strlen(class)+strlen(inst)+strlen(recip)+100);
-  if (!strcmp(recip, "*")) {
-    sprintf(buff, "class ^%s$ and instance ^%s$", class, inst);
+  strcpy(buff, "class");
+  if (!strcmp(class, "*")) {
+    strcat(buff, " .*");
   } else {
-    sprintf(buff, "class ^%s$ and instance ^%s$ and recipient %s", class, inst, recip);
-  }
+    sprintf(buff, "%s ^%s$", buff, class);
+  }
+  if (!strcmp(inst, "*")) {
+    strcat(buff, " and instance .*");
+  } else {
+    sprintf(buff, "%s and instance ^%s$", buff, inst);
+  }
+  if (strcmp(recip, "*")) {
+    sprintf(buff, "%s and recipient ^%s$", buff, recip);
+  }
+  
   owl_function_debugmsg("About to filter %s", buff);
   ret=owl_filter_init_fromstring(f, "punt-filter", buff);