Changeset d2ba33c for perl/lib/BarnOwl/Message/Zephyr.pm

Timestamp:

Aug 16, 2017, 12:53:41 PM (7 years ago)

Author:

Jason Gross <jasongross9@gmail.com>

Branches:

master

Children:

5dee79a

Parents:

47225c9

git-author:

Jason Gross <jgross@mit.edu> (01/01/14 20:59:51)

git-committer:

Jason Gross <jasongross9@gmail.com> (08/16/17 12:53:41)

Message:

Use g_utf8_casefold and g_utf8_normalize

We define a convenience function compat_casefold in util.c for reuse in
filters.

File:

• perl/lib/BarnOwl/Message/Zephyr.pm (modified) (3 diffs)

perl/lib/BarnOwl/Message/Zephyr.pm

@@ -9 +9 @@
 
 use base qw( BarnOwl::Message );
-use Unicode::Normalize qw( NFKC );
 
 sub strip_realm {
@@ -22 +21 @@
     my ($user, $realm) = split(/@/,$principal);
     return $realm;
+}
+
+sub casefold_principal {
+    my $principal = shift;
+    # split the principal right after the final @, without eating any
+    # characters; this way, we always get at least '@' in $user
+    my ($user, $realm) = split(/(?<=@)(?=[^@]+$)/, $principal);
+    return lc($user) . uc($realm);
 }
 
@@ -261 +268 @@
             my $realm = '';
             $realm .= '@' . $m->realm if $m->realm ne BarnOwl::zephyr_getrealm();
-            return (lc(NFKC($m->class)) . $realm);
+            return (BarnOwl::compat_casefold($m->class) . uc($realm));
         }
     } else {
         push @filenames, $m->recipient;
     }
-    return map { lc(NFKC(BarnOwl::zephyr_smartstrip_user(strip_realm($_)))) } @filenames;
+    return map { casefold_principal(BarnOwl::zephyr_smartstrip_user(strip_realm($_))) } @filenames;
 }