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

[w3m-dev 02880] URI_PATTERN

Browse Source 
* url.c (URI_PATTERN): better match for % hex hex
* url.c (chkExternalURIBuffer): don't use URI_PATTERN as format string
From: Fumitoshi UKAI  <ukai@debian.or.jp>
This commit is contained in:
Fumitoshi UKAI
2002-01-21 18:33:59 +00:00
parent f3491c12c8
commit 2fdc8794ea
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,8 @@
2002-01-22 Fumitoshi UKAI <ukai@debian.or.jp>
* url.c (URI_PATTERN): better match for % hex hex
* url.c (chkExternalURIBuffer): don't use URI_PATTERN as format string
2002-01-22 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 02879] reset signals
@@ -2184,4 +2189,4 @@
* release-0-2-1
* import w3m-0.2.1
$Id: ChangeLog,v 1.248 2002/01/21 17:57:27 ukai Exp $
$Id: ChangeLog,v 1.249 2002/01/21 18:33:59 ukai Exp $

8
url.c
View File

@@ -1,4 +1,4 @@
/* $Id: url.c,v 1.37 2002/01/21 16:58:32 ukai Exp $ */
/* $Id: url.c,v 1.38 2002/01/21 18:34:00 ukai Exp $ */
#include "fm.h"
#include <sys/types.h>
#include <sys/socket.h>
@@ -2081,7 +2081,7 @@ searchURIMethods(ParsedURL *pu)
* escaped = "%" hex hex
*/
#define URI_PATTERN "[-;/?:@&=+$,a-zA-Z0-9_.!~*'()%]*"
#define URI_PATTERN "([-;/?:@&=+$,a-zA-Z0-9_.!~*'()]|%[0-9A-Fa-f][0-9A-Fa-f])*"
void
chkExternalURIBuffer(Buffer *buf)
{
@@ -2090,11 +2090,11 @@ chkExternalURIBuffer(Buffer *buf)
for (i = 0; (ump = urimethods[i]) != NULL; i++) {
for (; ump->item1 != NULL; ump++) {
reAnchor(buf, Sprintf("%s:" URI_PATTERN, ump->item1)->ptr);
reAnchor(buf, Sprintf("%s:%s", ump->item1, URI_PATTERN)->ptr);
}
}
for (ump = default_urimethods; ump->item1 != NULL; ump++) {
reAnchor(buf, Sprintf("%s:" URI_PATTERN, ump->item1)->ptr);
reAnchor(buf, Sprintf("%s:%s", ump->item1, URI_PATTERN)->ptr);
}
}
#endif