Changeset 7a20e4c

Timestamp:

Feb 8, 2007, 4:39:31 PM (16 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

952b1660

Parents:

801b7ac

git-author:

Nelson Elhage <nelhage@mit.edu> (02/01/07 12:03:34)

git-committer:

Nelson Elhage <nelhage@mit.edu> (02/08/07 16:39:31)

Message:

smartnarrowing to an unclass is now the same as narrowing to the
corresponding class. We may want to make this more customizable.

Files:

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

functions.c

@@ -2617 +2617 @@
  * 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;
@@ -2623 +2623 @@
   char *argbuff, *filtname;
   char *tmpclass, *tmpinstance = NULL;
+  char *class, *instance = NULL;
   int len;
+
+  class = owl_util_baseclass(c);
+  if(i) {
+    instance = owl_util_baseclass(i);
+  }
 
   fl=owl_global_get_filterlist(&g);

util.c

@@ -737 +737 @@
 }
 
+/* Return the base class or instance from a zephyr class, by removing
+   leading `un' or trailing `.d'.
+   Modified ``class'' in place, and does not allocate memory.
+*/
+char * owl_util_baseclass(char * class)
+{
+  char * end;
+  while(!strncmp(class, "un", 2)) {
+    class += 2;
+  }
+  end = class + strlen(class) - 1;
+  while(*end == 'd' && *(end-1) == '.') {
+    end -= 2;
+  }
+  *(end + 1) = 0;
+  return class;
+}
+
 /**************************************************************************/
 /************************* REGRESSION TESTS *******************************/