xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

mothra: handle relative urls in <base> tag

Browse source
This commit is contained in:
cinap_lenrek 2012-07-17 07:21:22 +02:00
parent 05c11fefe0
commit a78f5f8a3d
3 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
sys/src/cmd/mothra/mothra.h
View file

@ -102,5 +102,6 @@ void mkfieldpanel(Rtext *);
void geturl(char *, int, int, int); void geturl(char *, int, int, int);
int urlpost(Url*, char*); int urlpost(Url*, char*);
int urlget(Url*, int); int urlget(Url*, int);
int urlresolve(Url *);
char version[]; char version[];
Mouse mouse; Mouse mouse;

6
sys/src/cmd/mothra/rdhtml.c
View file

@ -734,8 +734,12 @@ void plrdhtml(char *name, int fd, Www *dst){
g.spacc++; g.spacc++;
break; break;
case Tag_base: case Tag_base:
if(str=pl_getattr(g.attr, "href")) if(str=pl_getattr(g.attr, "href")){
seturl(g.dst->url, str, g.dst->url->fullname);
nstrcpy(g.dst->url->fullname, str, sizeof(g.dst->url->fullname)); nstrcpy(g.dst->url->fullname, str, sizeof(g.dst->url->fullname));
/* base should be a full url, but it often isnt so have to resolve */
urlresolve(g.dst->url);
}
break; break;
case Tag_a: case Tag_a:
if(str=pl_getattr(g.attr, "name")) if(str=pl_getattr(g.attr, "name"))

17
sys/src/cmd/mothra/url.c
View file

@ -151,3 +151,20 @@ urlget(Url *url, int body)
return fd; return fd;
} }
int
urlresolve(Url *url)
{
char buf[1024];
int n, fd;
if((fd = webclone(url, buf, sizeof(buf))) < 0)
return -1;
n = strlen(buf);
snprint(buf+n, sizeof(buf)-n, "/parsed/url");
readstr(buf, url->fullname, sizeof(url->fullname));
snprint(buf+n, sizeof(buf)-n, "/parsed/fragment");
readstr(buf, url->tag, sizeof(url->tag));
close(fd);
return 0;
}