From 8024528a098d246c9c6f3355e28d4daf91c1eeee Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Mon, 3 Dec 2001 18:29:37 +0000 Subject: [w3m-dev 02611] a improvement of find_cookie() From: Tsutomu Okada --- ChangeLog | 8 ++++++++ cookie.c | 11 ++++++----- func.c | 8 +++----- local.c | 6 ++---- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7690b92..e1fa8c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2001-12-04 Tsutomu Okada + + * [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 * [w3m-dev 02609] diff --git a/cookie.c b/cookie.c index 18bb304..1548255 100644 --- a/cookie.c +++ b/cookie.c @@ -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: @@ -161,10 +161,8 @@ make_cookie(struct cookie *cookie) } 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) return 0; @@ -204,10 +202,13 @@ find_cookie(ParsedURL *pu) Str tmp; struct cookie *p, *p1, *fco = NULL; int version = 0; + char *fq_domainname, *domainname; + fq_domainname = FQDN(pu->host); check_expired_cookies(); 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); p1 = p1->next) ; if (p1) diff --git a/func.c b/func.c index da85327..deb5a3e 100644 --- a/func.c +++ b/func.c @@ -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 */ @@ -322,10 +322,8 @@ getQWord(char **str) *e++ = '\\'; } else { - if (*p != '\\' && *p != '\'' && /* ..\\.., * - * ..\'.. */ - *p != '"' && !IS_SPACE(*p)) /* ..\".., * ..\.. - */ + if (*p != '\\' && *p != '\'' && /* ..\\.., ..\'.. */ + *p != '"' && !IS_SPACE(*p)) /* ..\".., ..\.. */ *e++ = '\\'; } *e++ = *p; diff --git a/local.c b/local.c index 1c94cf8..ede5aaf 100644 --- a/local.c +++ b/local.c @@ -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 #include @@ -173,9 +173,7 @@ check_local_cgi(char *file, int status) char tmp[_MAX_PATH]; int len; - _abspath(tmp, w3m_lib_dir(), _MAX_PATH); /* Translate '\\' to '/' - * - */ + _abspath(tmp, w3m_lib_dir(), _MAX_PATH); /* Translate '\\' to '/' */ len = strlen(tmp); while (len > 1 && tmp[len - 1] == '/') len--; -- cgit v1.2.3