storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix indent

Browse Source
This commit is contained in:
Fumitoshi UKAI
2003-06-17 18:03:55 +00:00
parent 228e3a7915
commit 720c831549
1 changed files with 59 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
url.c
View File

@@ -1,4 +1,4 @@
/* $Id: url.c,v 1.80 2003/06/17 18:02:41 ukai Exp $ */ /* $Id: url.c,v 1.81 2003/06/17 18:03:55 ukai Exp $ */
#include "fm.h" #include "fm.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
@@ -695,27 +695,27 @@ parseURL(char *url, ParsedURL *p_url, ParsedURL *current)
*/ */
if (current) { if (current) {
switch (current->scheme) { switch (current->scheme) {
case SCM_LOCAL: case SCM_LOCAL:
case SCM_LOCAL_CGI: case SCM_LOCAL_CGI:
p_url->scheme = SCM_LOCAL; p_url->scheme = SCM_LOCAL;
break; break;
case SCM_FTP: case SCM_FTP:
case SCM_FTPDIR: case SCM_FTPDIR:
p_url->scheme = SCM_FTP; p_url->scheme = SCM_FTP;
break; break;
#ifdef USE_NNTP #ifdef USE_NNTP
case SCM_NNTP: case SCM_NNTP:
case SCM_NNTP_GROUP: case SCM_NNTP_GROUP:
p_url->scheme = SCM_NNTP; p_url->scheme = SCM_NNTP;
break; break;
case SCM_NEWS: case SCM_NEWS:
case SCM_NEWS_GROUP: case SCM_NEWS_GROUP:
p_url->scheme = SCM_NEWS; p_url->scheme = SCM_NEWS;
break; break;
#endif #endif
default: default:
p_url->scheme = current->scheme; p_url->scheme = current->scheme;
break; break;
} }
} }
else else
@@ -1009,24 +1009,24 @@ parseURL2(char *url, ParsedURL *pu, ParsedURL *current)
pu->host = current->host; pu->host = current->host;
pu->port = current->port; pu->port = current->port;
if (pu->file && *pu->file) { if (pu->file && *pu->file) {
#ifdef USE_EXTERNAL_URI_LOADER #ifdef USE_EXTERNAL_URI_LOADER
if (pu->scheme == SCM_UNKNOWN if (pu->scheme == SCM_UNKNOWN
&& strchr(pu->file, ':') == NULL && strchr(pu->file, ':') == NULL
&& current && (p = strchr(current->file, ':')) != NULL) { && current && (p = strchr(current->file, ':')) != NULL) {
pu->file = Sprintf("%s:%s", pu->file = Sprintf("%s:%s",
allocStr(current->file, allocStr(current->file,
p - current->file), p - current->file), pu->file)->ptr;
pu->file)->ptr; }
} else else
#endif #endif
if ( if (
#ifdef USE_GOPHER #ifdef USE_GOPHER
pu->scheme != SCM_GOPHER && pu->scheme != SCM_GOPHER &&
#endif /* USE_GOPHER */ #endif /* USE_GOPHER */
pu->file[0] != '/' pu->file[0] != '/'
#ifdef SUPPORT_DOS_DRIVE_PREFIX #ifdef SUPPORT_DOS_DRIVE_PREFIX
&& !(pu->scheme == SCM_LOCAL && IS_ALPHA(pu->file[0]) && !(pu->scheme == SCM_LOCAL && IS_ALPHA(pu->file[0])
&& pu->file[1] == ':') && pu->file[1] == ':')
#endif #endif
) { ) {
/* file is relative [process 1] */ /* file is relative [process 1] */
@@ -1050,7 +1050,7 @@ parseURL2(char *url, ParsedURL *pu, ParsedURL *current)
} }
#endif /* USE_GOPHER */ #endif /* USE_GOPHER */
} }
else { /* scheme:[?query][#label] */ else { /* scheme:[?query][#label] */
pu->file = current->file; pu->file = current->file;
if (!pu->query) if (!pu->query)
pu->query = current->query; pu->query = current->query;
@@ -1372,7 +1372,7 @@ HTTPrequest(ParsedURL *pu, ParsedURL *current, HRequest *hr, TextList *extra)
seen_proxy_auth = 1; seen_proxy_auth = 1;
#ifdef USE_SSL #ifdef USE_SSL
if (pu->scheme == SCM_HTTPS if (pu->scheme == SCM_HTTPS
&& hr->command != HR_COMMAND_CONNECT) && hr->command != HR_COMMAND_CONNECT)
continue; continue;
#endif #endif
} }
@@ -1381,9 +1381,9 @@ HTTPrequest(ParsedURL *pu, ParsedURL *current, HRequest *hr, TextList *extra)
if (!seen_www_auth if (!seen_www_auth
#ifdef USE_SSL #ifdef USE_SSL
&& hr->command != HR_COMMAND_CONNECT && hr->command != HR_COMMAND_CONNECT
#endif #endif
) { ) {
Str auth_cookie = find_auth_cookie(pu->host, pu->port, pu->file, NULL); Str auth_cookie = find_auth_cookie(pu->host, pu->port, pu->file, NULL);
if (auth_cookie) if (auth_cookie)
Strcat_m_charp(tmp, "Authorization: ", auth_cookie->ptr, Strcat_m_charp(tmp, "Authorization: ", auth_cookie->ptr,
@@ -1392,13 +1392,13 @@ HTTPrequest(ParsedURL *pu, ParsedURL *current, HRequest *hr, TextList *extra)
if (!seen_proxy_auth && (hr->flag & HR_FLAG_PROXY) if (!seen_proxy_auth && (hr->flag & HR_FLAG_PROXY)
#ifdef USE_SSL #ifdef USE_SSL
&& (pu->scheme != SCM_HTTPS && (pu->scheme != SCM_HTTPS || hr->command == HR_COMMAND_CONNECT)
|| hr->command == HR_COMMAND_CONNECT)
#endif #endif
) { ) {
ParsedURL *proxy_pu = schemeToProxy(pu->scheme); ParsedURL *proxy_pu = schemeToProxy(pu->scheme);
Str auth_cookie = find_auth_cookie( Str auth_cookie =
proxy_pu->host, proxy_pu->port, proxy_pu->file, NULL); find_auth_cookie(proxy_pu->host, proxy_pu->port, proxy_pu->file,
NULL);
if (!auth_cookie && proxy_auth_cookie) if (!auth_cookie && proxy_auth_cookie)
auth_cookie = proxy_auth_cookie; auth_cookie = proxy_auth_cookie;
if (auth_cookie) if (auth_cookie)
@@ -1617,9 +1617,9 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
hr->command = HR_COMMAND_HEAD; hr->command = HR_COMMAND_HEAD;
if (( if ((
#ifdef USE_SSL #ifdef USE_SSL
(pu->scheme == SCM_HTTPS) ? non_null(HTTPS_proxy) : (pu->scheme == SCM_HTTPS) ? non_null(HTTPS_proxy) :
#endif /* USE_SSL */ #endif /* USE_SSL */
non_null(HTTP_proxy)) && !Do_not_use_proxy && non_null(HTTP_proxy)) && !Do_not_use_proxy &&
pu->host != NULL && !check_no_proxy(pu->host)) { pu->host != NULL && !check_no_proxy(pu->host)) {
char *save_label; char *save_label;
hr->flag |= HR_FLAG_PROXY; hr->flag |= HR_FLAG_PROXY;
@@ -1627,7 +1627,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
if (pu->scheme == SCM_HTTPS && *status == HTST_CONNECT) { if (pu->scheme == SCM_HTTPS && *status == HTST_CONNECT) {
sock = ssl_socket_of(ouf->stream); sock = ssl_socket_of(ouf->stream);
if (!(sslh = openSSLHandle(sock, pu->host, if (!(sslh = openSSLHandle(sock, pu->host,
&uf.ssl_certificate))) { &uf.ssl_certificate))) {
*status = HTST_MISSING; *status = HTST_MISSING;
return uf; return uf;
} }
@@ -1686,7 +1686,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
#ifdef USE_SSL #ifdef USE_SSL
if (pu->scheme == SCM_HTTPS) { if (pu->scheme == SCM_HTTPS) {
if (!(sslh = openSSLHandle(sock, pu->host, if (!(sslh = openSSLHandle(sock, pu->host,
&uf.ssl_certificate))) { &uf.ssl_certificate))) {
*status = HTST_MISSING; *status = HTST_MISSING;
return uf; return uf;
} }
@@ -1788,8 +1788,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
*q++ = '\0'; *q++ = '\0';
tmp = Strnew_charp(q); tmp = Strnew_charp(q);
q = strrchr(p, ';'); q = strrchr(p, ';');
if (q != NULL && !strcmp(q, ";base64")) if (q != NULL && !strcmp(q, ";base64")) {
{
*q = '\0'; *q = '\0';
uf.encoding = ENC_BASE64; uf.encoding = ENC_BASE64;
} }
@@ -2202,25 +2201,25 @@ schemeToProxy(int scheme)
{ {
ParsedURL *pu = NULL; /* for gcc */ ParsedURL *pu = NULL; /* for gcc */
switch (scheme) { switch (scheme) {
case SCM_HTTP: case SCM_HTTP:
pu = &HTTP_proxy_parsed; pu = &HTTP_proxy_parsed;
break; break;
#ifdef USE_SSL #ifdef USE_SSL
case SCM_HTTPS: case SCM_HTTPS:
pu = &HTTPS_proxy_parsed; pu = &HTTPS_proxy_parsed;
break; break;
#endif #endif
case SCM_FTP: case SCM_FTP:
pu = &FTP_proxy_parsed; pu = &FTP_proxy_parsed;
break; break;
#ifdef USE_GOPHER #ifdef USE_GOPHER
case SCM_GOPHER: case SCM_GOPHER:
pu = &GOPHER_proxy_parsed; pu = &GOPHER_proxy_parsed;
break; break;
#endif #endif
#ifdef DEBUG #ifdef DEBUG
default: default:
abort(); abort();
#endif #endif
} }
return pu; return pu;