June 2010 - netsurf-commits - listmaster.pepperfish.net

r10591 jmb - in /trunk/netsurf/framebuffer: font_freetype.c font_freetype.h

by netsurf＠semichrome.net

Author: jmb Date: Wed Jun 30 15:09:33 2010 New Revision: 10591 URL: http://source.netsurf-browser.org?rev=10591&view=rev Log: Correct freetype header acquisition Modified: trunk/netsurf/framebuffer/font_freetype.c trunk/netsurf/framebuffer/font_freetype.h Modified: trunk/netsurf/framebuffer/font_freetype.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/font_freetype... ============================================================================== --- trunk/netsurf/framebuffer/font_freetype.c (original) +++ trunk/netsurf/framebuffer/font_freetype.c Wed Jun 30 15:09:33 2010 @@ -20,7 +20,8 @@ #include <inttypes.h> #include <assert.h> -#include <freetype/ftcache.h> +#include <ft2build.h> +#include FT_CACHE_H #include "css/css.h" #include "render/font.h" Modified: trunk/netsurf/framebuffer/font_freetype.h URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/font_freetype... ============================================================================== --- trunk/netsurf/framebuffer/font_freetype.h (original) +++ trunk/netsurf/framebuffer/font_freetype.h Wed Jun 30 15:09:33 2010 @@ -21,7 +21,7 @@ #include <ft2build.h> #include FT_FREETYPE_H -#include <freetype/ftglyph.h> +#include FT_GLYPH_H extern int ft_load_type;

12 years, 9 months

1
0
0 / 0

r10590 jmb - /trunk/netsurf/render/html.c

by netsurf＠semichrome.net

Author: jmb Date: Wed Jun 30 15:08:59 2010 New Revision: 10590 URL: http://source.netsurf-browser.org?rev=10590&view=rev Log: Pedantic whitespace change Modified: trunk/netsurf/render/html.c Modified: trunk/netsurf/render/html.c URL: http://source.netsurf-browser.org/trunk/netsurf/render/html.c?rev=10590&r... ============================================================================== --- trunk/netsurf/render/html.c (original) +++ trunk/netsurf/render/html.c Wed Jun 30 15:08:59 2010 @@ -490,7 +490,7 @@ struct content *s = hlcache_handle_get_content( hsheet->data.external); - sheet = s-> data.css.sheet; + sheet = s->data.css.sheet; } else if (hsheet->type == HTML_STYLESHEET_INTERNAL) { sheet = hsheet->data.internal->sheet; } else {

12 years, 9 months

1
0
0 / 0

r10589 vince - in /trunk/netsurf: content/urldb.c content/urldb.h test/Makefile test/urldbtest.c

by netsurf＠semichrome.net

Author: vince Date: Tue Jun 29 02:20:12 2010 New Revision: 10589 URL: http://source.netsurf-browser.org?rev=10589&view=rev Log: move url database test to test directory Added: trunk/netsurf/test/urldbtest.c Modified: trunk/netsurf/content/urldb.c trunk/netsurf/content/urldb.h trunk/netsurf/test/Makefile Modified: trunk/netsurf/content/urldb.c URL: http://source.netsurf-browser.org/trunk/netsurf/content/urldb.c?rev=10589... ============================================================================== --- trunk/netsurf/content/urldb.c (original) +++ trunk/netsurf/content/urldb.c Tue Jun 29 02:20:12 2010 @@ -256,14 +256,9 @@ /* Insertion */ static struct host_part *urldb_add_host_node(const char *part, struct host_part *parent); -static struct host_part *urldb_add_host(const char *host); static struct path_data *urldb_add_path_node(const char *scheme, unsigned int port, const char *segment, const char *fragment, struct path_data *parent); -static struct path_data *urldb_add_path(const char *scheme, - unsigned int port, const struct host_part *host, - const char *path, const char *query, const char *fragment, - const char *url); static int urldb_add_path_fragment_cmp(const void *a, const void *b); static struct path_data *urldb_add_path_fragment(struct path_data *segment, const char *fragment); @@ -4076,212 +4071,3 @@ free(root); } - -#ifdef TEST_URLDB -int option_expire_url = 0; -bool verbose_log = true; - -bool cookies_update(const char *domain, const struct cookie_data *data) -{ - return true; -} - -void die(const char *error) -{ - printf("die: %s\n", error); - exit(1); -} - - -void warn_user(const char *warning, const char *detail) -{ - printf("WARNING: %s %s\n", warning, detail); -} - -void bitmap_destroy(void *bitmap) -{ -} - -char *path_to_url(const char *path) -{ - char *r = malloc(strlen(path) + 7 + 1); - - strcpy(r, "file://"); - strcat(r, path); - - return r; -} - -int main(void) -{ - struct host_part *h; - struct path_data *p; - const struct url_data *u; - int i; - - url_init(); - - h = urldb_add_host("127.0.0.1"); - if (!h) { - LOG(("failed adding host")); - return 1; - } - - h = urldb_add_host("intranet"); - if (!h) { - LOG(("failed adding host")); - return 1; - } - - p = urldb_add_path("http", 0, h, "/", NULL, NULL, "http://intranet/"); - if (!p) { - LOG(("failed adding path")); - return 1; - } - - urldb_set_url_title("http://intranet/", "foo"); - - u = urldb_get_url_data("http://intranet/"); - assert(u && strcmp(u->title, "foo") == 0); - - /* Get host entry */ - h = urldb_add_host("netsurf.strcprstskrzkrk.co.uk"); - if (!h) { - LOG(("failed adding host")); - return 1; - } - - /* Get path entry */ - p = urldb_add_path("http", 0, h, "/path/to/resource.htm", "a=b", "zz", - "http://netsurf.strcprstskrzkrk.co.uk/path/to/resource.htm?a=b"); - if (!p) { - LOG(("failed adding path")); - return 1; - } - - p = urldb_add_path("http", 0, h, "/path/to/resource.htm", "a=b", "aa", - "http://netsurf.strcprstskrzkrk.co.uk/path/to/resource.htm?a=b"); - if (!p) { - LOG(("failed adding path")); - return 1; - } - - p = urldb_add_path("http", 0, h, "/path/to/resource.htm", "a=b", "yy", - "http://netsurf.strcprstskrzkrk.co.uk/path/to/resource.htm?a=b"); - if (!p) { - LOG(("failed adding path")); - return 1; - } - - urldb_set_cookie("mmblah=foo; path=/; expires=Thur, 31-Dec-2099 00:00:00 GMT\r\n", "http://www.minimarcos.org.uk/cgi-bin/forum/Blah.pl?,v=login,p=2", NULL); - - urldb_set_cookie("BlahPW=bar; path=/; expires=Thur, 31-Dec-2099 00:00:00 GMT\r\n", "http://www.minimarcos.org.uk/cgi-bin/forum/Blah.pl?,v=login,p=2", NULL); - - urldb_set_cookie("details=foo|bar|Sun, 03-Jun-2007;expires=Mon, 24-Jul-2006 09:53:45 GMT\r\n", "http://ccdb.cropcircleresearch.com/", NULL); - - urldb_set_cookie("PREF=ID=a:TM=b:LM=c:S=d; path=/; domain=.google.com\r\n", "http://www.google.com/", NULL); - - urldb_set_cookie("test=foo, bar, baz; path=/, quux=blah; path=/", "http://www.bbc.co.uk/", NULL); - -// urldb_set_cookie("a=b; path=/; domain=.a.com", "http://a.com/", NULL); - - urldb_set_cookie("foo=bar;Path=/blah;Secure\r\n", "https://www.foo.com/blah/moose", "https://www.foo.com/blah/moose"); - - urldb_get_cookie("https://www.foo.com/blah/wxyzabc"); - - /* 1563546 */ - assert(urldb_add_url("http:moodle.org") == false); - assert(urldb_get_url("http:moodle.org") == NULL); - - /* also 1563546 */ - assert(urldb_add_url("http://a_a/")); - assert(urldb_get_url("http://a_a/")); - - /* 1597646 */ - if (urldb_add_url("http://foo@moose.com/")) { - LOG(("added http://foo@moose.com/")); - assert(urldb_get_url("http://foo@moose.com/") != NULL); - } - - /* 1535120 */ - assert(urldb_add_url("http://www2.2checkout.com/")); - assert(urldb_get_url("http://www2.2checkout.com/")); - - /* Valid path */ - assert(urldb_set_cookie("name=value;Path=/\r\n", "http://www.google.com/", NULL)); - - /* Valid path (non-root directory) */ - assert(urldb_set_cookie("name=value;Path=/foo/bar/\r\n", "http://www.example.org/foo/bar/", NULL)); - - /* Defaulted path */ - assert(urldb_set_cookie("name=value\r\n", "http://www.example.org/foo/bar/baz/bat.html", NULL)); - assert(urldb_get_cookie("http://www.example.org/foo/bar/baz/quux.htm")); - - /* Valid path (includes leafname) */ - assert(urldb_set_cookie("name=value;Version=1;Path=/index.cgi\r\n", "http://example.org/index.cgi", NULL)); - assert(urldb_get_cookie("http://example.org/index.cgi")); - - /* Valid path (includes leafname in non-root directory) */ - assert(urldb_set_cookie("name=value;Path=/foo/index.html\r\n", "http://www.example.org/foo/index.html", NULL)); - /* Should _not_ match the above, as the leafnames differ */ - assert(urldb_get_cookie("http://www.example.org/foo/bar.html") == NULL); - - /* Invalid path (contains different leafname) */ - assert(urldb_set_cookie("name=value;Path=/index.html\r\n", "http://example.org/index.htm", NULL) == false); - - /* Invalid path (contains leafname in different directory) */ - assert(urldb_set_cookie("name=value;Path=/foo/index.html\r\n", "http://www.example.org/bar/index.html", NULL) == false); - - /* Test partial domain match with IP address failing */ - assert(urldb_set_cookie("name=value;Domain=.foo.org\r\n", "http://192.168.0.1/", NULL) == false); - - /* Test handling of non-domain cookie sent by server (domain part should - * be ignored) */ - assert(urldb_set_cookie("foo=value;Domain=blah.com\r\n", "http://www.example.com/", NULL)); - assert(strcmp(urldb_get_cookie("http://www.example.com/"), "foo=value") == 0); - - /* Test handling of domain cookie from wrong host (strictly invalid but - * required to support the real world) */ - assert(urldb_set_cookie("name=value;Domain=.example.com\r\n", "http://foo.bar.example.com/", NULL)); - assert(strcmp(urldb_get_cookie("http://www.example.com/"), "foo=value; name=value") == 0); - - /* Test presence of separators in cookie value */ - assert(urldb_set_cookie("name=\"value=foo\\\\bar\\\\\\\";\\\\baz=quux\";Version=1\r\n", "http://www.example.org/", NULL)); - assert(strcmp(urldb_get_cookie("http://www.example.org/"), "$Version=1; name=\"value=foo\\\\bar\\\\\\\";\\\\baz=quux\"") == 0); - - /* Test cookie with blank value */ - assert(urldb_set_cookie("a=\r\n", "http://www.example.net/", NULL)); - assert(strcmp(urldb_get_cookie("http://www.example.net/"), "a=") == 0); - - /* Test specification of multiple cookies in one header */ - assert(urldb_set_cookie("a=b, foo=bar; Path=/\r\n", "http://www.example.net/", NULL)); - assert(strcmp(urldb_get_cookie("http://www.example.net/"), "a=b; foo=bar") == 0); - - /* Test use of separators in unquoted cookie value */ - assert(urldb_set_cookie("foo=moo@foo:blah?moar\\ text\r\n", "http://example.com/", NULL)); - assert(strcmp(urldb_get_cookie("http://example.com/"), "foo=moo@foo:blah?moar\\ text; name=value") == 0); - - /* Test use of unnecessary quotes */ - assert(urldb_set_cookie("foo=\"hello\";Version=1,bar=bat\r\n", "http://example.com/", NULL)); - assert(strcmp(urldb_get_cookie("http://example.com/"), "foo=\"hello\"; bar=bat; name=value") == 0); - - /* Test domain matching in unverifiable transactions */ - assert(urldb_set_cookie("foo=bar; domain=.example.tld\r\n", "http://www.foo.example.tld/", "http://bar.example.tld/")); - assert(strcmp(urldb_get_cookie("http://www.foo.example.tld/"), "foo=bar") == 0); - - urldb_dump(); - - printf("PASS\n"); - - return 0; -} - -/* - gcc -g -o urldbtest -std=c99 -DTEST_URLDB -I. \ - `pkg-config --cflags --libs libxml-2.0 libcurl` \ - content/urldb.c utils/url.c utils/utils.c utils/messages.c \ - utils/hashtable.c utils/filename.c - */ - -#endif - Modified: trunk/netsurf/content/urldb.h URL: http://source.netsurf-browser.org/trunk/netsurf/content/urldb.h?rev=10589... ============================================================================== --- trunk/netsurf/content/urldb.h (original) +++ trunk/netsurf/content/urldb.h Tue Jun 29 02:20:12 2010 @@ -73,6 +73,11 @@ /* URL insertion */ bool urldb_add_url(const char *url); +struct host_part *urldb_add_host(const char *host); +struct path_data *urldb_add_path(const char *scheme, + unsigned int port, const struct host_part *host, + const char *path, const char *query, const char *fragment, + const char *url); /* URL data modification / lookup */ void urldb_set_url_title(const char *url, const char *title); Modified: trunk/netsurf/test/Makefile URL: http://source.netsurf-browser.org/trunk/netsurf/test/Makefile?rev=10589&r... ============================================================================== --- trunk/netsurf/test/Makefile (original) +++ trunk/netsurf/test/Makefile Tue Jun 29 02:20:12 2010 @@ -1,6 +1,9 @@ CFLAGS := -std=c99 -g -O0 -D_BSD_SOURCE -D_POSIX_C_SOURCE -I.. \ - `pkg-config --cflags libxml-2.0 libcurl libparserutils` -LDFLAGS := `pkg-config --libs libxml-2.0 libcurl libparserutils` + `pkg-config --cflags libxml-2.0 libcurl` +LDFLAGS := `pkg-config --libs libxml-2.0 libcurl` + +llcache_CFLAGS := `pkg-config --cflags libparserutils` +llcache_LDFLAGS := `pkg-config --libs libparserutils` llcache_SRCS := content/fetch.c content/fetchers/fetch_curl.c \ content/fetchers/fetch_data.c content/llcache.c \ @@ -9,11 +12,23 @@ utils/url.c utils/useragent.c utils/utf8.c utils/utils.c \ test/llcache.c +urldbtest_SRCS := content/urldb.c utils/url.c utils/utils.c utils/messages.c \ + utils/hashtable.c utils/filename.c test/urldbtest.c + +urldbtest_CFLAGS := -O2 +urldbtest_LDFLAGS := + +.PHONY: all + +all: llcache urldbtest + llcache: $(addprefix ../,$(llcache_SRCS)) - $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) $(llcache_CFLAGS) $^ -o $@ $(LDFLAGS) $(llcache_LDFLAGS) +urldbtest: $(addprefix ../,$(urldbtest_SRCS)) + $(CC) $(CFLAGS) $(urldbtest_CFLAGS) $^ -o $@ $(LDFLAGS) $(urldbtest_LDFLAGS) .PHONY: clean clean: - $(RM) llcache + $(RM) llcache urldbtest Added: trunk/netsurf/test/urldbtest.c URL: http://source.netsurf-browser.org/trunk/netsurf/test/urldbtest.c?rev=1058... ============================================================================== --- trunk/netsurf/test/urldbtest.c (added) +++ trunk/netsurf/test/urldbtest.c Tue Jun 29 02:20:12 2010 @@ -1,0 +1,243 @@ +/* + * Copyright 2006 John M Bell <jmb202(a)ecs.soton.ac.uk> + * Copyright 2009 John Tytgat <joty(a)netsurf-browser.org> + * + * This file is part of NetSurf, http://www.netsurf-browser.org/ + * + * NetSurf is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * NetSurf is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + + +#include <assert.h> +#include <ctype.h> +#include <stdbool.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <strings.h> +#include <time.h> + +#include <curl/curl.h> + +#include "image/bitmap.h" +#include "content/content.h" +#include "content/urldb.h" +#include "desktop/cookies.h" +#include "desktop/options.h" +#ifdef riscos +/** \todo lose this */ +#include "riscos/bitmap.h" +#endif +#include "utils/log.h" +#include "utils/filename.h" +#include "utils/url.h" +#include "utils/utils.h" + +int option_expire_url = 0; +bool verbose_log = true; + +bool cookies_update(const char *domain, const struct cookie_data *data) +{ + return true; +} + +void die(const char *error) +{ + printf("die: %s\n", error); + exit(1); +} + + +void warn_user(const char *warning, const char *detail) +{ + printf("WARNING: %s %s\n", warning, detail); +} + +void bitmap_destroy(void *bitmap) +{ +} + +char *path_to_url(const char *path) +{ + char *r = malloc(strlen(path) + 7 + 1); + + strcpy(r, "file://"); + strcat(r, path); + + return r; +} + +int main(void) +{ + struct host_part *h; + struct path_data *p; + const struct url_data *u; + int i; + + url_init(); + + h = urldb_add_host("127.0.0.1"); + if (!h) { + LOG(("failed adding host")); + return 1; + } + + h = urldb_add_host("intranet"); + if (!h) { + LOG(("failed adding host")); + return 1; + } + + p = urldb_add_path("http", 0, h, "/", NULL, NULL, "http://intranet/"); + if (!p) { + LOG(("failed adding path")); + return 1; + } + + urldb_set_url_title("http://intranet/", "foo"); + + u = urldb_get_url_data("http://intranet/"); + assert(u && strcmp(u->title, "foo") == 0); + + /* Get host entry */ + h = urldb_add_host("netsurf.strcprstskrzkrk.co.uk"); + if (!h) { + LOG(("failed adding host")); + return 1; + } + + /* Get path entry */ + p = urldb_add_path("http", 0, h, "/path/to/resource.htm", "a=b", "zz", + "http://netsurf.strcprstskrzkrk.co.uk/path/to/resource.htm?a=b"); + if (!p) { + LOG(("failed adding path")); + return 1; + } + + p = urldb_add_path("http", 0, h, "/path/to/resource.htm", "a=b", "aa", + "http://netsurf.strcprstskrzkrk.co.uk/path/to/resource.htm?a=b"); + if (!p) { + LOG(("failed adding path")); + return 1; + } + + p = urldb_add_path("http", 0, h, "/path/to/resource.htm", "a=b", "yy", + "http://netsurf.strcprstskrzkrk.co.uk/path/to/resource.htm?a=b"); + if (!p) { + LOG(("failed adding path")); + return 1; + } + + urldb_set_cookie("mmblah=foo; path=/; expires=Thur, 31-Dec-2099 00:00:00 GMT\r\n", "http://www.minimarcos.org.uk/cgi-bin/forum/Blah.pl?,v=login,p=2", NULL); + + urldb_set_cookie("BlahPW=bar; path=/; expires=Thur, 31-Dec-2099 00:00:00 GMT\r\n", "http://www.minimarcos.org.uk/cgi-bin/forum/Blah.pl?,v=login,p=2", NULL); + + urldb_set_cookie("details=foo|bar|Sun, 03-Jun-2007;expires=Mon, 24-Jul-2006 09:53:45 GMT\r\n", "http://ccdb.cropcircleresearch.com/", NULL); + + urldb_set_cookie("PREF=ID=a:TM=b:LM=c:S=d; path=/; domain=.google.com\r\n", "http://www.google.com/", NULL); + + urldb_set_cookie("test=foo, bar, baz; path=/, quux=blah; path=/", "http://www.bbc.co.uk/", NULL); + +// urldb_set_cookie("a=b; path=/; domain=.a.com", "http://a.com/", NULL); + + urldb_set_cookie("foo=bar;Path=/blah;Secure\r\n", "https://www.foo.com/blah/moose", "https://www.foo.com/blah/moose"); + + urldb_get_cookie("https://www.foo.com/blah/wxyzabc"); + + /* 1563546 */ + assert(urldb_add_url("http:moodle.org") == false); + assert(urldb_get_url("http:moodle.org") == NULL); + + /* also 1563546 */ + assert(urldb_add_url("http://a_a/")); + assert(urldb_get_url("http://a_a/")); + + /* 1597646 */ + if (urldb_add_url("http://foo@moose.com/")) { + LOG(("added http://foo@moose.com/")); + assert(urldb_get_url("http://foo@moose.com/") != NULL); + } + + /* 1535120 */ + assert(urldb_add_url("http://www2.2checkout.com/")); + assert(urldb_get_url("http://www2.2checkout.com/")); + + /* Valid path */ + assert(urldb_set_cookie("name=value;Path=/\r\n", "http://www.google.com/", NULL)); + + /* Valid path (non-root directory) */ + assert(urldb_set_cookie("name=value;Path=/foo/bar/\r\n", "http://www.example.org/foo/bar/", NULL)); + + /* Defaulted path */ + assert(urldb_set_cookie("name=value\r\n", "http://www.example.org/foo/bar/baz/bat.html", NULL)); + assert(urldb_get_cookie("http://www.example.org/foo/bar/baz/quux.htm")); + + /* Valid path (includes leafname) */ + assert(urldb_set_cookie("name=value;Version=1;Path=/index.cgi\r\n", "http://example.org/index.cgi", NULL)); + assert(urldb_get_cookie("http://example.org/index.cgi")); + + /* Valid path (includes leafname in non-root directory) */ + assert(urldb_set_cookie("name=value;Path=/foo/index.html\r\n", "http://www.example.org/foo/index.html", NULL)); + /* Should _not_ match the above, as the leafnames differ */ + assert(urldb_get_cookie("http://www.example.org/foo/bar.html") == NULL); + + /* Invalid path (contains different leafname) */ + assert(urldb_set_cookie("name=value;Path=/index.html\r\n", "http://example.org/index.htm", NULL) == false); + + /* Invalid path (contains leafname in different directory) */ + assert(urldb_set_cookie("name=value;Path=/foo/index.html\r\n", "http://www.example.org/bar/index.html", NULL) == false); + + /* Test partial domain match with IP address failing */ + assert(urldb_set_cookie("name=value;Domain=.foo.org\r\n", "http://192.168.0.1/", NULL) == false); + + /* Test handling of non-domain cookie sent by server (domain part should + * be ignored) */ + assert(urldb_set_cookie("foo=value;Domain=blah.com\r\n", "http://www.example.com/", NULL)); + assert(strcmp(urldb_get_cookie("http://www.example.com/"), "foo=value") == 0); + + /* Test handling of domain cookie from wrong host (strictly invalid but + * required to support the real world) */ + assert(urldb_set_cookie("name=value;Domain=.example.com\r\n", "http://foo.bar.example.com/", NULL)); + assert(strcmp(urldb_get_cookie("http://www.example.com/"), "foo=value; name=value") == 0); + + /* Test presence of separators in cookie value */ + assert(urldb_set_cookie("name=\"value=foo\\\\bar\\\\\\\";\\\\baz=quux\";Version=1\r\n", "http://www.example.org/", NULL)); + assert(strcmp(urldb_get_cookie("http://www.example.org/"), "$Version=1; name=\"value=foo\\\\bar\\\\\\\";\\\\baz=quux\"") == 0); + + /* Test cookie with blank value */ + assert(urldb_set_cookie("a=\r\n", "http://www.example.net/", NULL)); + assert(strcmp(urldb_get_cookie("http://www.example.net/"), "a=") == 0); + + /* Test specification of multiple cookies in one header */ + assert(urldb_set_cookie("a=b, foo=bar; Path=/\r\n", "http://www.example.net/", NULL)); + assert(strcmp(urldb_get_cookie("http://www.example.net/"), "a=b; foo=bar") == 0); + + /* Test use of separators in unquoted cookie value */ + assert(urldb_set_cookie("foo=moo@foo:blah?moar\\ text\r\n", "http://example.com/", NULL)); + assert(strcmp(urldb_get_cookie("http://example.com/"), "foo=moo@foo:blah?moar\\ text; name=value") == 0); + + /* Test use of unnecessary quotes */ + assert(urldb_set_cookie("foo=\"hello\";Version=1,bar=bat\r\n", "http://example.com/", NULL)); + assert(strcmp(urldb_get_cookie("http://example.com/"), "foo=\"hello\"; bar=bat; name=value") == 0); + + /* Test domain matching in unverifiable transactions */ + assert(urldb_set_cookie("foo=bar; domain=.example.tld\r\n", "http://www.foo.example.tld/", "http://bar.example.tld/")); + assert(strcmp(urldb_get_cookie("http://www.foo.example.tld/"), "foo=bar") == 0); + + urldb_dump(); + + printf("PASS\n"); + + return 0; +} +

12 years, 9 months

1
0
0 / 0

r10588 jmb - /trunk/netsurf/gtk/gtk_gui.c

by netsurf＠semichrome.net

Author: jmb Date: Tue Jun 29 01:05:54 2010 New Revision: 10588 URL: http://source.netsurf-browser.org?rev=10588&view=rev Log: Avoid potential use of NULL pointer. Modified: trunk/netsurf/gtk/gtk_gui.c Modified: trunk/netsurf/gtk/gtk_gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_gui.c?rev=10588&r... ============================================================================== --- trunk/netsurf/gtk/gtk_gui.c (original) +++ trunk/netsurf/gtk/gtk_gui.c Tue Jun 29 01:05:54 2010 @@ -751,6 +751,10 @@ int urllen = strlen(path) + FILE_SCHEME_PREFIX_LEN + 1; char *url = malloc(urllen); + if (url == NULL) { + return NULL; + } + if (*path == '/') { path++; /* file: paths are already absolute */ }

12 years, 9 months

1
0
0 / 0

r10587 jmb - /trunk/netsurf/test/llcache.c

by netsurf＠semichrome.net

Author: jmb Date: Tue Jun 29 01:05:29 2010 New Revision: 10587 URL: http://source.netsurf-browser.org?rev=10587&view=rev Log: Make test compile Modified: trunk/netsurf/test/llcache.c Modified: trunk/netsurf/test/llcache.c URL: http://source.netsurf-browser.org/trunk/netsurf/test/llcache.c?rev=10587&... ============================================================================== --- trunk/netsurf/test/llcache.c (original) +++ trunk/netsurf/test/llcache.c Tue Jun 29 01:05:29 2010 @@ -1,5 +1,8 @@ #include <stdio.h> #include <stdlib.h> +#include <string.h> + +#include <curl/curl.h> #include "content/fetch.h" #include "content/llcache.h" @@ -27,6 +30,20 @@ fprintf(stderr, "%s %s\n", warning, detail); } +/* utils/utils.h */ +char *filename_from_path(char *path) +{ + char *leafname; + + leafname = strrchr(path, '/'); + if (!leafname) + leafname = path; + else + leafname += 1; + + return strdup(leafname); +} + /* content/fetch.h */ const char *fetch_filetype(const char *unix_path) { @@ -37,6 +54,38 @@ char *fetch_mimetype(const char *ro_path) { return NULL; +} + +/* utils/url.h */ +char *path_to_url(const char *path) +{ + int urllen = strlen(path) + FILE_SCHEME_PREFIX_LEN + 1; + char *url = malloc(urllen); + + if (url == NULL) { + return NULL; + } + + if (*path == '/') { + path++; /* file: paths are already absolute */ + } + + snprintf(url, urllen, "%s%s", FILE_SCHEME_PREFIX, path); + + return url; +} + +/* utils/url.h */ +char *url_to_path(const char *url) +{ + char *url_path = curl_unescape(url, 0); + char *path; + + /* return the absolute path including leading / */ + path = strdup(url_path + (FILE_SCHEME_PREFIX_LEN - 1)); + curl_free(url_path); + + return path; } /****************************************************************************** @@ -120,7 +169,7 @@ void *test_setup_fetch(struct fetch *parent, const char *url, bool only_2xx, const char *post_urlenc, - struct fetch_multipart_data *post_multipart, + const struct fetch_multipart_data *post_multipart, const char **headers) { test_context *ctx = calloc(1, sizeof(test_context)); @@ -198,7 +247,7 @@ return NSERROR_OK; } -nserror event_handler(const llcache_handle *handle, +nserror event_handler(llcache_handle *handle, const llcache_event *event, void *pw) { static char *event_names[] = { @@ -266,10 +315,8 @@ llcache_poll(); } - fprintf(stdout, "%p -> %p\n", handle, - llcache_object_from_handle(handle)); - fprintf(stdout, "%p -> %p\n", handle2, - llcache_object_from_handle(handle2)); + fprintf(stdout, "%p, %p -> %d\n", handle, handle2, + llcache_handle_references_same_object(handle, handle2)); /* Cleanup */ llcache_handle_release(handle2);

12 years, 9 months

1
0
0 / 0

r10586 vince - /trunk/netsurf/desktop/tree.c

by netsurf＠semichrome.net

Author: vince Date: Mon Jun 28 06:31:51 2010 New Revision: 10586 URL: http://source.netsurf-browser.org?rev=10586&view=rev Log: Fix up confusing formatting Modified: trunk/netsurf/desktop/tree.c Modified: trunk/netsurf/desktop/tree.c URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/tree.c?rev=10586&... ============================================================================== --- trunk/netsurf/desktop/tree.c (original) +++ trunk/netsurf/desktop/tree.c Mon Jun 28 06:31:51 2010 @@ -606,11 +606,11 @@ if (width < 0) { x += width; - width =- width; + width = -width; } if (height < 0) { y += height; - height =- height; + height = -height; } tree_handle_selection_area_node(tree, tree->root->child, x, y, width, height, invert);

12 years, 9 months

1
0
0 / 0

r10585 jmb - /trunk/netsurf/framebuffer/convert_image.c

by netsurf＠semichrome.net

Author: jmb Date: Sun Jun 27 16:52:52 2010 New Revision: 10585 URL: http://source.netsurf-browser.org?rev=10585&view=rev Log: Deal with API modification in modern libpng. Modified: trunk/netsurf/framebuffer/convert_image.c Modified: trunk/netsurf/framebuffer/convert_image.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/convert_image... ============================================================================== --- trunk/netsurf/framebuffer/convert_image.c (original) +++ trunk/netsurf/framebuffer/convert_image.c Sun Jun 27 16:52:52 2010 @@ -22,6 +22,10 @@ #include <png.h> #include <stdlib.h> +#if PNG_LIBPNG_VER < 10209 +#define png_set_expand_gray_1_2_4_to_8(png) png_set_gray_1_2_4_to_8(png) +#endif + static png_structp png; static png_infop info; static int interlace; @@ -221,7 +225,7 @@ if (color_type == PNG_COLOR_TYPE_PALETTE) png_set_palette_to_rgb(png); if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) - png_set_gray_1_2_4_to_8(png); + png_set_expand_gray_1_2_4_to_8(png); if (png_get_valid(png, info, PNG_INFO_tRNS)) png_set_tRNS_to_alpha(png); if (bit_depth == 16)

12 years, 9 months

1
0
0 / 0

r10584 jmb - /trunk/netsurf/image/mng.c

by netsurf＠semichrome.net

Author: jmb Date: Sun Jun 27 11:44:48 2010 New Revision: 10584 URL: http://source.netsurf-browser.org?rev=10584&view=rev Log: Remove bogus assertion Modified: trunk/netsurf/image/mng.c Modified: trunk/netsurf/image/mng.c URL: http://source.netsurf-browser.org/trunk/netsurf/image/mng.c?rev=10584&r1=... ============================================================================== --- trunk/netsurf/image/mng.c (original) +++ trunk/netsurf/image/mng.c Sun Jun 27 11:44:48 2010 @@ -75,7 +75,6 @@ union content_msg_data msg_data; assert(c != NULL); - assert(params != NULL); /* Initialise the library */

12 years, 9 months

1
0
0 / 0

r10583 jmb - /trunk/netsurf/render/table.c

by netsurf＠semichrome.net

Author: jmb Date: Sun Jun 27 08:11:31 2010 New Revision: 10583 URL: http://source.netsurf-browser.org?rev=10583&view=rev Log: Fix assertion when table borders are specified in em/ex units. Modified: trunk/netsurf/render/table.c Modified: trunk/netsurf/render/table.c URL: http://source.netsurf-browser.org/trunk/netsurf/render/table.c?rev=10583&... ============================================================================== --- trunk/netsurf/render/table.c (original) +++ trunk/netsurf/render/table.c Sun Jun 27 08:11:31 2010 @@ -324,6 +324,8 @@ a.style = css_computed_border_left_style(cell->style); a.color = css_computed_border_left_color(cell->style, &a.c); css_computed_border_left_width(cell->style, &a.width, &a.unit); + a.width = nscss_len2px(a.width, a.unit, cell->style); + a.unit = CSS_UNIT_PX; a_src = BOX_TABLE_CELL; if (cell->prev != NULL || cell->start_column != 0) { @@ -355,6 +357,8 @@ b.style = css_computed_border_right_style(prev->style); b.color = css_computed_border_right_color(prev->style, &b.c); css_computed_border_right_width(prev->style, &b.width, &b.unit); + b.width = nscss_len2px(b.width, b.unit, prev->style); + b.unit = CSS_UNIT_PX; b_src = BOX_TABLE_CELL; if (table_border_is_more_eyecatching(&a, a_src, &b, b_src)) { @@ -375,6 +379,8 @@ row->style, &b.c); css_computed_border_left_width( row->style, &b.width, &b.unit); + b.width = nscss_len2px(b.width, b.unit, row->style); + b.unit = CSS_UNIT_PX; b_src = BOX_TABLE_ROW; if (table_border_is_more_eyecatching(&a, a_src, @@ -392,6 +398,8 @@ b.style = css_computed_border_left_style(group->style); b.color = css_computed_border_left_color(group->style, &b.c); css_computed_border_left_width(group->style, &b.width, &b.unit); + b.width = nscss_len2px(b.width, b.unit, group->style); + b.unit = CSS_UNIT_PX; b_src = BOX_TABLE_ROW_GROUP; if (table_border_is_more_eyecatching(&a, a_src, &b, b_src)) { @@ -403,6 +411,8 @@ b.style = css_computed_border_left_style(table->style); b.color = css_computed_border_left_color(table->style, &b.c); css_computed_border_left_width(table->style, &b.width, &b.unit); + b.width = nscss_len2px(b.width, b.unit, table->style); + b.unit = CSS_UNIT_PX; b_src = BOX_TABLE; if (table_border_is_more_eyecatching(&a, a_src, &b, b_src)) { @@ -435,12 +445,16 @@ a.style = css_computed_border_top_style(cell->style); a.color = css_computed_border_top_color(cell->style, &a.c); css_computed_border_top_width(cell->style, &a.width, &a.unit); + a.width = nscss_len2px(a.width, a.unit, cell->style); + a.unit = CSS_UNIT_PX; a_src = BOX_TABLE_CELL; /* Top border of row */ b.style = css_computed_border_top_style(row->style); b.color = css_computed_border_top_color(row->style, &b.c); css_computed_border_top_width(row->style, &b.width, &b.unit); + b.width = nscss_len2px(b.width, b.unit, row->style); + b.unit = CSS_UNIT_PX; b_src = BOX_TABLE_ROW; if (table_border_is_more_eyecatching(&a, a_src, &b, b_src)) { @@ -471,6 +485,8 @@ b.style = css_computed_border_top_style(group->style); b.color = css_computed_border_top_color(group->style, &b.c); css_computed_border_top_width(group->style, &b.width, &b.unit); + b.width = nscss_len2px(b.width, b.unit, group->style); + b.unit = CSS_UNIT_PX; b_src = BOX_TABLE_ROW_GROUP; if (table_border_is_more_eyecatching(&a, a_src, &b, b_src)) { @@ -522,6 +538,8 @@ a.style = css_computed_border_right_style(cell->style); a.color = css_computed_border_right_color(cell->style, &a.c); css_computed_border_right_width(cell->style, &a.width, &a.unit); + a.width = nscss_len2px(a.width, a.unit, cell->style); + a.unit = CSS_UNIT_PX; a_src = BOX_TABLE_CELL; if (cell->next != NULL || cell->start_column + cell->columns != @@ -544,6 +562,8 @@ row->style, &b.c); css_computed_border_right_width( row->style, &b.width, &b.unit); + b.width = nscss_len2px(b.width, b.unit, row->style); + b.unit = CSS_UNIT_PX; b_src = BOX_TABLE_ROW; if (table_border_is_more_eyecatching(&a, a_src, @@ -562,6 +582,8 @@ b.color = css_computed_border_right_color(group->style, &b.c); css_computed_border_right_width(group->style, &b.width, &b.unit); + b.width = nscss_len2px(b.width, b.unit, group->style); + b.unit = CSS_UNIT_PX; b_src = BOX_TABLE_ROW_GROUP; if (table_border_is_more_eyecatching(&a, a_src, &b, b_src)) { @@ -574,6 +596,8 @@ b.color = css_computed_border_right_color(table->style, &b.c); css_computed_border_right_width(table->style, &b.width, &b.unit); + b.width = nscss_len2px(b.width, b.unit, table->style); + b.unit = CSS_UNIT_PX; b_src = BOX_TABLE; if (table_border_is_more_eyecatching(&a, a_src, &b, b_src)) { @@ -606,6 +630,8 @@ a.style = css_computed_border_bottom_style(cell->style); a.color = css_computed_border_bottom_color(cell->style, &a.c); css_computed_border_bottom_width(cell->style, &a.width, &a.unit); + a.width = nscss_len2px(a.width, a.unit, cell->style); + a.unit = CSS_UNIT_PX; a_src = BOX_TABLE_CELL; while (rows-- > 0 && row != NULL) @@ -628,6 +654,8 @@ b.style = css_computed_border_bottom_style(row->style); b.color = css_computed_border_bottom_color(row->style, &b.c); css_computed_border_bottom_width(row->style, &b.width, &b.unit); + b.width = nscss_len2px(b.width, b.unit, row->style); + b.unit = CSS_UNIT_PX; b_src = BOX_TABLE_ROW; if (table_border_is_more_eyecatching(&a, a_src, &b, b_src)) { @@ -640,6 +668,8 @@ b.color = css_computed_border_bottom_color(group->style, &b.c); css_computed_border_bottom_width(group->style, &b.width, &b.unit); + b.width = nscss_len2px(b.width, b.unit, group->style); + b.unit = CSS_UNIT_PX; b_src = BOX_TABLE_ROW_GROUP; if (table_border_is_more_eyecatching(&a, a_src, &b, b_src)) { @@ -652,6 +682,8 @@ b.color = css_computed_border_bottom_color(table->style, &b.c); css_computed_border_bottom_width(table->style, &b.width, &b.unit); + b.width = nscss_len2px(b.width, b.unit, table->style); + b.unit = CSS_UNIT_PX; b_src = BOX_TABLE; if (table_border_is_more_eyecatching(&a, a_src, &b, b_src)) { @@ -796,6 +828,8 @@ b.style = css_computed_border_top_style(table->style); b.color = css_computed_border_top_color(table->style, &b.c); css_computed_border_top_width(table->style, &b.width, &b.unit); + b.width = nscss_len2px(b.width, b.unit, table->style); + b.unit = CSS_UNIT_PX; b_src = BOX_TABLE; if (table_border_is_more_eyecatching(a, *a_src, &b, b_src)) { @@ -826,6 +860,8 @@ b.style = css_computed_border_bottom_style(group->style); b.color = css_computed_border_bottom_color(group->style, &b.c); css_computed_border_bottom_width(group->style, &b.width, &b.unit); + b.width = nscss_len2px(b.width, b.unit, group->style); + b.unit = CSS_UNIT_PX; b_src = BOX_TABLE_ROW_GROUP; if (table_border_is_more_eyecatching(a, *a_src, &b, b_src)) { @@ -850,6 +886,8 @@ b.style = css_computed_border_top_style(group->style); b.color = css_computed_border_top_color(group->style, &b.c); css_computed_border_top_width(group->style, &b.width, &b.unit); + b.width = nscss_len2px(b.width, b.unit, group->style); + b.unit = CSS_UNIT_PX; b_src = BOX_TABLE_ROW_GROUP; if (table_border_is_more_eyecatching(a, *a_src, &b, b_src)) { @@ -885,6 +923,8 @@ b.style = css_computed_border_bottom_style(row->style); b.color = css_computed_border_bottom_color(row->style, &b.c); css_computed_border_bottom_width(row->style, &b.width, &b.unit); + b.width = nscss_len2px(b.width, b.unit, row->style); + b.unit = CSS_UNIT_PX; b_src = BOX_TABLE_ROW; if (table_border_is_more_eyecatching(a, *a_src, &b, b_src)) { @@ -897,6 +937,8 @@ b.style = css_computed_border_top_style(row->style); b.color = css_computed_border_top_color(row->style, &b.c); css_computed_border_top_width(row->style, &b.width, &b.unit); + b.width = nscss_len2px(b.width, b.unit, row->style); + b.unit = CSS_UNIT_PX; b_src = BOX_TABLE_ROW; if (table_border_is_more_eyecatching(a, *a_src, &b, b_src)) { @@ -933,6 +975,9 @@ c->style, &b.c); css_computed_border_bottom_width(c->style, &b.width, &b.unit); + b.width = nscss_len2px(b.width, b.unit, + c->style); + b.unit = CSS_UNIT_PX; b_src = BOX_TABLE_CELL; if (table_border_is_more_eyecatching(a, *a_src,

12 years, 9 months

1
0
0 / 0

r10582 chris_y - /trunk/netsurf/Makefile.defaults

by netsurf＠semichrome.net

Author: chris_y Date: Sun Jun 27 07:23:34 2010 New Revision: 10582 URL: http://source.netsurf-browser.org?rev=10582&view=rev Log: Force internal iconv for Amiga build, as libiconv causing odd problems despite working well through libparserutils Modified: trunk/netsurf/Makefile.defaults Modified: trunk/netsurf/Makefile.defaults URL: http://source.netsurf-browser.org/trunk/netsurf/Makefile.defaults?rev=105... ============================================================================== --- trunk/netsurf/Makefile.defaults (original) +++ trunk/netsurf/Makefile.defaults Sun Jun 27 07:23:34 2010 @@ -191,7 +191,7 @@ # Force using glibc internal iconv implementation instead of external libiconv # Valid options: YES, NO - NETSURF_USE_LIBICONV_PLUG := NO + NETSURF_USE_LIBICONV_PLUG := YES # Enable NetSurf's use of librosprite for displaying RISC OS Sprites # Valid options: YES, NO, AUTO

12 years, 9 months

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits June 2010