Changeset 4cff28f

Timestamp:

2015-01-16T19:50:24Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

fed4f76

Parents:

840394e

Message:

Add jabber_normalize_ext() to fix case sensitivity issues with ext jids

Also refactor jabber_normalize() to be UTF8 aware.

See trac ticket 1106 for more details

File:

• protocols/jabber/jabber_util.c (modified) (2 diffs)

protocols/jabber/jabber_util.c

@@ -330 +330 @@
 }
 
-/* Returns a new string. Don't leak it! */
+/* The /resource part is case sensitive. This stops once we see a slash.
+   Returns a new string. Don't leak it! */
 char *jabber_normalize( const char *orig )
 {
-        int len, i;
-        char *new;
-        
-        len = strlen( orig );
-        new = g_new( char, len + 1 );
-        
-        /* So it turns out the /resource part is case sensitive. Yeah, and
-           it's Unicode but feck Unicode. :-P So stop once we see a slash. */
-        for( i = 0; i < len && orig[i] != '/' ; i ++ )
-                new[i] = g_ascii_tolower( orig[i] );
-        for( ; orig[i]; i ++ )
-                new[i] = orig[i];
-        
-        new[i] = 0;
+        char *lower, *new, *s;
+
+        if ( ! ( s = strchr( orig, '/' ) ) )
+                return g_utf8_strdown( orig, -1 );
+
+        lower = g_utf8_strdown( orig, (s - orig) );  /* stop in s */
+        new = g_strconcat( lower, s, NULL );
+        g_free( lower );
+        return new;
+}
+
+/* Similar to jabber_normalize, but works with addresses in the form
+ * resource=chatroom@example.com */
+char *jabber_normalize_ext( const char *orig )
+{
+        char *lower, *new, *s;
+
+        if ( ! ( s = strchr( orig, '=' ) ) )
+                return g_utf8_strdown( orig, -1 );
+
+        lower = g_utf8_strdown( s, -1 ); /* start in s */
+
+        *s = 0;
+        new = g_strconcat( orig, lower, NULL );
+        *s = '=';
+
+        g_free( lower );
         return new;
 }
@@ -556 +570 @@
         char *s, *jid;
         
-        jid = jabber_normalize( jid_ );
+        jid = jabber_normalize_ext( jid_ );
         
         if( ( s = strchr( jid, '=' ) ) == NULL )