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

[w3m-dev 02611] a improvement of find_cookie()

Browse Source 
From: Tsutomu Okada <okada@furuno.co.jp>
This commit is contained in:
Fumitoshi UKAI
2001-12-03 18:29:37 +00:00
parent a61fa4f87b
commit 8024528a09
4 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2001-12-04 Tsutomu Okada <okada@furuno.co.jp>
* [w3m-dev 02611] a improvement of find_cookie()
* cookie.c (make_cookie): domainname is passed as argument
* cookie.c (find_cookie): FQDN(pu->host) done only once
* func.c (getQWord): comment reformat
* local.c (check_local_cgi): ditto
2001-12-04 Tsutomu Okada <okada@furuno.co.jp> 2001-12-04 Tsutomu Okada <okada@furuno.co.jp>
* [w3m-dev 02609] * [w3m-dev 02609]

11
cookie.c
View File

@@ -1,4 +1,4 @@
/* $Id: cookie.c,v 1.5 2001/11/24 02:01:26 ukai Exp $ */ /* $Id: cookie.c,v 1.6 2001/12/03 18:29:37 ukai Exp $ */
/* /*
* References for version 0 cookie: * References for version 0 cookie:
@@ -161,10 +161,8 @@ make_cookie(struct cookie *cookie)
} }
static int static int
match_cookie(ParsedURL *pu, struct cookie *cookie) match_cookie(ParsedURL *pu, struct cookie *cookie, char *domainname)
{ {
char *domainname = (cookie->version == 0) ? FQDN(pu->host) : pu->host;
if (!domainname) if (!domainname)
return 0; return 0;
@@ -204,10 +202,13 @@ find_cookie(ParsedURL *pu)
Str tmp; Str tmp;
struct cookie *p, *p1, *fco = NULL; struct cookie *p, *p1, *fco = NULL;
int version = 0; int version = 0;
char *fq_domainname, *domainname;
fq_domainname = FQDN(pu->host);
check_expired_cookies(); check_expired_cookies();
for (p = First_cookie; p; p = p->next) { for (p = First_cookie; p; p = p->next) {
if (p->flag & COO_USE && match_cookie(pu, p)) { domainname = (p->version == 0) ? fq_domainname : pu->host;
if (p->flag & COO_USE && match_cookie(pu, p, domainname)) {
for (p1 = fco; p1 && Strcasecmp(p1->name, p->name); for (p1 = fco; p1 && Strcasecmp(p1->name, p->name);
p1 = p1->next) ; p1 = p1->next) ;
if (p1) if (p1)

8
func.c
View File

@@ -1,4 +1,4 @@
/* $Id: func.c,v 1.5 2001/12/02 16:26:08 ukai Exp $ */ /* $Id: func.c,v 1.6 2001/12/03 18:29:37 ukai Exp $ */
/* /*
* w3m func.c * w3m func.c
*/ */
@@ -322,10 +322,8 @@ getQWord(char **str)
*e++ = '\\'; *e++ = '\\';
} }
else { else {
if (*p != '\\' && *p != '\'' && /* ..\\.., * if (*p != '\\' && *p != '\'' && /* ..\\.., ..\'.. */
* ..\'.. */ *p != '"' && !IS_SPACE(*p)) /* ..\".., ..\.. */
*p != '"' && !IS_SPACE(*p)) /* ..\".., * ..\..
*/
*e++ = '\\'; *e++ = '\\';
} }
*e++ = *p; *e++ = *p;

6
local.c
View File

@@ -1,4 +1,4 @@
/* $Id: local.c,v 1.12 2001/12/03 18:15:12 ukai Exp $ */ /* $Id: local.c,v 1.13 2001/12/03 18:29:37 ukai Exp $ */
#include "fm.h" #include "fm.h"
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
@@ -173,9 +173,7 @@ check_local_cgi(char *file, int status)
char tmp[_MAX_PATH]; char tmp[_MAX_PATH];
int len; int len;
_abspath(tmp, w3m_lib_dir(), _MAX_PATH); /* Translate '\\' to '/' _abspath(tmp, w3m_lib_dir(), _MAX_PATH); /* Translate '\\' to '/' */
*
*/
len = strlen(tmp); len = strlen(tmp);
while (len > 1 && tmp[len - 1] == '/') while (len > 1 && tmp[len - 1] == '/')
len--; len--;