Changeset ed2412d

Timestamp:

Feb 21, 2003, 11:30:23 AM (22 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:

2e6d137

Parents:

7933748

Message:

Made M-n work on classes and instances with spaces in them

Files:

• ChangeLog (modified) (1 diff)
• functions.c (modified) (5 diffs)
• util.c (modified) (1 diff)

ChangeLog

@@ -27 +27 @@
         Added a 'loadsubs' command to eventually phase out the 'load-subs'
           command
+        Made M-n work on classes and instances with spaces in them
 
 1.2.8

functions.c

@@ -1965 +1965 @@
   owl_filter *f;
   char *argbuff, *filtname;
+  char *tmpclass, *tmpinstance;
   int len;
 
@@ -1978 +1979 @@
     sprintf(filtname, "class-%s-instance-%s", class, instance);
   }
+  /* downcase it */
   downstr(filtname);
-
+  /* turn spaces into hyphens */
+  owl_util_tr(filtname, ' ', '.');
+  
   /* if it already exists then go with it.  This lets users override */
   if (owl_global_get_filter(&g, filtname)) {
-    return filtname;
+    return(filtname);
   }
 
   /* create the new filter */
   argbuff=owl_malloc(len+20);
-  sprintf(argbuff, "( class ^%s$ )", class);
+  tmpclass=owl_strdup(class);
+  owl_util_tr(tmpclass, ' ', '.');
   if (instance) {
-    sprintf(argbuff, "%s and ( instance ^%s$ )", argbuff, instance);
-  }
+    tmpinstance=owl_strdup(instance);
+    owl_util_tr(tmpinstance, ' ', '.');
+  }
+  sprintf(argbuff, "( class ^%s$ )", tmpclass);
+  if (instance) {
+    sprintf(argbuff, "%s and ( instance ^%s$ )", argbuff, tmpinstance);
+  }
+  owl_free(tmpclass);
+  if (instance) owl_free(tmpinstance);
 
   f=owl_malloc(sizeof(owl_filter));
@@ -1999 +2011 @@
 
   owl_free(argbuff);
-  return filtname;
+  return(filtname);
 }
 
@@ -2016 +2028 @@
   /* if it already exists then go with it.  This lets users override */
   if (owl_global_get_filter(&g, filtname)) {
-    return filtname;
+    return(filtname);
   }
 
@@ -2037 +2049 @@
   owl_free(shortuser);
 
-  return filtname;
+  return(filtname);
 }
 

util.c

@@ -507 +507 @@
 }
 
+void owl_util_tr(char *buff, char a, char b) {
+  /* replace all instances of character a in buff with the character
+     b.  buff must be null terminated */
+  int i;
+
+  owl_function_debugmsg("In: %s", buff);
+  for (i=0; buff[i]!='\0'; i++) {
+    if (buff[i]==a) buff[i]=b;
+  }
+  owl_function_debugmsg("Out: %s", buff);
+}
 
 int owl_util_string_to_color(char *color) {