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

r10653 vince - /branches/vince/netsurf-file-fetcher/

by netsurf＠semichrome.net

Author: vince Date: Sat Jul 17 06:36:14 2010 New Revision: 10653 URL: http://source.netsurf-browser.org?rev=10653&view=rev Log: branch for file fetcher Added: branches/vince/netsurf-file-fetcher/ - copied from r10652, trunk/netsurf/

12 years, 6 months

1
0
0 / 0

r10652 vince - /branches/vince/netsurf-fbtk-rework/

by netsurf＠semichrome.net

Author: vince Date: Sat Jul 17 06:33:49 2010 New Revision: 10652 URL: http://source.netsurf-browser.org?rev=10652&view=rev Log: branch has been merged Removed: branches/vince/netsurf-fbtk-rework/

12 years, 6 months

1
0
0 / 0

r10651 jmb - /trunk/netsurf/content/fetchers/fetch_curl.c

by netsurf＠semichrome.net

Author: jmb Date: Sat Jul 17 04:13:44 2010 New Revision: 10651 URL: http://source.netsurf-browser.org?rev=10651&view=rev Log: Don't suppress curl debug output, either Modified: trunk/netsurf/content/fetchers/fetch_curl.c Modified: trunk/netsurf/content/fetchers/fetch_curl.c URL: http://source.netsurf-browser.org/trunk/netsurf/content/fetchers/fetch_cu... ============================================================================== --- trunk/netsurf/content/fetchers/fetch_curl.c (original) +++ trunk/netsurf/content/fetchers/fetch_curl.c Sat Jul 17 04:13:44 2010 @@ -182,8 +182,11 @@ SETOPT(CURLOPT_VERBOSE, 0); } SETOPT(CURLOPT_ERRORBUFFER, fetch_error_buffer); - if (option_suppress_curl_debug) - SETOPT(CURLOPT_DEBUGFUNCTION, fetch_curl_ignore_debug); + /* jmb -- don't suppress curl debug while we're + * investigating low-level cache crashes + * if (option_suppress_curl_debug) + * SETOPT(CURLOPT_DEBUGFUNCTION, fetch_curl_ignore_debug); + */ SETOPT(CURLOPT_WRITEFUNCTION, fetch_curl_data); SETOPT(CURLOPT_HEADERFUNCTION, fetch_curl_header); SETOPT(CURLOPT_PROGRESSFUNCTION, fetch_curl_progress);

12 years, 6 months

1
0
0 / 0

r10650 jmb - in /trunk/netsurf/content: fetch.c llcache.c

by netsurf＠semichrome.net

Author: jmb Date: Sat Jul 17 03:17:42 2010 New Revision: 10650 URL: http://source.netsurf-browser.org?rev=10650&view=rev Log: Enable noisy logging Modified: trunk/netsurf/content/fetch.c trunk/netsurf/content/llcache.c Modified: trunk/netsurf/content/fetch.c URL: http://source.netsurf-browser.org/trunk/netsurf/content/fetch.c?rev=10650... ============================================================================== --- trunk/netsurf/content/fetch.c (original) +++ trunk/netsurf/content/fetch.c Sat Jul 17 03:17:42 2010 @@ -48,7 +48,7 @@ #include "utils/ring.h" /* Define this to turn on verbose fetch logging */ -#undef DEBUG_FETCH_VERBOSE +#define DEBUG_FETCH_VERBOSE bool fetch_active; /**< Fetches in progress, please call fetch_poll(). */ Modified: trunk/netsurf/content/llcache.c URL: http://source.netsurf-browser.org/trunk/netsurf/content/llcache.c?rev=106... ============================================================================== --- trunk/netsurf/content/llcache.c (original) +++ trunk/netsurf/content/llcache.c Sat Jul 17 03:17:42 2010 @@ -36,7 +36,7 @@ #include "utils/utils.h" /** Define to enable tracing of llcache operations. */ -#undef LLCACHE_TRACE +#define LLCACHE_TRACE /** State of a low-level cache object fetch */ typedef enum {

12 years, 6 months

1
0
0 / 0

r10649 tlsa - /trunk/netsurf/render/layout.c

by netsurf＠semichrome.net

Author: tlsa Date: Fri Jul 16 12:56:33 2010 New Revision: 10649 URL: http://source.netsurf-browser.org?rev=10649&view=rev Log: Fix build when layout logging is enabled. Modified: trunk/netsurf/render/layout.c Modified: trunk/netsurf/render/layout.c URL: http://source.netsurf-browser.org/trunk/netsurf/render/layout.c?rev=10649... ============================================================================== --- trunk/netsurf/render/layout.c (original) +++ trunk/netsurf/render/layout.c Fri Jul 16 12:56:33 2010 @@ -804,8 +804,8 @@ block->type == BOX_TABLE_CELL); assert(block->object); - LOG(("block %p, object %s, width %i", block, block->object->url, - block->width)); + LOG(("block %p, object %s, width %i", block, + content_get_url(block->object), block->width)); if (content_get_type(block->object) == CONTENT_HTML) { content_reformat(block->object, block->width, 1);

12 years, 6 months

1
0
0 / 0

r10648 tlsa - /trunk/netsurf/render/layout.c

by netsurf＠semichrome.net

Author: tlsa Date: Fri Jul 16 12:48:20 2010 New Revision: 10648 URL: http://source.netsurf-browser.org?rev=10648&view=rev Log: Record left and right float boxes with negative widths. Fixes overlapping text on new BBC News site. Modified: trunk/netsurf/render/layout.c Modified: trunk/netsurf/render/layout.c URL: http://source.netsurf-browser.org/trunk/netsurf/render/layout.c?rev=10648... ============================================================================== --- trunk/netsurf/render/layout.c (original) +++ trunk/netsurf/render/layout.c Fri Jul 16 12:48:20 2010 @@ -2286,16 +2286,14 @@ * Float affects current line */ if (b->type == BOX_FLOAT_LEFT) { b->x = cx + x0; - if (b->width > 0) { + if (b->width > 0) x0 += b->width; - left = b; - } + left = b; } else { b->x = cx + x1 - b->width; - if (b->width > 0) { + if (b->width > 0) x1 -= b->width; - right = b; - } + right = b; } b->y = cy; } else { @@ -2306,8 +2304,7 @@ fy = (fy > fcy) ? fy : fcy; fy = (fy == cy) ? fy + height : fy; - place_float_below(b, *width, - cx, fy, cont); + place_float_below(b, *width, cx, fy, cont); fy = b->y; if (d->style && css_computed_clear(d->style) != CSS_CLEAR_NONE) {

12 years, 6 months

1
0
0 / 0

r10647 tlsa - /trunk/netsurf/render/directory.c

by netsurf＠semichrome.net

Author: tlsa Date: Fri Jul 16 07:08:59 2010 New Revision: 10647 URL: http://source.netsurf-browser.org?rev=10647&view=rev Log: Update dirlist_generate_title documentation to match reality. Remove unused error check stuff. Modified: trunk/netsurf/render/directory.c Modified: trunk/netsurf/render/directory.c URL: http://source.netsurf-browser.org/trunk/netsurf/render/directory.c?rev=10... ============================================================================== --- trunk/netsurf/render/directory.c (original) +++ trunk/netsurf/render/directory.c Fri Jul 16 07:08:59 2010 @@ -157,7 +157,7 @@ /** * Generates the part of an HTML directory listing page that contains the title * - * \param title title to use, gets prefixed by "Index of " + * \param title title to use * \param buffer buffer to fill with generated HTML * \param buffer_length maximum size of buffer * \return true iff buffer filled without error @@ -423,7 +423,6 @@ } bool directory_convert(struct content *c) { - int error = 0; char *path; DIR *parent; struct dirent *entry; @@ -442,8 +441,8 @@ char modtime[100]; long long filesize; bool extendedinfo, evenrow = false; - char *index_title; - int index_title_length; + char *title; + int title_length; /* Get directory path from URL */ path = url_to_path(content__get_url(c)); @@ -485,31 +484,22 @@ (uint8_t *) buffer, strlen(buffer)); /* Construct a localised title string */ - index_title_length = strlen(nice_path) + - strlen(messages_get("FileIndex")); - index_title = malloc(index_title_length); - - if(index_title == NULL) { + title_length = strlen(nice_path) + strlen(messages_get("FileIndex")); + title = malloc(title_length); + + if(title == NULL) { msg_data.error = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, msg_data); return false; } - snprintf(index_title, index_title_length, - messages_get("FileIndex"), - nice_path); - if (error < 0 || error >= index_title_length) { - /* Error or buffer too small */ - msg_data.error = messages_get("NoMemory"); - content_broadcast(c, CONTENT_MSG_ERROR, msg_data); - free(index_title); - return false; - } + /* Set title to localised "Index of <nice_path>" */ + snprintf(title, title_length, messages_get("FileIndex"), nice_path); /* Print document title and heading */ - dirlist_generate_title(index_title, buffer, MAX_LENGTH); + dirlist_generate_title(title, buffer, MAX_LENGTH); free(nice_path); - free(index_title); + free(title); binding_parse_chunk(c->data.html.parser_binding, (uint8_t *) buffer, strlen(buffer));

12 years, 6 months

1
0
0 / 0

r10646 chris_y - /trunk/netsurf/render/directory.c

by netsurf＠semichrome.net

Author: chris_y Date: Thu Jul 15 17:34:03 2010 New Revision: 10646 URL: http://source.netsurf-browser.org?rev=10646&view=rev Log: memory leak Modified: trunk/netsurf/render/directory.c Modified: trunk/netsurf/render/directory.c URL: http://source.netsurf-browser.org/trunk/netsurf/render/directory.c?rev=10... ============================================================================== --- trunk/netsurf/render/directory.c (original) +++ trunk/netsurf/render/directory.c Thu Jul 15 17:34:03 2010 @@ -176,29 +176,13 @@ bool dirlist_generate_title(char *title, char *buffer, int buffer_length) { - int error = 0; - int index_title_length = strlen(title) + - strlen(messages_get("FileIndex")); - char *index_title = malloc(index_title_length); - - if(index_title == NULL) - /* Title buffer allocation error */ - return false; - - error = snprintf(index_title, index_title_length, - messages_get("FileIndex"), - title); - if (error < 0 || error >= index_title_length) - /* Error or buffer too small */ - return false; - - error = snprintf(buffer, buffer_length, + int error = snprintf(buffer, buffer_length, "</style>\n" "<title>%s</title>\n" "</head>\n" "<body>\n" "<h1>%s</h1>\n", - index_title, index_title); + title, title); if (error < 0 || error >= buffer_length) /* Error or buffer too small */ return false; @@ -439,6 +423,7 @@ } bool directory_convert(struct content *c) { + int error = 0; char *path; DIR *parent; struct dirent *entry; @@ -457,6 +442,8 @@ char modtime[100]; long long filesize; bool extendedinfo, evenrow = false; + char *index_title; + int index_title_length; /* Get directory path from URL */ path = url_to_path(content__get_url(c)); @@ -497,9 +484,32 @@ binding_parse_chunk(c->data.html.parser_binding, (uint8_t *) buffer, strlen(buffer)); + /* Construct a localised title string */ + index_title_length = strlen(nice_path) + + strlen(messages_get("FileIndex")); + index_title = malloc(index_title_length); + + if(index_title == NULL) { + msg_data.error = messages_get("NoMemory"); + content_broadcast(c, CONTENT_MSG_ERROR, msg_data); + return false; + } + + snprintf(index_title, index_title_length, + messages_get("FileIndex"), + nice_path); + if (error < 0 || error >= index_title_length) { + /* Error or buffer too small */ + msg_data.error = messages_get("NoMemory"); + content_broadcast(c, CONTENT_MSG_ERROR, msg_data); + free(index_title); + return false; + } + /* Print document title and heading */ - dirlist_generate_title(nice_path, buffer, MAX_LENGTH); + dirlist_generate_title(index_title, buffer, MAX_LENGTH); free(nice_path); + free(index_title); binding_parse_chunk(c->data.html.parser_binding, (uint8_t *) buffer, strlen(buffer));

12 years, 6 months

1
0
0 / 0

r10645 chris_y - in /trunk/netsurf: !NetSurf/Resources/de/Messages !NetSurf/Resources/en/Messages !NetSurf/Resources/fr/Messages !NetSurf/Resources/it/Messages !NetSurf/Resources/nl/Messages render/directory.c

by netsurf＠semichrome.net

Author: chris_y Date: Thu Jul 15 17:19:01 2010 New Revision: 10645 URL: http://source.netsurf-browser.org?rev=10645&view=rev Log: Localise browser "Index of" text Modified: trunk/netsurf/!NetSurf/Resources/de/Messages trunk/netsurf/!NetSurf/Resources/en/Messages trunk/netsurf/!NetSurf/Resources/fr/Messages trunk/netsurf/!NetSurf/Resources/it/Messages trunk/netsurf/!NetSurf/Resources/nl/Messages trunk/netsurf/render/directory.c Modified: trunk/netsurf/!NetSurf/Resources/de/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/de/M... ============================================================================== --- trunk/netsurf/!NetSurf/Resources/de/Messages (original) +++ trunk/netsurf/!NetSurf/Resources/de/Messages Thu Jul 15 17:19:01 2010 @@ -653,6 +653,7 @@ # Directory browser # +FileIndex:Index of %s FileParent:^ Up to parent directory FileDirectory:Directory FileName:Name Modified: trunk/netsurf/!NetSurf/Resources/en/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/en/M... ============================================================================== --- trunk/netsurf/!NetSurf/Resources/en/Messages (original) +++ trunk/netsurf/!NetSurf/Resources/en/Messages Thu Jul 15 17:19:01 2010 @@ -657,6 +657,7 @@ # Directory browser # +FileIndex:Index of %s FileParent:^ Up to parent directory FileDirectory:Directory FileName:Name Modified: trunk/netsurf/!NetSurf/Resources/fr/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/fr/M... ============================================================================== --- trunk/netsurf/!NetSurf/Resources/fr/Messages (original) +++ trunk/netsurf/!NetSurf/Resources/fr/Messages Thu Jul 15 17:19:01 2010 @@ -653,6 +653,7 @@ # Directory browser # +FileIndex:Index of %s FileParent:^ Up to parent directory FileDirectory:Directory FileName:Name Modified: trunk/netsurf/!NetSurf/Resources/it/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/it/M... ============================================================================== --- trunk/netsurf/!NetSurf/Resources/it/Messages (original) +++ trunk/netsurf/!NetSurf/Resources/it/Messages Thu Jul 15 17:19:01 2010 @@ -658,6 +658,7 @@ # Directory browser # +FileIndex:Index of %s FileParent:^ Up to parent directory FileDirectory:Directory FileName:Name Modified: trunk/netsurf/!NetSurf/Resources/nl/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/nl/M... ============================================================================== --- trunk/netsurf/!NetSurf/Resources/nl/Messages (original) +++ trunk/netsurf/!NetSurf/Resources/nl/Messages Thu Jul 15 17:19:01 2010 @@ -653,6 +653,7 @@ # Directory browser # +FileIndex:Index of %s FileParent:^ Up to parent directory FileDirectory:Directory FileName:Name Modified: trunk/netsurf/render/directory.c URL: http://source.netsurf-browser.org/trunk/netsurf/render/directory.c?rev=10... ============================================================================== --- trunk/netsurf/render/directory.c (original) +++ trunk/netsurf/render/directory.c Thu Jul 15 17:19:01 2010 @@ -176,13 +176,29 @@ bool dirlist_generate_title(char *title, char *buffer, int buffer_length) { - int error = snprintf(buffer, buffer_length, + int error = 0; + int index_title_length = strlen(title) + + strlen(messages_get("FileIndex")); + char *index_title = malloc(index_title_length); + + if(index_title == NULL) + /* Title buffer allocation error */ + return false; + + error = snprintf(index_title, index_title_length, + messages_get("FileIndex"), + title); + if (error < 0 || error >= index_title_length) + /* Error or buffer too small */ + return false; + + error = snprintf(buffer, buffer_length, "</style>\n" - "<title>Index of %s</title>\n" + "<title>%s</title>\n" "</head>\n" "<body>\n" - "<h1>Index of %s</h1>\n", - title, title); + "<h1>%s</h1>\n", + index_title, index_title); if (error < 0 || error >= buffer_length) /* Error or buffer too small */ return false;

12 years, 6 months

1
0
0 / 0

r10644 chris_y - /trunk/netsurf/render/directory.c

by netsurf＠semichrome.net

Author: chris_y Date: Thu Jul 15 16:58:36 2010 New Revision: 10644 URL: http://source.netsurf-browser.org?rev=10644&view=rev Log: fix crash Modified: trunk/netsurf/render/directory.c Modified: trunk/netsurf/render/directory.c URL: http://source.netsurf-browser.org/trunk/netsurf/render/directory.c?rev=10... ============================================================================== --- trunk/netsurf/render/directory.c (original) +++ trunk/netsurf/render/directory.c Thu Jul 15 16:58:36 2010 @@ -570,8 +570,8 @@ strncpy(modtime, "-", sizeof modtime); if (directory) { - mimetype = (char*)messages_get( - "FileDirectory"); + mimetype = strdup((char*)messages_get( + "FileDirectory")); filesize = -1; } else { mimetype = fetch_mimetype(filepath);

12 years, 6 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 July 2010