annotate stream/url.c @ 36084:64825e4a3fed

Remove pointless code. The URL dialog widget will be destroyed after a selection has been made, and urlEntries will be freed and rebuilt every time the URL dialog widget is created (newly). So it makes no sense to prepend any data to the GList that never will be used.
author ib
date Mon, 29 Apr 2013 11:21:23 +0000
parents 389d43c448b3
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3496
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
1 /*
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 869
diff changeset
2 * URL Helper
30426
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
3 *
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
4 * Copyright (C) 2001 Bertrand Baudet <bertrand_baudet@yahoo.com>
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
5 *
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
6 * This file is part of MPlayer.
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 869
diff changeset
7 *
30426
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
8 * MPlayer is free software; you can redistribute it and/or modify
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
9 * it under the terms of the GNU General Public License as published by
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
10 * the Free Software Foundation; either version 2 of the License, or
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
11 * (at your option) any later version.
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
12 *
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
13 * MPlayer is distributed in the hope that it will be useful,
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
16 * GNU General Public License for more details.
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
17 *
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
18 * You should have received a copy of the GNU General Public License along
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
19 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
ce0122361a39 Add license header to all files missing it in the stream subdirectory.
diego
parents: 29263
diff changeset
20 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 869
diff changeset
21 */
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 869
diff changeset
22
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
23 #include <string.h>
35903
389d43c448b3 Add missing strings.h #includes for strcasecmp().
diego
parents: 35369
diff changeset
24 #include <strings.h>
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
25 #include <stdlib.h>
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
26 #include <stdio.h>
12391
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
27 #include <ctype.h>
18558
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 17048
diff changeset
28 #include <inttypes.h>
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
29
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
30 #include "url.h"
5933
14b46420840b printf to mp_msg
albeu
parents: 4653
diff changeset
31 #include "mp_msg.h"
32884
0d95f044c589 Use mp_asprintf in make_noauth_url and make_http_proxy_url.
cboesch
parents: 32746
diff changeset
32 #include "mp_strings.h"
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16421
diff changeset
33 #include "help_mp.h"
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
34
18671
8fb542b97815 Protect SIZE_MAX use
rtogni
parents: 18558
diff changeset
35 #ifndef SIZE_MAX
8fb542b97815 Protect SIZE_MAX use
rtogni
parents: 18558
diff changeset
36 #define SIZE_MAX ((size_t)-1)
8fb542b97815 Protect SIZE_MAX use
rtogni
parents: 18558
diff changeset
37 #endif
8fb542b97815 Protect SIZE_MAX use
rtogni
parents: 18558
diff changeset
38
35113
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
39 static int is_proxy(const URL_t *url) {
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
40 return !strcasecmp(url->protocol, "http_proxy") && url->file && strstr(url->file, "://");
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
41 }
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
42
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
43 int url_is_protocol(const URL_t *url, const char *proto) {
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
44 int proxy = is_proxy(url);
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
45 if (proxy) {
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
46 URL_t *tmp = url_new(url->file + 1);
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
47 int res = !strcasecmp(tmp->protocol, proto);
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
48 url_free(tmp);
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
49 return res;
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
50 }
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
51 return !strcasecmp(url->protocol, proto);
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
52 }
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
53
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
54 void url_set_protocol(URL_t *url, const char *proto) {
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
55 int proxy = is_proxy(url);
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
56 if (proxy) {
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
57 char *dst = url->file + 1;
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
58 int oldlen = strstr(dst, "://") - dst;
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
59 int newlen = strlen(proto);
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
60 if (newlen != oldlen) {
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
61 mp_msg(MSGT_NETWORK, MSGL_ERR, "Setting protocol not implemented!\n");
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
62 return;
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
63 }
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
64 memcpy(dst, proto, newlen);
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
65 return;
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
66 }
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
67 free(url->protocol);
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
68 url->protocol = strdup(proto);
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
69 }
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
70
20784
720206eef78b Support URL redirections that do not specify full URL.
reimar
parents: 19271
diff changeset
71 URL_t *url_redirect(URL_t **url, const char *redir) {
720206eef78b Support URL redirections that do not specify full URL.
reimar
parents: 19271
diff changeset
72 URL_t *u = *url;
35113
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
73 int proxy = is_proxy(u);
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
74 const char *oldurl = proxy ? u->file + 1 : u->url;
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
75 const char *newurl = redir;
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
76 char *buffer = NULL;
20784
720206eef78b Support URL redirections that do not specify full URL.
reimar
parents: 19271
diff changeset
77 URL_t *res;
21125
4aff19cc00bb Also support absolute url redirection, e.g. http://www.youtube.com/v/buKaqRG2SFA
reimar
parents: 20784
diff changeset
78 if (!strchr(redir, '/') || *redir == '/') {
20784
720206eef78b Support URL redirections that do not specify full URL.
reimar
parents: 19271
diff changeset
79 char *tmp;
35113
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
80 newurl = buffer = malloc(strlen(oldurl) + strlen(redir) + 1);
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
81 strcpy(buffer, oldurl);
21125
4aff19cc00bb Also support absolute url redirection, e.g. http://www.youtube.com/v/buKaqRG2SFA
reimar
parents: 20784
diff changeset
82 if (*redir == '/') {
4aff19cc00bb Also support absolute url redirection, e.g. http://www.youtube.com/v/buKaqRG2SFA
reimar
parents: 20784
diff changeset
83 redir++;
35113
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
84 tmp = strstr(buffer, "://");
21125
4aff19cc00bb Also support absolute url redirection, e.g. http://www.youtube.com/v/buKaqRG2SFA
reimar
parents: 20784
diff changeset
85 if (tmp) tmp = strchr(tmp + 3, '/');
4aff19cc00bb Also support absolute url redirection, e.g. http://www.youtube.com/v/buKaqRG2SFA
reimar
parents: 20784
diff changeset
86 } else
35113
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
87 tmp = strrchr(buffer, '/');
20784
720206eef78b Support URL redirections that do not specify full URL.
reimar
parents: 19271
diff changeset
88 if (tmp) tmp[1] = 0;
35113
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
89 strcat(buffer, redir);
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
90 }
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
91 if (proxy) {
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
92 char *tmp = get_http_proxy_url(u, newurl);
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
93 free(buffer);
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
94 newurl = buffer = tmp;
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
95 }
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
96 res = url_new(newurl);
06847bdbe4bc Fix redirection for proxy URLs.
reimar
parents: 32885
diff changeset
97 free(buffer);
20784
720206eef78b Support URL redirections that do not specify full URL.
reimar
parents: 19271
diff changeset
98 url_free(u);
720206eef78b Support URL redirections that do not specify full URL.
reimar
parents: 19271
diff changeset
99 *url = res;
720206eef78b Support URL redirections that do not specify full URL.
reimar
parents: 19271
diff changeset
100 return res;
720206eef78b Support URL redirections that do not specify full URL.
reimar
parents: 19271
diff changeset
101 }
720206eef78b Support URL redirections that do not specify full URL.
reimar
parents: 19271
diff changeset
102
32885
34fb7af52b82 Make proxy and url parameter const in get_noauth_url and get_http_proxy_url.
cboesch
parents: 32884
diff changeset
103 static char *get_noauth_url(const URL_t *url)
32553
c44141d4e443 Do not keep authentication in URL on connection through a proxy
cboesch
parents: 32534
diff changeset
104 {
c44141d4e443 Do not keep authentication in URL on connection through a proxy
cboesch
parents: 32534
diff changeset
105 if (url->port)
32884
0d95f044c589 Use mp_asprintf in make_noauth_url and make_http_proxy_url.
cboesch
parents: 32746
diff changeset
106 return mp_asprintf("%s://%s:%d%s",
0d95f044c589 Use mp_asprintf in make_noauth_url and make_http_proxy_url.
cboesch
parents: 32746
diff changeset
107 url->protocol, url->hostname, url->port, url->file);
32553
c44141d4e443 Do not keep authentication in URL on connection through a proxy
cboesch
parents: 32534
diff changeset
108 else
32884
0d95f044c589 Use mp_asprintf in make_noauth_url and make_http_proxy_url.
cboesch
parents: 32746
diff changeset
109 return mp_asprintf("%s://%s%s",
0d95f044c589 Use mp_asprintf in make_noauth_url and make_http_proxy_url.
cboesch
parents: 32746
diff changeset
110 url->protocol, url->hostname, url->file);
32553
c44141d4e443 Do not keep authentication in URL on connection through a proxy
cboesch
parents: 32534
diff changeset
111 }
c44141d4e443 Do not keep authentication in URL on connection through a proxy
cboesch
parents: 32534
diff changeset
112
32885
34fb7af52b82 Make proxy and url parameter const in get_noauth_url and get_http_proxy_url.
cboesch
parents: 32884
diff changeset
113 char *get_http_proxy_url(const URL_t *proxy, const char *host_url)
32586
31a65f4ca3bb Add support for login/password in http_proxy env variable.
cboesch
parents: 32553
diff changeset
114 {
31a65f4ca3bb Add support for login/password in http_proxy env variable.
cboesch
parents: 32553
diff changeset
115 if (proxy->username)
32884
0d95f044c589 Use mp_asprintf in make_noauth_url and make_http_proxy_url.
cboesch
parents: 32746
diff changeset
116 return mp_asprintf("http_proxy://%s:%s@%s:%d/%s",
0d95f044c589 Use mp_asprintf in make_noauth_url and make_http_proxy_url.
cboesch
parents: 32746
diff changeset
117 proxy->username,
0d95f044c589 Use mp_asprintf in make_noauth_url and make_http_proxy_url.
cboesch
parents: 32746
diff changeset
118 proxy->password ? proxy->password : "",
0d95f044c589 Use mp_asprintf in make_noauth_url and make_http_proxy_url.
cboesch
parents: 32746
diff changeset
119 proxy->hostname, proxy->port, host_url);
32586
31a65f4ca3bb Add support for login/password in http_proxy env variable.
cboesch
parents: 32553
diff changeset
120 else
32884
0d95f044c589 Use mp_asprintf in make_noauth_url and make_http_proxy_url.
cboesch
parents: 32746
diff changeset
121 return mp_asprintf("http_proxy://%s:%d/%s",
0d95f044c589 Use mp_asprintf in make_noauth_url and make_http_proxy_url.
cboesch
parents: 32746
diff changeset
122 proxy->hostname, proxy->port, host_url);
32586
31a65f4ca3bb Add support for login/password in http_proxy env variable.
cboesch
parents: 32553
diff changeset
123 }
31a65f4ca3bb Add support for login/password in http_proxy env variable.
cboesch
parents: 32553
diff changeset
124
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
125 URL_t*
9690
a9b7b6055563 Added support for IPv6 numeric url like: http://[3ffe:400:100::1]:80/file
bertrand
parents: 7809
diff changeset
126 url_new(const char* url) {
32884
0d95f044c589 Use mp_asprintf in make_noauth_url and make_http_proxy_url.
cboesch
parents: 32746
diff changeset
127 int pos1, pos2,v6addr = 0;
16421
c41e22d77214 memleak fix, escfilename was not freed for an invalid url
reimar
parents: 12637
diff changeset
128 URL_t* Curl = NULL;
12391
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
129 char *escfilename=NULL;
11771
827cae571c5c Fix long standing bug where last (and sometimes first) char of the
albeu
parents: 11412
diff changeset
130 char *ptr1=NULL, *ptr2=NULL, *ptr3=NULL, *ptr4=NULL;
10056
88c855a174f3 Added some special-case code for checking for "sip:" URLs (because they
rsf
parents: 9924
diff changeset
131 int jumpSize = 3;
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
132
4653
d2a7fcfeec6f Removed the url_copy function , since it was badly implemented,
bertrand
parents: 4119
diff changeset
133 if( url==NULL ) return NULL;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 25795
diff changeset
134
18558
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 17048
diff changeset
135 if (strlen(url) > (SIZE_MAX / 3 - 1)) {
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 17048
diff changeset
136 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed);
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 17048
diff changeset
137 goto err_out;
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 17048
diff changeset
138 }
12391
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
139 escfilename=malloc(strlen(url)*3+1);
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
140 if (!escfilename ) {
16908
bd4cac0d5e0e Changed MSGTR_MPDEMUX_URL_MallocFailed to MSGTR_MemAllocFailed (msg defined two times in help_mp-en.h)
ptt
parents: 16882
diff changeset
141 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed);
16421
c41e22d77214 memleak fix, escfilename was not freed for an invalid url
reimar
parents: 12637
diff changeset
142 goto err_out;
12391
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
143 }
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
144
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
145 // Create the URL container
32636
146fb0958630 Replace two malloc+memset with calloc.
cboesch
parents: 32586
diff changeset
146 Curl = calloc(1, sizeof(*Curl));
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
147 if( Curl==NULL ) {
16908
bd4cac0d5e0e Changed MSGTR_MPDEMUX_URL_MallocFailed to MSGTR_MemAllocFailed (msg defined two times in help_mp-en.h)
ptt
parents: 16882
diff changeset
148 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed);
16421
c41e22d77214 memleak fix, escfilename was not freed for an invalid url
reimar
parents: 12637
diff changeset
149 goto err_out;
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
150 }
12391
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
151
17048
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
152 url_escape_string(escfilename,url);
12391
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
153
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
154 // Copy the url in the URL container
12391
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
155 Curl->url = strdup(escfilename);
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
156 if( Curl->url==NULL ) {
16908
bd4cac0d5e0e Changed MSGTR_MPDEMUX_URL_MallocFailed to MSGTR_MemAllocFailed (msg defined two times in help_mp-en.h)
ptt
parents: 16882
diff changeset
157 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed);
16421
c41e22d77214 memleak fix, escfilename was not freed for an invalid url
reimar
parents: 12637
diff changeset
158 goto err_out;
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
159 }
12391
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
160 mp_msg(MSGT_OPEN,MSGL_V,"Filename for url is now %s\n",escfilename);
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
161
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
162 // extract the protocol
12391
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
163 ptr1 = strstr(escfilename, "://");
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
164 if( ptr1==NULL ) {
10056
88c855a174f3 Added some special-case code for checking for "sip:" URLs (because they
rsf
parents: 9924
diff changeset
165 // Check for a special case: "sip:" (without "//"):
12391
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
166 if (strstr(escfilename, "sip:") == escfilename) {
11412
ec3dac7d17a0 Warning fixes (approved by A'rpi).
rathann
parents: 10056
diff changeset
167 ptr1 = (char *)&url[3]; // points to ':'
10056
88c855a174f3 Added some special-case code for checking for "sip:" URLs (because they
rsf
parents: 9924
diff changeset
168 jumpSize = 1;
88c855a174f3 Added some special-case code for checking for "sip:" URLs (because they
rsf
parents: 9924
diff changeset
169 } else {
88c855a174f3 Added some special-case code for checking for "sip:" URLs (because they
rsf
parents: 9924
diff changeset
170 mp_msg(MSGT_NETWORK,MSGL_V,"Not an URL!\n");
16421
c41e22d77214 memleak fix, escfilename was not freed for an invalid url
reimar
parents: 12637
diff changeset
171 goto err_out;
10056
88c855a174f3 Added some special-case code for checking for "sip:" URLs (because they
rsf
parents: 9924
diff changeset
172 }
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
173 }
12391
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
174 pos1 = ptr1-escfilename;
18879
cc65a585fdcc rm unnecesary casts from void* - part 3
reynaldo
parents: 18671
diff changeset
175 Curl->protocol = malloc(pos1+1);
6513
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
176 if( Curl->protocol==NULL ) {
16908
bd4cac0d5e0e Changed MSGTR_MPDEMUX_URL_MallocFailed to MSGTR_MemAllocFailed (msg defined two times in help_mp-en.h)
ptt
parents: 16882
diff changeset
177 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed);
16421
c41e22d77214 memleak fix, escfilename was not freed for an invalid url
reimar
parents: 12637
diff changeset
178 goto err_out;
6513
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
179 }
12637
5dc89722fad2 uber 10l found by Ilia <chest4l at mail.ru>
alex
parents: 12391
diff changeset
180 strncpy(Curl->protocol, escfilename, pos1);
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
181 Curl->protocol[pos1] = '\0';
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
182
6513
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
183 // jump the "://"
10056
88c855a174f3 Added some special-case code for checking for "sip:" URLs (because they
rsf
parents: 9924
diff changeset
184 ptr1 += jumpSize;
88c855a174f3 Added some special-case code for checking for "sip:" URLs (because they
rsf
parents: 9924
diff changeset
185 pos1 += jumpSize;
6513
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
186
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
187 // check if a username:password is given
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
188 ptr2 = strstr(ptr1, "@");
7330
2f3fe8274028 Applied patch from Gregory Kovriga <gkovriga@techunix.technion.ac.il>
bertrand
parents: 6513
diff changeset
189 ptr3 = strstr(ptr1, "/");
2f3fe8274028 Applied patch from Gregory Kovriga <gkovriga@techunix.technion.ac.il>
bertrand
parents: 6513
diff changeset
190 if( ptr3!=NULL && ptr3<ptr2 ) {
2f3fe8274028 Applied patch from Gregory Kovriga <gkovriga@techunix.technion.ac.il>
bertrand
parents: 6513
diff changeset
191 // it isn't really a username but rather a part of the path
2f3fe8274028 Applied patch from Gregory Kovriga <gkovriga@techunix.technion.ac.il>
bertrand
parents: 6513
diff changeset
192 ptr2 = NULL;
2f3fe8274028 Applied patch from Gregory Kovriga <gkovriga@techunix.technion.ac.il>
bertrand
parents: 6513
diff changeset
193 }
6513
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
194 if( ptr2!=NULL ) {
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
195 // We got something, at least a username...
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
196 int len = ptr2-ptr1;
18879
cc65a585fdcc rm unnecesary casts from void* - part 3
reynaldo
parents: 18671
diff changeset
197 Curl->username = malloc(len+1);
6513
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
198 if( Curl->username==NULL ) {
16908
bd4cac0d5e0e Changed MSGTR_MPDEMUX_URL_MallocFailed to MSGTR_MemAllocFailed (msg defined two times in help_mp-en.h)
ptt
parents: 16882
diff changeset
199 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed);
16421
c41e22d77214 memleak fix, escfilename was not freed for an invalid url
reimar
parents: 12637
diff changeset
200 goto err_out;
6513
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
201 }
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
202 strncpy(Curl->username, ptr1, len);
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
203 Curl->username[len] = '\0';
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
204
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
205 ptr3 = strstr(ptr1, ":");
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
206 if( ptr3!=NULL && ptr3<ptr2 ) {
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
207 // We also have a password
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
208 int len2 = ptr2-ptr3-1;
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
209 Curl->username[ptr3-ptr1]='\0';
18879
cc65a585fdcc rm unnecesary casts from void* - part 3
reynaldo
parents: 18671
diff changeset
210 Curl->password = malloc(len2+1);
6513
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
211 if( Curl->password==NULL ) {
16908
bd4cac0d5e0e Changed MSGTR_MPDEMUX_URL_MallocFailed to MSGTR_MemAllocFailed (msg defined two times in help_mp-en.h)
ptt
parents: 16882
diff changeset
212 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed);
16421
c41e22d77214 memleak fix, escfilename was not freed for an invalid url
reimar
parents: 12637
diff changeset
213 goto err_out;
6513
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
214 }
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
215 strncpy( Curl->password, ptr3+1, len2);
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
216 Curl->password[len2]='\0';
32534
899d7464d246 Unescape username/password when URL-parsing.
reimar
parents: 32511
diff changeset
217 url_unescape_string(Curl->password, Curl->password);
6513
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
218 }
32534
899d7464d246 Unescape username/password when URL-parsing.
reimar
parents: 32511
diff changeset
219 url_unescape_string(Curl->username, Curl->username);
6513
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
220 ptr1 = ptr2+1;
12391
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
221 pos1 = ptr1-escfilename;
6513
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
222 }
9690
a9b7b6055563 Added support for IPv6 numeric url like: http://[3ffe:400:100::1]:80/file
bertrand
parents: 7809
diff changeset
223
a9b7b6055563 Added support for IPv6 numeric url like: http://[3ffe:400:100::1]:80/file
bertrand
parents: 7809
diff changeset
224 // before looking for a port number check if we have an IPv6 type numeric address
a9b7b6055563 Added support for IPv6 numeric url like: http://[3ffe:400:100::1]:80/file
bertrand
parents: 7809
diff changeset
225 // in IPv6 URL the numeric address should be inside square braces.
a9b7b6055563 Added support for IPv6 numeric url like: http://[3ffe:400:100::1]:80/file
bertrand
parents: 7809
diff changeset
226 ptr2 = strstr(ptr1, "[");
a9b7b6055563 Added support for IPv6 numeric url like: http://[3ffe:400:100::1]:80/file
bertrand
parents: 7809
diff changeset
227 ptr3 = strstr(ptr1, "]");
11771
827cae571c5c Fix long standing bug where last (and sometimes first) char of the
albeu
parents: 11412
diff changeset
228 ptr4 = strstr(ptr1, "/");
827cae571c5c Fix long standing bug where last (and sometimes first) char of the
albeu
parents: 11412
diff changeset
229 if( ptr2!=NULL && ptr3!=NULL && ptr2 < ptr3 && (!ptr4 || ptr4 > ptr3)) {
9690
a9b7b6055563 Added support for IPv6 numeric url like: http://[3ffe:400:100::1]:80/file
bertrand
parents: 7809
diff changeset
230 // we have an IPv6 numeric address
a9b7b6055563 Added support for IPv6 numeric url like: http://[3ffe:400:100::1]:80/file
bertrand
parents: 7809
diff changeset
231 ptr1++;
a9b7b6055563 Added support for IPv6 numeric url like: http://[3ffe:400:100::1]:80/file
bertrand
parents: 7809
diff changeset
232 pos1++;
a9b7b6055563 Added support for IPv6 numeric url like: http://[3ffe:400:100::1]:80/file
bertrand
parents: 7809
diff changeset
233 ptr2 = ptr3;
11771
827cae571c5c Fix long standing bug where last (and sometimes first) char of the
albeu
parents: 11412
diff changeset
234 v6addr = 1;
9690
a9b7b6055563 Added support for IPv6 numeric url like: http://[3ffe:400:100::1]:80/file
bertrand
parents: 7809
diff changeset
235 } else {
a9b7b6055563 Added support for IPv6 numeric url like: http://[3ffe:400:100::1]:80/file
bertrand
parents: 7809
diff changeset
236 ptr2 = ptr1;
a9b7b6055563 Added support for IPv6 numeric url like: http://[3ffe:400:100::1]:80/file
bertrand
parents: 7809
diff changeset
237
a9b7b6055563 Added support for IPv6 numeric url like: http://[3ffe:400:100::1]:80/file
bertrand
parents: 7809
diff changeset
238 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 25795
diff changeset
239
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
240 // look if the port is given
9690
a9b7b6055563 Added support for IPv6 numeric url like: http://[3ffe:400:100::1]:80/file
bertrand
parents: 7809
diff changeset
241 ptr2 = strstr(ptr2, ":");
3494
fb9de639ed30 Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3040
diff changeset
242 // If the : is after the first / it isn't the port
6513
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
243 ptr3 = strstr(ptr1, "/");
3494
fb9de639ed30 Applied the patch from Alban Bedel <albeu@free.fr>.
bertrand
parents: 3040
diff changeset
244 if(ptr3 && ptr3 - ptr2 < 0) ptr2 = NULL;
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
245 if( ptr2==NULL ) {
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
246 // No port is given
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
247 // Look if a path is given
9690
a9b7b6055563 Added support for IPv6 numeric url like: http://[3ffe:400:100::1]:80/file
bertrand
parents: 7809
diff changeset
248 if( ptr3==NULL ) {
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
249 // No path/filename
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
250 // So we have an URL like http://www.hostname.com
12391
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
251 pos2 = strlen(escfilename);
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
252 } else {
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
253 // We have an URL like http://www.hostname.com/file.txt
12391
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
254 pos2 = ptr3-escfilename;
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
255 }
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
256 } else {
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
257 // We have an URL beginning like http://www.hostname.com:1212
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
258 // Get the port number
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
259 Curl->port = atoi(ptr2+1);
12391
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
260 pos2 = ptr2-escfilename;
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
261 }
11771
827cae571c5c Fix long standing bug where last (and sometimes first) char of the
albeu
parents: 11412
diff changeset
262 if( v6addr ) pos2--;
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
263 // copy the hostname in the URL container
18879
cc65a585fdcc rm unnecesary casts from void* - part 3
reynaldo
parents: 18671
diff changeset
264 Curl->hostname = malloc(pos2-pos1+1);
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
265 if( Curl->hostname==NULL ) {
16908
bd4cac0d5e0e Changed MSGTR_MPDEMUX_URL_MallocFailed to MSGTR_MemAllocFailed (msg defined two times in help_mp-en.h)
ptt
parents: 16882
diff changeset
266 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed);
16421
c41e22d77214 memleak fix, escfilename was not freed for an invalid url
reimar
parents: 12637
diff changeset
267 goto err_out;
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
268 }
6513
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
269 strncpy(Curl->hostname, ptr1, pos2-pos1);
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
270 Curl->hostname[pos2-pos1] = '\0';
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
271
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
272 // Look if a path is given
6513
6e9d7a6b1806 Added support for URLs that contain an username:password
bertrand
parents: 5933
diff changeset
273 ptr2 = strstr(ptr1, "/");
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
274 if( ptr2!=NULL ) {
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
275 // A path/filename is given
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
276 // check if it's not a trailing '/'
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
277 if( strlen(ptr2)>1 ) {
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
278 // copy the path/filename in the URL container
3612
a1522fa7728a x = malloc(strlen(s) + c) ... strcpy(x, s)
pl
parents: 3496
diff changeset
279 Curl->file = strdup(ptr2);
840
9141234715a2 Added initialisation of URL pointers.
bertrand
parents: 833
diff changeset
280 if( Curl->file==NULL ) {
16908
bd4cac0d5e0e Changed MSGTR_MPDEMUX_URL_MallocFailed to MSGTR_MemAllocFailed (msg defined two times in help_mp-en.h)
ptt
parents: 16882
diff changeset
281 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed);
16421
c41e22d77214 memleak fix, escfilename was not freed for an invalid url
reimar
parents: 12637
diff changeset
282 goto err_out;
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
283 }
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
284 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 25795
diff changeset
285 }
9690
a9b7b6055563 Added support for IPv6 numeric url like: http://[3ffe:400:100::1]:80/file
bertrand
parents: 7809
diff changeset
286 // Check if a filename was given or set, else set it with '/'
869
e350849ff400 Url given without a filename/path get the filename/path '/'
bertrand
parents: 840
diff changeset
287 if( Curl->file==NULL ) {
18879
cc65a585fdcc rm unnecesary casts from void* - part 3
reynaldo
parents: 18671
diff changeset
288 Curl->file = malloc(2);
869
e350849ff400 Url given without a filename/path get the filename/path '/'
bertrand
parents: 840
diff changeset
289 if( Curl->file==NULL ) {
16908
bd4cac0d5e0e Changed MSGTR_MPDEMUX_URL_MallocFailed to MSGTR_MemAllocFailed (msg defined two times in help_mp-en.h)
ptt
parents: 16882
diff changeset
290 mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MemAllocFailed);
16421
c41e22d77214 memleak fix, escfilename was not freed for an invalid url
reimar
parents: 12637
diff changeset
291 goto err_out;
869
e350849ff400 Url given without a filename/path get the filename/path '/'
bertrand
parents: 840
diff changeset
292 }
e350849ff400 Url given without a filename/path get the filename/path '/'
bertrand
parents: 840
diff changeset
293 strcpy(Curl->file, "/");
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
294 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 25795
diff changeset
295
32884
0d95f044c589 Use mp_asprintf in make_noauth_url and make_http_proxy_url.
cboesch
parents: 32746
diff changeset
296 Curl->noauth_url = get_noauth_url(Curl);
32553
c44141d4e443 Do not keep authentication in URL on connection through a proxy
cboesch
parents: 32534
diff changeset
297 if (!Curl->noauth_url) {
c44141d4e443 Do not keep authentication in URL on connection through a proxy
cboesch
parents: 32534
diff changeset
298 mp_msg(MSGT_NETWORK, MSGL_FATAL, MSGTR_MemAllocFailed);
c44141d4e443 Do not keep authentication in URL on connection through a proxy
cboesch
parents: 32534
diff changeset
299 goto err_out;
c44141d4e443 Do not keep authentication in URL on connection through a proxy
cboesch
parents: 32534
diff changeset
300 }
c44141d4e443 Do not keep authentication in URL on connection through a proxy
cboesch
parents: 32534
diff changeset
301
12391
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
302 free(escfilename);
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
303 return Curl;
16421
c41e22d77214 memleak fix, escfilename was not freed for an invalid url
reimar
parents: 12637
diff changeset
304 err_out:
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 30426
diff changeset
305 free(escfilename);
16421
c41e22d77214 memleak fix, escfilename was not freed for an invalid url
reimar
parents: 12637
diff changeset
306 if (Curl) url_free(Curl);
c41e22d77214 memleak fix, escfilename was not freed for an invalid url
reimar
parents: 12637
diff changeset
307 return NULL;
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
308 }
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
309
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
310 void
902
ede5785faa53 Bugs fix, improvements...
bertrand
parents: 869
diff changeset
311 url_free(URL_t* url) {
1530
3effaac0ddb7 silly bug fixed - thanx Szekeres Istvan <szekeres@webvilag.com>
arpi
parents: 997
diff changeset
312 if(!url) return;
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 30426
diff changeset
313 free(url->url);
35369
dac86d3464e2 Also free the noauth_url entry in the URL struct.
reimar
parents: 35113
diff changeset
314 free(url->noauth_url);
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 30426
diff changeset
315 free(url->protocol);
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 30426
diff changeset
316 free(url->hostname);
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 30426
diff changeset
317 free(url->file);
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 30426
diff changeset
318 free(url->username);
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 30426
diff changeset
319 free(url->password);
833
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
320 free(url);
b8cecdc0c67f Starting implementation of ASF network streaming.
bertrand
parents:
diff changeset
321 }
3496
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
322
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
323
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
324 /* Replace escape sequences in an URL (or a part of an URL) */
32534
899d7464d246 Unescape username/password when URL-parsing.
reimar
parents: 32511
diff changeset
325 /* works like strcpy(), but without return argument,
899d7464d246 Unescape username/password when URL-parsing.
reimar
parents: 32511
diff changeset
326 except that outbuf == inbuf is allowed */
3496
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
327 void
9690
a9b7b6055563 Added support for IPv6 numeric url like: http://[3ffe:400:100::1]:80/file
bertrand
parents: 7809
diff changeset
328 url_unescape_string(char *outbuf, const char *inbuf)
3496
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
329 {
12391
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
330 unsigned char c,c1,c2;
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
331 int i,len=strlen(inbuf);
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
332 for (i=0;i<len;i++){
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
333 c = inbuf[i];
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
334 if (c == '%' && i<len-2) { //must have 2 more chars
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
335 c1 = toupper(inbuf[i+1]); // we need uppercase characters
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
336 c2 = toupper(inbuf[i+2]);
3496
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
337 if ( ((c1>='0' && c1<='9') || (c1>='A' && c1<='F')) &&
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
338 ((c2>='0' && c2<='9') || (c2>='A' && c2<='F')) ) {
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
339 if (c1>='0' && c1<='9') c1-='0';
11771
827cae571c5c Fix long standing bug where last (and sometimes first) char of the
albeu
parents: 11412
diff changeset
340 else c1-='A'-10;
3496
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
341 if (c2>='0' && c2<='9') c2-='0';
11771
827cae571c5c Fix long standing bug where last (and sometimes first) char of the
albeu
parents: 11412
diff changeset
342 else c2-='A'-10;
3496
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
343 c = (c1<<4) + c2;
12391
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
344 i=i+2; //only skip next 2 chars if valid esc
3496
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
345 }
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
346 }
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
347 *outbuf++ = c;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 25795
diff changeset
348 }
12391
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
349 *outbuf++='\0'; //add nullterm to string
3496
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
350 }
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
351
17048
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
352 static void
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
353 url_escape_string_part(char *outbuf, const char *inbuf) {
12391
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
354 unsigned char c,c1,c2;
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
355 int i,len=strlen(inbuf);
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
356
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
357 for (i=0;i<len;i++) {
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
358 c = inbuf[i];
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
359 if ((c=='%') && i<len-2 ) { //need 2 more characters
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
360 c1=toupper(inbuf[i+1]); c2=toupper(inbuf[i+2]); // need uppercase chars
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
361 } else {
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
362 c1=129; c2=129; //not escape chars
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
363 }
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
364
3496
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
365 if( (c >= 'A' && c <= 'Z') ||
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
366 (c >= 'a' && c <= 'z') ||
32746
2372e26d24fe Escape character values >= 127 in URLs as required by the RFC.
reimar
parents: 32636
diff changeset
367 (c >= '0' && c <= '9')) {
3496
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
368 *outbuf++ = c;
12391
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
369 } else if ( c=='%' && ((c1 >= '0' && c1 <= '9') || (c1 >= 'A' && c1 <= 'F')) &&
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
370 ((c2 >= '0' && c2 <= '9') || (c2 >= 'A' && c2 <= 'F'))) {
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
371 // check if part of an escape sequence
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
372 *outbuf++=c; // already
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 25795
diff changeset
373
12391
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
374 // dont escape again
16882
dfbe8cd0e081 libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2
reynaldo
parents: 16421
diff changeset
375 mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_URL_StringAlreadyEscaped,c,c1,c2);
12391
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
376 // error as this should not happen against RFC 2396
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
377 // to escape a string twice
3496
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
378 } else {
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
379 /* all others will be escaped */
12391
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
380 c1 = ((c & 0xf0) >> 4);
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
381 c2 = (c & 0x0f);
3496
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
382 if (c1 < 10) c1+='0';
9924
d66ed2c80ddf Fix incorrect URL encoding.
ranma
parents: 9690
diff changeset
383 else c1+='A'-10;
3496
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
384 if (c2 < 10) c2+='0';
9924
d66ed2c80ddf Fix incorrect URL encoding.
ranma
parents: 9690
diff changeset
385 else c2+='A'-10;
3496
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
386 *outbuf++ = '%';
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
387 *outbuf++ = c1;
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
388 *outbuf++ = c2;
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
389 }
12391
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
390 }
2677bfac3838 Fix url escaping and avoid double escape
rtognimp
parents: 12153
diff changeset
391 *outbuf++='\0';
3496
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
392 }
5c8a533dfa09 Added 2 functions to escape/unescape the url as described in the RFC 2396.
bertrand
parents: 3494
diff changeset
393
17048
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
394 /* Replace specific characters in the URL string by an escape sequence */
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
395 /* works like strcpy(), but without return argument */
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
396 void
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
397 url_escape_string(char *outbuf, const char *inbuf) {
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
398 unsigned char c;
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
399 int i = 0,j,len = strlen(inbuf);
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
400 char* tmp,*unesc = NULL, *in;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 25795
diff changeset
401
17048
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
402 // Look if we have an ip6 address, if so skip it there is
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
403 // no need to escape anything in there.
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
404 tmp = strstr(inbuf,"://[");
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
405 if(tmp) {
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
406 tmp = strchr(tmp+4,']');
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
407 if(tmp && (tmp[1] == '/' || tmp[1] == ':' ||
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
408 tmp[1] == '\0')) {
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
409 i = tmp+1-inbuf;
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
410 strncpy(outbuf,inbuf,i);
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
411 outbuf += i;
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
412 tmp = NULL;
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
413 }
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
414 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 25795
diff changeset
415
25795
e96b4070ba66 Clear tmp between ip6 check and string escape to prevent reuse of the
rtogni
parents: 25620
diff changeset
416 tmp = NULL;
17048
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
417 while(i < len) {
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
418 // look for the next char that must be kept
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
419 for (j=i;j<len;j++) {
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
420 c = inbuf[j];
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
421 if(c=='-' || c=='_' || c=='.' || c=='!' || c=='~' || /* mark characters */
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
422 c=='*' || c=='\'' || c=='(' || c==')' || /* do not touch escape character */
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
423 c==';' || c=='/' || c=='?' || c==':' || c=='@' || /* reserved characters */
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
424 c=='&' || c=='=' || c=='+' || c=='$' || c==',') /* see RFC 2396 */
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
425 break;
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
426 }
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
427 // we are on a reserved char, write it out
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
428 if(j == i) {
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
429 *outbuf++ = c;
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
430 i++;
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
431 continue;
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
432 }
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
433 // we found one, take that part of the string
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
434 if(j < len) {
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
435 if(!tmp) tmp = malloc(len+1);
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
436 strncpy(tmp,inbuf+i,j-i);
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
437 tmp[j-i] = '\0';
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
438 in = tmp;
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
439 } else // take the rest of the string
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
440 in = (char*)inbuf+i;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 25795
diff changeset
441
17048
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
442 if(!unesc) unesc = malloc(len+1);
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
443 // unescape first to avoid escaping escape
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
444 url_unescape_string(unesc,in);
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
445 // then escape, including mark and other reserved chars
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
446 // that can come from escape sequences
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
447 url_escape_string_part(outbuf,unesc);
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
448 outbuf += strlen(outbuf);
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
449 i += strlen(in);
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
450 }
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
451 *outbuf = '\0';
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 30426
diff changeset
452 free(tmp);
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 30426
diff changeset
453 free(unesc);
17048
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
454 }
9e02b9cb171b Fix URL escaping to correctly handle URL containing an ip6 address or
albeu
parents: 16908
diff changeset
455
25620
53e5107ea80d Fix illegal identifiers, names starting with __ are reserved for the system.
diego
parents: 21126
diff changeset
456 #ifdef URL_DEBUG
4119
639b3b47b138 Added a debug function to print the struct's variables.
bertrand
parents: 3612
diff changeset
457 void
9690
a9b7b6055563 Added support for IPv6 numeric url like: http://[3ffe:400:100::1]:80/file
bertrand
parents: 7809
diff changeset
458 url_debug(const URL_t *url) {
4119
639b3b47b138 Added a debug function to print the struct's variables.
bertrand
parents: 3612
diff changeset
459 if( url==NULL ) {
639b3b47b138 Added a debug function to print the struct's variables.
bertrand
parents: 3612
diff changeset
460 printf("URL pointer NULL\n");
639b3b47b138 Added a debug function to print the struct's variables.
bertrand
parents: 3612
diff changeset
461 return;
639b3b47b138 Added a debug function to print the struct's variables.
bertrand
parents: 3612
diff changeset
462 }
639b3b47b138 Added a debug function to print the struct's variables.
bertrand
parents: 3612
diff changeset
463 if( url->url!=NULL ) {
639b3b47b138 Added a debug function to print the struct's variables.
bertrand
parents: 3612
diff changeset
464 printf("url=%s\n", url->url );
639b3b47b138 Added a debug function to print the struct's variables.
bertrand
parents: 3612
diff changeset
465 }
639b3b47b138 Added a debug function to print the struct's variables.
bertrand
parents: 3612
diff changeset
466 if( url->protocol!=NULL ) {
639b3b47b138 Added a debug function to print the struct's variables.
bertrand
parents: 3612
diff changeset
467 printf("protocol=%s\n", url->protocol );
639b3b47b138 Added a debug function to print the struct's variables.
bertrand
parents: 3612
diff changeset
468 }
639b3b47b138 Added a debug function to print the struct's variables.
bertrand
parents: 3612
diff changeset
469 if( url->hostname!=NULL ) {
639b3b47b138 Added a debug function to print the struct's variables.
bertrand
parents: 3612
diff changeset
470 printf("hostname=%s\n", url->hostname );
639b3b47b138 Added a debug function to print the struct's variables.
bertrand
parents: 3612
diff changeset
471 }
639b3b47b138 Added a debug function to print the struct's variables.
bertrand
parents: 3612
diff changeset
472 printf("port=%d\n", url->port );
639b3b47b138 Added a debug function to print the struct's variables.
bertrand
parents: 3612
diff changeset
473 if( url->file!=NULL ) {
639b3b47b138 Added a debug function to print the struct's variables.
bertrand
parents: 3612
diff changeset
474 printf("file=%s\n", url->file );
639b3b47b138 Added a debug function to print the struct's variables.
bertrand
parents: 3612
diff changeset
475 }
639b3b47b138 Added a debug function to print the struct's variables.
bertrand
parents: 3612
diff changeset
476 if( url->username!=NULL ) {
639b3b47b138 Added a debug function to print the struct's variables.
bertrand
parents: 3612
diff changeset
477 printf("username=%s\n", url->username );
639b3b47b138 Added a debug function to print the struct's variables.
bertrand
parents: 3612
diff changeset
478 }
639b3b47b138 Added a debug function to print the struct's variables.
bertrand
parents: 3612
diff changeset
479 if( url->password!=NULL ) {
639b3b47b138 Added a debug function to print the struct's variables.
bertrand
parents: 3612
diff changeset
480 printf("password=%s\n", url->password );
639b3b47b138 Added a debug function to print the struct's variables.
bertrand
parents: 3612
diff changeset
481 }
639b3b47b138 Added a debug function to print the struct's variables.
bertrand
parents: 3612
diff changeset
482 }
25620
53e5107ea80d Fix illegal identifiers, names starting with __ are reserved for the system.
diego
parents: 21126
diff changeset
483 #endif /* URL_DEBUG */