Changeset f924563 for lib

Timestamp:

2010-05-03T00:52:08Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1a3ba05

Parents:

6a9d068 (diff), 6824fb3 (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:

Mainline merge.

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)

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 ftutil.o
+objects = arc.o base64.o $(EVENT_HANDLER) ftutil.o 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

@@ -306 +306 @@
         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 );