Changeset bb09b3c for lib

Timestamp:

2010-06-03T21:13:57Z (14 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

1dd3470

Parents:

a6b2f13 (diff), df1ae622 (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:

merge in bitlbee 1.2.7

Location:

lib

Files:

• Makefile (modified) (1 diff)
• misc.c (modified) (1 diff)
• oauth.c (added)
• oauth.h (added)
• url.c (modified) (1 diff)
• url.h (modified) (1 diff)
• xmltree.c (modified) (3 diffs)

lib/Makefile

@@ -10 +10 @@
 
 # [SH] Program variables
-objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o
+objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o oauth.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o
 
 CFLAGS += -Wall

lib/misc.c

@@ -316 +316 @@
         for( i = j = 0; t[i]; i ++, j ++ )
         {
-                /* if( t[i] <= ' ' || ((unsigned char *)t)[i] >= 128 || t[i] == '%' ) */
-                if( !isalnum( t[i] ) )
+                if( !isalnum( t[i] ) && !strchr( "._-~", t[i] ) )
                 {
                         sprintf( s + j, "%%%02X", ((unsigned char*)t)[i] );

lib/url.c

@@ -27 +27 @@
 
 /* Convert an URL to a url_t structure */
-int url_set( url_t *url, char *set_url )
+int url_set( url_t *url, const char *set_url )
 {
         char s[MAX_STRING+1];

lib/url.h

@@ -42 +42 @@
 } url_t;
 
-int url_set( url_t *url, char *set_url );
+int url_set( url_t *url, const char *set_url );

lib/xmltree.c

@@ -449 +449 @@
         while( node )
         {
-                if( g_strcasecmp( node->name, name ) == 0 )
+                char *colon;
+                
+                if( g_strcasecmp( node->name, name ) == 0 ||
+                    ( ( colon = strchr( node->name, ':' ) ) &&
+                      g_strcasecmp( colon + 1, name ) == 0 ) )
                         break;
                 
@@ -461 +465 @@
 {
         int i;
+        char *colon;
         
         if( !node )
@@ -468 +473 @@
                 if( g_strcasecmp( node->attr[i].key, key ) == 0 )
                         break;
+        
+        /* This is an awful hack that only takes care of namespace prefixes
+           inside a tag. Since IMHO excessive namespace usage in XMPP is
+           massive overkill anyway (this code exists for almost four years
+           now and never really missed it): Meh. */
+        if( !node->attr[i].key && strcmp( key, "xmlns" ) == 0 &&
+            ( colon = strchr( node->name, ':' ) ) )
+        {
+                *colon = '\0';
+                for( i = 0; node->attr[i].key; i ++ )
+                        if( strncmp( node->attr[i].key, "xmlns:", 6 ) == 0 &&
+                            strcmp( node->attr[i].key + 6, node->name ) == 0 )
+                                break;
+                *colon = ':';
+        }
         
         return node->attr[i].value;