aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

Handle <base href=""> for HTML source rendering

Browse Source 
Requested by witekfl.
This commit is contained in:
Jonas Fonseca 2006-01-25 23:16:30 +01:00 committed by Jonas Fonseca
parent b7ffca5485
commit fac4c2631f
1 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/document/dom/renderer.c
View File

@ -24,6 +24,7 @@
#include "document/renderer.h" #include "document/renderer.h"
#include "dom/scanner.h" #include "dom/scanner.h"
#include "dom/sgml/parser.h" #include "dom/sgml/parser.h"
#include "dom/sgml/html/html.h"
#include "dom/node.h" #include "dom/node.h"
#include "dom/stack.h" #include "dom/stack.h"
#include "intl/charsets.h" #include "intl/charsets.h"
@ -38,11 +39,14 @@
struct dom_renderer { struct dom_renderer {
enum sgml_document_type doctype;
struct document *document; struct document *document;
struct conv_table *convert_table; struct conv_table *convert_table;
enum convert_string_mode convert_mode; enum convert_string_mode convert_mode;
struct uri *base_uri;
unsigned char *source; unsigned char *source;
unsigned char *end; unsigned char *end;
@ -100,6 +104,7 @@ init_dom_renderer(struct dom_renderer *renderer, struct document *document,
renderer->source = buffer->source; renderer->source = buffer->source;
renderer->end = buffer->source + buffer->length; renderer->end = buffer->source + buffer->length;
renderer->position = renderer->source; renderer->position = renderer->source;
renderer->base_uri = get_uri_reference(document->uri);
#ifdef HAVE_REGEX_H #ifdef HAVE_REGEX_H
if (renderer->document->options.plain_display_links) { if (renderer->document->options.plain_display_links) {
@ -336,7 +341,7 @@ add_dom_link(struct dom_renderer *renderer, unsigned char *string, int length)
CSM_DEFAULT, NULL, NULL, NULL); CSM_DEFAULT, NULL, NULL, NULL);
if (!uristring) return NULL; if (!uristring) return NULL;
where = join_urls(document->uri, uristring); where = join_urls(renderer->base_uri, uristring);
mem_free(uristring); mem_free(uristring);
@ -524,6 +529,27 @@ render_dom_element_end_source(struct dom_stack *stack, struct dom_node *node, vo
render_dom_text(renderer, &renderer->styles[node->type], string, length); render_dom_text(renderer, &renderer->styles[node->type], string, length);
} }
static void
set_base_uri(struct dom_renderer *renderer, unsigned char *value, size_t valuelen)
{
unsigned char *href = memacpy(value, valuelen);
unsigned char *uristring;
struct uri *uri;
if (!href) return;
uristring = join_urls(renderer->base_uri, href);
mem_free(href);
if (!uristring) return;
uri = get_uri(uristring, 0);
mem_free(uristring);
if (!uri) return;
done_uri(renderer->base_uri);
renderer->base_uri = uri;
}
static void static void
render_dom_attribute_source(struct dom_stack *stack, struct dom_node *node, void *data) render_dom_attribute_source(struct dom_stack *stack, struct dom_node *node, void *data)
{ {
@ -578,6 +604,12 @@ render_dom_attribute_source(struct dom_stack *stack, struct dom_node *node, void
break; break;
} }
if (renderer->doctype == SGML_DOCTYPE_HTML
&& node->data.attribute.type == HTML_ATTRIBUTE_HREF
&& node->parent->data.element.type == HTML_ELEMENT_BASE) {
set_base_uri(renderer, value, valuelen - skips);
}
add_dom_link(renderer, value, valuelen - skips); add_dom_link(renderer, value, valuelen - skips);
if (skips > 0) { if (skips > 0) {
@ -669,7 +701,6 @@ render_dom_document(struct cache_entry *cached, struct document *document,
struct dom_renderer renderer; struct dom_renderer renderer;
struct conv_table *convert_table; struct conv_table *convert_table;
struct sgml_parser *parser; struct sgml_parser *parser;
enum sgml_document_type doctype;
unsigned char *string = struri(cached->uri); unsigned char *string = struri(cached->uri);
size_t length = strlen(string); size_t length = strlen(string);
struct dom_string uri = INIT_DOM_STRING(string, length); struct dom_string uri = INIT_DOM_STRING(string, length);
@ -688,22 +719,22 @@ render_dom_document(struct cache_entry *cached, struct document *document,
document->bgcolor = document->options.default_bg; document->bgcolor = document->options.default_bg;
if (!strcasecmp("application/rss+xml", cached->content_type)) { if (!strcasecmp("application/rss+xml", cached->content_type)) {
doctype = SGML_DOCTYPE_RSS; renderer.doctype = SGML_DOCTYPE_RSS;
} else if (!strcasecmp("application/xbel+xml", cached->content_type) } else if (!strcasecmp("application/xbel+xml", cached->content_type)
|| !strcasecmp("application/x-xbel", cached->content_type) || !strcasecmp("application/x-xbel", cached->content_type)
|| !strcasecmp("application/xbel", cached->content_type)) { || !strcasecmp("application/xbel", cached->content_type)) {
doctype = SGML_DOCTYPE_XBEL; renderer.doctype = SGML_DOCTYPE_XBEL;
} else { } else {
assertm(!strcasecmp("text/html", cached->content_type) assertm(!strcasecmp("text/html", cached->content_type)
|| !strcasecmp("application/xhtml+xml", cached->content_type), || !strcasecmp("application/xhtml+xml", cached->content_type),
"Couldn't resolve doctype '%s'", cached->content_type); "Couldn't resolve doctype '%s'", cached->content_type);
doctype = SGML_DOCTYPE_HTML; renderer.doctype = SGML_DOCTYPE_HTML;
} }
parser = init_sgml_parser(SGML_PARSER_STREAM, doctype, &uri); parser = init_sgml_parser(SGML_PARSER_STREAM, renderer.doctype, &uri);
if (!parser) return; if (!parser) return;
add_dom_stack_context(&parser->stack, &renderer, add_dom_stack_context(&parser->stack, &renderer,
@ -723,5 +754,6 @@ render_dom_document(struct cache_entry *cached, struct document *document,
if (renderer.find_url) if (renderer.find_url)
regfree(&renderer.url_regex); regfree(&renderer.url_regex);
#endif #endif
done_uri(renderer.base_uri);
done_sgml_parser(parser); done_sgml_parser(parser);
} }