Changes in url.c [6fda350:b7d3cc34]

File:

• url.c (modified) (6 diffs)

url.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2001-2005 Wilmer van der Gaast and others                *
+  * Copyright 2001-2004 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -30 +30 @@
 {
         char s[MAX_STRING];
-        char *i;
+        char *i, *j;
         
         /* protocol://                                                  */
@@ -42 +42 @@
                 if( g_strncasecmp( set_url, "http", i - set_url ) == 0 )
                         url->proto = PROTO_HTTP;
-                else if( g_strncasecmp( set_url, "https", i - set_url ) == 0 )
-                        url->proto = PROTO_HTTPS;
                 else if( g_strncasecmp( set_url, "socks4", i - set_url ) == 0 )
                         url->proto = PROTO_SOCKS4;
@@ -58 +56 @@
         if( ( i = strchr( s, '/' ) ) == NULL )
         {
-                strcpy( url->file, "/" );
+                strcpy( url->dir, "/" );
         }
         else
         {
-                strncpy( url->file, i, MAX_STRING );
                 *i = 0;
+                g_snprintf( url->dir, MAX_STRING, "/%s", i + 1 );
+                if( url->proto == PROTO_HTTP )
+                        http_encode( url->dir );
         }
         strncpy( url->host, s, MAX_STRING );
+        j = strchr( url->dir, '?' );
+        if( j != NULL )
+                *j = 0;
+        i = strrchr( url->dir, '/' );
+        *i = 0;
+        if( j != NULL )
+                *j = '?';
+        if( i == NULL )
+        {
+                strcpy( url->file, url->dir );
+                strcpy( url->dir, "/" );
+        }
+        else
+        {
+                strcpy( url->file, i + 1 );
+                strcat( url->dir, "/" );
+        }
         
         /* Check for username in host field                             */
@@ -79 +96 @@
         else
         {
-                *url->user = *url->pass = 0;
+                if( url->proto == PROTO_FTP )
+                {
+                        strcpy( url->user, "anonymous" );
+                        strcpy( url->pass, "-p.artmaps@lintux.cx" );
+                }
+                else
+                {
+                        *url->user = *url->pass = 0;
+                }
         }
         
@@ -92 +117 @@
         {
                 *i = 0;
-                sscanf( i + 1, "%d", &url->port );
+                sscanf( i + 1, "%i", &url->port );
         }
+        /* Take default port numbers from /etc/services                 */
         else
         {
                 if( url->proto == PROTO_HTTP )
-                        url->port = 80;
-                else if( url->proto == PROTO_HTTPS )
-                        url->port = 443;
+                        url->port = 8080;
                 else if( url->proto == PROTO_SOCKS4 || url->proto == PROTO_SOCKS4 )
                         url->port = 1080;