Changeset 811644f

Timestamp:

Oct 23, 2010, 1:14:08 AM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

c38bfe0

Parents:

12a6616

git-author:

David Benjamin <davidben@mit.edu> (10/19/10 17:09:28)

git-committer:

David Benjamin <davidben@mit.edu> (10/23/10 01:14:08)

Message:

Correctly narrow on personals from realm-less senders

Fixes bug #38. Also, avoid leaking shortuser when the filter already
exists.

File:

• functions.c (modified) (4 diffs)

functions.c

@@ -2355 +2355 @@
 /* Create a filter for personal zephyrs to or from the specified
  * zephyr user.  Includes login/logout notifications for the user.
- * The name of the filter will be 'user-<user>'.  If a filter already
+ * The name of the filter will be 'user-<shortuser>'.  If a filter already
  * exists with this name, no new filter will be created.  This allows
  * the configuration to override this function.  Returns the name of
  * the filter, which the caller must free.
  */
-char *owl_function_zuserfilt(const char *user)
+char *owl_function_zuserfilt(const char *longuser)
 {
   owl_filter *f;
-  char *argbuff, *longuser, *esclonguser, *shortuser, *filtname;
-
-  /* stick the local realm on if it's not there */
-  longuser=long_zuser(user);
-  shortuser=short_zuser(user);
+  char *argbuff, *esclonguser, *shortuser, *filtname;
 
   /* name for the filter */
-  filtname=owl_sprintf("user-%s", shortuser);
+  shortuser = short_zuser(longuser);
+  filtname = owl_sprintf("user-%s", shortuser);
+  owl_free(shortuser);
 
   /* if it already exists then go with it.  This lets users override */
@@ -2392 +2390 @@
   /* free stuff */
   owl_free(argbuff);
-  owl_free(longuser);
   owl_free(esclonguser);
-  owl_free(shortuser);
 
   return(filtname);
@@ -2537 +2533 @@
   const owl_view *v;
   const owl_message *m;
-  char *zperson, *filtname=NULL;
-  const char *argv[2];
+  char *filtname = NULL;
+  const char *argv[2], *zperson;
   int related = owl_global_is_narrow_related(&g) ^ invert_related;
 
@@ -2577 +2573 @@
 
       if (owl_message_is_direction_in(m)) {
-        zperson=short_zuser(owl_message_get_sender(m));
+        zperson = owl_message_get_sender(m);
       } else {
-        zperson=short_zuser(owl_message_get_recipient(m));
+        zperson = owl_message_get_recipient(m);
       }
-      filtname=owl_function_zuserfilt(zperson);
-      owl_free(zperson);
-      return(filtname);
+      filtname = owl_function_zuserfilt(zperson);
+      return filtname;
     }