Changeset 7e84168

Timestamp:

2013-06-22T21:50:15Z (11 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ea166fe

Parents:

2f9027c

Message:

#1067: Restore nickname truncation.

File:

• nick.c (modified) (3 diffs)

nick.c

@@ -120 +120 @@
         while( fmt && *fmt && ret->len < MAX_NICK_LENGTH )
         {
-                char *part = NULL, chop = '\0', *asc = NULL;
+                char *part = NULL, chop = '\0', *asc = NULL, *s;
+                int len = INT_MAX;
                 
                 if( *fmt != '%' )
@@ -143 +144 @@
                                 fmt += 2;
                         }
+                        else if( isdigit( *fmt ) )
+                        {
+                                len = 0;
+                                /* Grab a number. */
+                                while( isdigit( *fmt ) )
+                                        len = len * 10 + ( *(fmt++) - '0' );
+                        }
                         else if( g_strncasecmp( fmt, "nick", 4 ) == 0 )
                         {
@@ -202 +210 @@
                                                               "UTF-8", "", NULL, NULL, NULL );
                 
+                if( chop && ( s = strchr( part, chop ) ) )
+                        len = MIN( len, s - part );
+                
                 if( part )
-                        g_string_append( ret, part );
+                {
+                        if( len < INT_MAX )
+                                g_string_append_len( ret, part, len );
+                        else
+                                g_string_append( ret, part );
+                }
                 g_free( asc );
         }