[574] in BarnOwl Developers
[D-O-H] r691 - / trunk/owl
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:07:34 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Wed, 28 Mar 2007 22:30:15 -0400 (EDT)
Author: nelhage
Date: 2007-03-28 22:30:15 -0400 (Wed, 28 Mar 2007)
New Revision: 691
Modified:
/
trunk/owl/functions.c
Log:
r20724@phanatique: nelhage | 2007-03-28 22:29:58 -0400
Escape aim users' names in smartfilters.
Property changes on:
___________________________________________________________________
Name: svk:merge
- 6122c8b4-0e12-0410-9533-8bcd7c66c992:/local/dirty-owl-hacks:24493
6aa88b72-b502-0410-8cb4-a5dd0230fb79:/owl-local:1356
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/barnowl:20723
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h:18636
+ 6122c8b4-0e12-0410-9533-8bcd7c66c992:/local/dirty-owl-hacks:24493
6aa88b72-b502-0410-8cb4-a5dd0230fb79:/owl-local:1356
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/barnowl:20724
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h:18636
Modified: trunk/owl/functions.c
===================================================================
--- trunk/owl/functions.c 2007-03-29 02:30:11 UTC (rev 690)
+++ trunk/owl/functions.c 2007-03-29 02:30:15 UTC (rev 691)
@@ -2744,6 +2744,7 @@
{
owl_filter *f;
char *argbuff, *filtname;
+ char *escuser;
/* name for the filter */
filtname=owl_malloc(strlen(user)+40);
@@ -2757,10 +2758,12 @@
/* create the new-internal filter */
f=owl_malloc(sizeof(owl_filter));
+ escuser = owl_text_quote(user, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
+
argbuff=owl_malloc(1000);
sprintf(argbuff,
- "( type ^aim$ and ( ( sender ^%s$ and recipient ^%s$ ) or ( sender ^%s$ and recipient ^%s$ ) ) )",
- user, owl_global_get_aim_screenname(&g), owl_global_get_aim_screenname(&g), user);
+ "( type ^aim$ and ( ( sender ^%s$ and recipient ^%s$ ) or ( sender ^%s$ and recipient ^%s$ ) ) )",
+ escuser, owl_global_get_aim_screenname(&g), owl_global_get_aim_screenname(&g), escuser);
owl_filter_init_fromstring(f, filtname, argbuff);
@@ -2769,6 +2772,7 @@
/* free stuff */
owl_free(argbuff);
+ owl_free(escuser);
return(filtname);
}
