Changeset 0fbd3a6d for nick.c

Timestamp:

2007-12-19T00:24:32Z (17 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

1ba7e8f

Parents:

793cc25 (diff), 2379566 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Now with sending via a proxy. The proxy is automatically discovered from your
jabber server.

Also merged in revs 279..288 from upstream (e.g. PING)

File:

• nick.c (modified) (3 diffs)

nick.c

@@ -154 +154 @@
    With one difference, we allow dashes. */
 
-static char *nick_lc_chars = "0123456789abcdefghijklmnopqrstuvwxyz{}^-_|";
-static char *nick_uc_chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ[]~-_\\";
-
-void nick_strip( char * nick )
+static char *nick_lc_chars = "0123456789abcdefghijklmnopqrstuvwxyz{}^`-_|";
+static char *nick_uc_chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ[]~`-_\\";
+
+void nick_strip( char *nick )
 {
         int i, j;
@@ -170 +170 @@
                 }
         }
+        if( isdigit( nick[0] ) )
+        {
+                char *orig;
+                
+                orig = g_strdup( nick );
+                g_snprintf( nick, MAX_NICK_LENGTH, "_%s", orig );
+                g_free( orig );
+                j ++;
+        }
         while( j <= MAX_NICK_LENGTH )
                 nick[j++] = '\0';
@@ -178 +187 @@
         const char *s;
         
-        /* Empty/long nicks are not allowed */
-        if( !*nick || strlen( nick ) > MAX_NICK_LENGTH )
+        /* Empty/long nicks are not allowed, nor numbers at [0] */
+        if( !*nick || isdigit( nick[0] ) || strlen( nick ) > MAX_NICK_LENGTH )
                 return( 0 );