April 2012 - netsurf-commits - listmaster.pepperfish.net

r13819 mmu_man - /branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c

by netsurf＠semichrome.net

Author: mmu_man Date: Sat Apr 7 06:28:22 2012 New Revision: 13819 URL: http://source.netsurf-browser.org?rev=13819&view=rev Log: There actually seems to be a real RFC for the tn3270: URI scheme. Modified: branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c Modified: branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c URL: http://source.netsurf-browser.org/branches/mmu_man/netsurf-gopher-support... ============================================================================== --- branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c (original) +++ branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c Sat Apr 7 06:28:22 2012 @@ -499,11 +499,7 @@ nice_text); break; case GOPHER_TYPE_TN3270: - /* there seem to be a tn3270: URI scheme drafted at: - * https://datatracker.ietf.org/doc/draft-yevstifeyev-tn3270-uri/ - * we'll likely never find this anymore anyway... - * note it wrongly uses 21 as default port though... - */ + /* tn3270: URI scheme, cf. http://tools.ietf.org/html/rfc6270 */ alt_port = false; if (fields[FIELD_PORT] && fields[FIELD_PORT][0] && strcmp(fields[FIELD_PORT], "23"))

11 years, 1 month

1
0
0 / 0

r13818 mmu_man - /branches/mmu_man/netsurf-gopher-support-v3/!NetSurf/!Boot, feb

by netsurf＠semichrome.net

Author: mmu_man Date: Sat Apr 7 05:11:46 2012 New Revision: 13818 URL: http://source.netsurf-browser.org?rev=13818&view=rev Log: Declare support for gopher URIs to RISC OS. Not sure if that's enough though. Modified: branches/mmu_man/netsurf-gopher-support-v3/!NetSurf/!Boot,feb Modified: branches/mmu_man/netsurf-gopher-support-v3/!NetSurf/!Boot,feb URL: http://source.netsurf-browser.org/branches/mmu_man/netsurf-gopher-support... ============================================================================== --- branches/mmu_man/netsurf-gopher-support-v3/!NetSurf/!Boot,feb (original) +++ branches/mmu_man/netsurf-gopher-support-v3/!NetSurf/!Boot,feb Sat Apr 7 05:11:46 2012 @@ -67,6 +67,7 @@ If (("<Alias$Open_URI_http>" = "") OR ("<NetSurf$ForceVars>" = "1")) Then Set Alias$Open_URI_http /<NetSurf$Dir>.!Run -nowin If (("<Alias$Open_URI_https>" = "") OR ("<NetSurf$ForceVars>" = "1")) Then Set Alias$Open_URI_https /<NetSurf$Dir>.!Run -nowin If (("<Alias$Open_URI_file>" = "") OR ("<NetSurf$ForceVars>" = "1")) Then Set Alias$Open_URI_file /<NetSurf$Dir>.!Run -nowin +If (("<Alias$Open_URI_gopher>" = "") OR ("<NetSurf$ForceVars>" = "1")) Then Set Alias$Open_URI_gopher /<NetSurf$Dir>.!Run -nowin | ANT URL protocol | @@ -79,6 +80,7 @@ If (("<Alias$URLOpen_http>" = "") OR ("<NetSurf$ForceVars>" = "1")) Then Set Alias$URLOpen_http /<NetSurf$Dir>.!Run -url %%*0 If (("<Alias$URLOpen_https>" = "") OR ("<NetSurf$ForceVars>" = "1")) Then Set Alias$URLOpen_https /<NetSurf$Dir>.!Run -url %%*0 If (("<Alias$URLOpen_file>" = "") OR ("<NetSurf$ForceVars>" = "1")) Then Set Alias$URLOpen_file /<NetSurf$Dir>.!Run -url %%*0 +If (("<Alias$URLOpen_gopher>" = "") OR ("<NetSurf$ForceVars>" = "1")) Then Set Alias$URLOpen_gopher /<NetSurf$Dir>.!Run -url %%*0 | Claim HTML and URL files |

11 years, 1 month

1
0
0 / 0

r13817 mmu_man - in /branches/mmu_man/netsurf-gopher-support-v3/content: gopher.c gopher.h

by netsurf＠semichrome.net

Author: mmu_man Date: Sat Apr 7 04:40:10 2012 New Revision: 13817 URL: http://source.netsurf-browser.org?rev=13817&view=rev Log: Doxify comments and add some more. Modified: branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c branches/mmu_man/netsurf-gopher-support-v3/content/gopher.h Modified: branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c URL: http://source.netsurf-browser.org/branches/mmu_man/netsurf-gopher-support... ============================================================================== --- branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c (original) +++ branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c Sat Apr 7 04:40:10 2012 @@ -45,6 +45,7 @@ char *buffer, int buffer_length); static bool gopher_generate_bottom(char *buffer, int buffer_length); +/** Types of fields in a line */ typedef enum { FIELD_NAME, FIELD_SELECTOR, @@ -55,6 +56,7 @@ FIELD_COUNT = FIELD_EOL } gopher_field; +/** Map of gopher types to MIME types */ static struct { gopher_item_type type; const char *mime; @@ -72,6 +74,10 @@ { 0, NULL } }; +/** + * Initialise the state object. + */ + struct gopher_state *gopher_state_create(nsurl *url, struct fetch *fetch_handle) { struct gopher_state *ctx; @@ -85,6 +91,10 @@ ctx->cached = 0; return ctx; } + +/** + * Finalise the state object. + */ void gopher_state_free(struct gopher_state *s) { @@ -200,6 +210,11 @@ } +/** + * Escape a string using HTML entities. + * + * \return malloc()ed string. + */ static char *html_escape_string(const char *str) { @@ -243,6 +258,11 @@ return nice_str; } +/** + * Generate a title based on the directory path. + * + * \return malloc()ed string. + */ static char *gen_nice_title(const char *path) { Modified: branches/mmu_man/netsurf-gopher-support-v3/content/gopher.h URL: http://source.netsurf-browser.org/branches/mmu_man/netsurf-gopher-support... ============================================================================== --- branches/mmu_man/netsurf-gopher-support-v3/content/gopher.h (original) +++ branches/mmu_man/netsurf-gopher-support-v3/content/gopher.h Sat Apr 7 04:40:10 2012 @@ -26,45 +26,48 @@ #include <stddef.h> +/** Type of Gopher items */ typedef enum { - GOPHER_TYPE_NONE = 0, /* none set */ - GOPHER_TYPE_ENDOFPAGE = '.', /* alone on a line */ + GOPHER_TYPE_NONE = 0, /**< none set */ + GOPHER_TYPE_ENDOFPAGE = '.', /**< a dot alone on a line */ /* these come from http://tools.ietf.org/html/rfc1436 */ - GOPHER_TYPE_TEXTPLAIN = '0', - GOPHER_TYPE_DIRECTORY = '1', - GOPHER_TYPE_CSO_SEARCH = '2', - GOPHER_TYPE_ERROR = '3', /* error message */ - GOPHER_TYPE_BINHEX = '4', /* binhex encoded text */ - GOPHER_TYPE_BINARCHIVE = '5', /* binary archive file */ - GOPHER_TYPE_UUENCODED = '6', /* uuencoded text */ - GOPHER_TYPE_QUERY = '7', /* search query */ - GOPHER_TYPE_TELNET = '8', /* telnet link */ - GOPHER_TYPE_BINARY = '9', - GOPHER_TYPE_DUPSERV = '+', /* duplicated server */ - GOPHER_TYPE_GIF = 'g', /* GIF image */ - GOPHER_TYPE_IMAGE = 'I', /* image (depends, usually jpeg) */ - GOPHER_TYPE_TN3270 = 'T', /* tn3270 session */ + GOPHER_TYPE_TEXTPLAIN = '0', /**< text/plain */ + GOPHER_TYPE_DIRECTORY = '1', /**< gopher directory */ + GOPHER_TYPE_CSO_SEARCH = '2', /**< CSO search */ + GOPHER_TYPE_ERROR = '3', /**< error message */ + GOPHER_TYPE_BINHEX = '4', /**< binhex encoded text */ + GOPHER_TYPE_BINARCHIVE = '5', /**< binary archive file */ + GOPHER_TYPE_UUENCODED = '6', /**< uuencoded text */ + GOPHER_TYPE_QUERY = '7', /**< gopher search query */ + GOPHER_TYPE_TELNET = '8', /**< telnet link */ + GOPHER_TYPE_BINARY = '9', /**< generic binary */ + GOPHER_TYPE_DUPSERV = '+', /**< duplicated server */ + GOPHER_TYPE_GIF = 'g', /**< GIF image */ + GOPHER_TYPE_IMAGE = 'I', /**< image (depends, usually jpeg) */ + GOPHER_TYPE_TN3270 = 'T', /**< tn3270 session */ /* not standardized but widely used, * cf. http://en.wikipedia.org/wiki/Gopher_%28protocol%29#Gopher_item_types */ - GOPHER_TYPE_HTML = 'h', /* HTML file or URL */ - GOPHER_TYPE_INFO = 'i', /* information text */ - GOPHER_TYPE_AUDIO = 's', /* audio (wav?) */ + GOPHER_TYPE_HTML = 'h', /**< HTML file or URL */ + GOPHER_TYPE_INFO = 'i', /**< information text */ + GOPHER_TYPE_AUDIO = 's', /**< audio (wav?) */ /* not standardized, some servers use them */ - GOPHER_TYPE_PDF_ALT = 'd', /* seems to be only for PDF files */ - GOPHER_TYPE_PNG = 'p', /* cf. gopher://namcub.accelera-labs.com/1/pics */ - GOPHER_TYPE_MIME = 'M', /* multipart/mixed MIME data */ - /* cf. http://www.pms.ifi.lmu.de/mitarbeiter/ohlbach/multimedia/IT/IBMtutorial/3... */ + GOPHER_TYPE_PDF_ALT = 'd', /**< seems to be only for PDF files */ + GOPHER_TYPE_PNG = 'p', /**< PNG image */ + /* cf. gopher://namcub.accelera-labs.com/1/pics */ + GOPHER_TYPE_MIME = 'M', /**< multipart/mixed MIME data */ + /* cf. http://www.pms.ifi.lmu.de/mitarbeiter/ohlbach/multimedia/IT/IBMtutorial/3... */ /* cf. http://nofixedpoint.motd.org/2011/02/22/an-introduction-to-the-gopher-pro... */ - GOPHER_TYPE_PDF = 'P', /* PDF files */ - GOPHER_TYPE_BITMAP = ':', /* Bitmap images (Gopher+) */ - GOPHER_TYPE_MOVIE = ';', /* Movies (Gopher+) */ - GOPHER_TYPE_SOUND = ';', /* Sound (Gopher+) */ - GOPHER_TYPE_CALENDAR = 'c', /* Calendar */ - GOPHER_TYPE_EVENT = 'e', /* Event */ - GOPHER_TYPE_MBOX = 'm', /* mbox file */ + GOPHER_TYPE_PDF = 'P', /**< PDF file */ + GOPHER_TYPE_BITMAP = ':', /**< Bitmap image (Gopher+) */ + GOPHER_TYPE_MOVIE = ';', /**< Movie (Gopher+) */ + GOPHER_TYPE_SOUND = ';', /**< Sound (Gopher+) */ + GOPHER_TYPE_CALENDAR = 'c', /**< Calendar */ + GOPHER_TYPE_EVENT = 'e', /**< Event */ + GOPHER_TYPE_MBOX = 'm', /**< mbox file */ } gopher_item_type; +/** gopher-specific page state */ struct gopher_state { char type; /**< Gopher document type */ nsurl *url; /**< the fetched URL */

11 years, 1 month

1
0
0 / 0

r13816 mmu_man - /branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c

by netsurf＠semichrome.net

Author: mmu_man Date: Fri Apr 6 22:13:31 2012 New Revision: 13816 URL: http://source.netsurf-browser.org?rev=13816&view=rev Log: Add handling of CSO for completeness. Modified: branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c Modified: branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c URL: http://source.netsurf-browser.org/branches/mmu_man/netsurf-gopher-support... ============================================================================== --- branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c (original) +++ branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c Fri Apr 6 22:13:31 2012 @@ -497,6 +497,24 @@ " "HTML_LF, username ? username : "", username ? "@" : "", + fields[FIELD_HOST], + alt_port ? ":" : "", + alt_port ? fields[FIELD_PORT] : "", + nice_text); + break; + case GOPHER_TYPE_CSO_SEARCH: + /* CSO search. + * At least Lynx supports a cso:// URI scheme: + * http://lynx.isc.org/lynx2.8.5/lynx2-8-5/lynx_help/lynx_url_support.html + */ + alt_port = false; + if (fields[FIELD_PORT] && fields[FIELD_PORT][0] && + strcmp(fields[FIELD_PORT], "105")) + alt_port = true; + error = snprintf(buffer, buffer_length, + "<a href=\"cso://%s%s%s\">"HTML_LF + "%s</a>"HTML_LF + " "HTML_LF, fields[FIELD_HOST], alt_port ? ":" : "", alt_port ? fields[FIELD_PORT] : "",

11 years, 1 month

1
0
0 / 0

r13815 mmu_man - in /branches/mmu_man/netsurf-gopher-support-v3/content: gopher.c gopher.h

by netsurf＠semichrome.net

Author: mmu_man Date: Fri Apr 6 21:44:25 2012 New Revision: 13815 URL: http://source.netsurf-browser.org?rev=13815&view=rev Log: Some more gopher item types. Modified: branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c branches/mmu_man/netsurf-gopher-support-v3/content/gopher.h Modified: branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c URL: http://source.netsurf-browser.org/branches/mmu_man/netsurf-gopher-support... ============================================================================== --- branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c (original) +++ branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c Fri Apr 6 21:44:25 2012 @@ -66,6 +66,7 @@ { GOPHER_TYPE_GIF, "image/gif" }, { GOPHER_TYPE_HTML, "text/html" }, /* those are not standardized */ + { GOPHER_TYPE_PDF_ALT, "application/pdf" }, { GOPHER_TYPE_PDF, "application/pdf" }, { GOPHER_TYPE_PNG, "image/png"}, { 0, NULL } @@ -504,6 +505,7 @@ case GOPHER_TYPE_GIF: case GOPHER_TYPE_IMAGE: case GOPHER_TYPE_PNG: + case GOPHER_TYPE_BITMAP: /* quite dangerous, cf. gopher://namcub.accela-labs.com/1/pics */ if (nsoption_bool(gopher_inline_images)) { error = snprintf(buffer, buffer_length, @@ -578,6 +580,7 @@ } break; case GOPHER_TYPE_AUDIO: + case GOPHER_TYPE_SOUND: error = snprintf(buffer, buffer_length, "<a href=\"gopher://%s%s%s/%c%s\">"HTML_LF "%s</a>"HTML_LF Modified: branches/mmu_man/netsurf-gopher-support-v3/content/gopher.h URL: http://source.netsurf-browser.org/branches/mmu_man/netsurf-gopher-support... ============================================================================== --- branches/mmu_man/netsurf-gopher-support-v3/content/gopher.h (original) +++ branches/mmu_man/netsurf-gopher-support-v3/content/gopher.h Fri Apr 6 21:44:25 2012 @@ -51,11 +51,18 @@ GOPHER_TYPE_INFO = 'i', /* information text */ GOPHER_TYPE_AUDIO = 's', /* audio (wav?) */ /* not standardized, some servers use them */ - GOPHER_TYPE_PDF = 'd', /* seems to be only for PDF files */ + GOPHER_TYPE_PDF_ALT = 'd', /* seems to be only for PDF files */ GOPHER_TYPE_PNG = 'p', /* cf. gopher://namcub.accelera-labs.com/1/pics */ - GOPHER_TYPE_MIME = 'M' /* multipart/mixed MIME data */ + GOPHER_TYPE_MIME = 'M', /* multipart/mixed MIME data */ /* cf. http://www.pms.ifi.lmu.de/mitarbeiter/ohlbach/multimedia/IT/IBMtutorial/3... */ /* cf. http://nofixedpoint.motd.org/2011/02/22/an-introduction-to-the-gopher-pro... */ + GOPHER_TYPE_PDF = 'P', /* PDF files */ + GOPHER_TYPE_BITMAP = ':', /* Bitmap images (Gopher+) */ + GOPHER_TYPE_MOVIE = ';', /* Movies (Gopher+) */ + GOPHER_TYPE_SOUND = ';', /* Sound (Gopher+) */ + GOPHER_TYPE_CALENDAR = 'c', /* Calendar */ + GOPHER_TYPE_EVENT = 'e', /* Event */ + GOPHER_TYPE_MBOX = 'm', /* mbox file */ } gopher_item_type; struct gopher_state {

11 years, 1 month

1
0
0 / 0

r13814 mmu_man - /branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c

by netsurf＠semichrome.net

Author: mmu_man Date: Fri Apr 6 21:13:55 2012 New Revision: 13814 URL: http://source.netsurf-browser.org?rev=13814&view=rev Log: Partial implementation of the TITLE resource. Modified: branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c Modified: branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c URL: http://source.netsurf-browser.org/branches/mmu_man/netsurf-gopher-support... ============================================================================== --- branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c (original) +++ branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c Fri Apr 6 21:13:55 2012 @@ -566,9 +566,16 @@ } break; case GOPHER_TYPE_INFO: - error = snprintf(buffer, buffer_length, - "%s "HTML_LF, - nice_text); + if ((fields[FIELD_SELECTOR] && + strcmp(fields[FIELD_SELECTOR], "TITLE")) == 0) { + error = snprintf(buffer, buffer_length, + "<h2>%s</h2> "HTML_LF, + nice_text); + } else { + error = snprintf(buffer, buffer_length, + "%s "HTML_LF, + nice_text); + } break; case GOPHER_TYPE_AUDIO: error = snprintf(buffer, buffer_length,

11 years, 1 month

1
0
0 / 0

r13813 mmu_man - in /branches/mmu_man/netsurf-gopher-support-v3: !NetSurf/Resources/internal.css, f79 content/fetchers/resource.c

by netsurf＠semichrome.net

Author: mmu_man Date: Fri Apr 6 20:19:24 2012 New Revision: 13813 URL: http://source.netsurf-browser.org?rev=13813&view=rev Log: Use lowercase name for resource icons for gopher. Add them to the valid resource files list. Modified: branches/mmu_man/netsurf-gopher-support-v3/!NetSurf/Resources/internal.css,f79 branches/mmu_man/netsurf-gopher-support-v3/content/fetchers/resource.c Modified: branches/mmu_man/netsurf-gopher-support-v3/!NetSurf/Resources/internal.css,f79 URL: http://source.netsurf-browser.org/branches/mmu_man/netsurf-gopher-support... ============================================================================== --- branches/mmu_man/netsurf-gopher-support-v3/!NetSurf/Resources/internal.css,f79 (original) +++ branches/mmu_man/netsurf-gopher-support-v3/!NetSurf/Resources/internal.css,f79 Fri Apr 6 20:19:24 2012 @@ -217,17 +217,17 @@ color: #f00; } body#gopher span.dir { - background-image: url('resource:Icons/directory.png'); + background-image: url('resource:icons/directory.png'); background-repeat: no-repeat; background-position: bottom left; } body#gopher span.text { - background-image: url('resource:Icons/content.png'); + background-image: url('resource:icons/content.png'); background-repeat: no-repeat; background-position: bottom left; } body#gopher span.query { - background-image: url('resource:Icons/search.png'); + background-image: url('resource:icons/search.png'); background-repeat: no-repeat; background-position: bottom left; } Modified: branches/mmu_man/netsurf-gopher-support-v3/content/fetchers/resource.c URL: http://source.netsurf-browser.org/branches/mmu_man/netsurf-gopher-support... ============================================================================== --- branches/mmu_man/netsurf-gopher-support-v3/content/fetchers/resource.c (original) +++ branches/mmu_man/netsurf-gopher-support-v3/content/fetchers/resource.c Fri Apr 6 20:19:24 2012 @@ -80,7 +80,10 @@ "credits.html", "licence.html", "favicon.ico", - "netsurf.png" + "netsurf.png", + "icons/content.png", + "icons/directory.png", + "icons/search.png" }; static struct fetch_resource_map_entry { lwc_string *path;

11 years, 1 month

1
0
0 / 0

r13812 mmu_man - /branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c

by netsurf＠semichrome.net

Author: mmu_man Date: Fri Apr 6 20:17:00 2012 New Revision: 13812 URL: http://source.netsurf-browser.org?rev=13812&view=rev Log: Change fprintf(stderr) to LOG() calls and remove unneeded \n. Modified: branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c Modified: branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c URL: http://source.netsurf-browser.org/branches/mmu_man/netsurf-gopher-support... ============================================================================== --- branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c (original) +++ branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c Fri Apr 6 20:17:00 2012 @@ -113,7 +113,7 @@ size_t remaining = size; size_t left; fetch_msg msg; - /*fprintf(stderr, "%s(,, %d)\n", __FUNCTION__, size);*/ + LOG(("gopher %p, (,, %d)", s, size)); /* actually called when done getting it all */ if (size == 0) @@ -137,7 +137,7 @@ * than the input buffer... */ - /*fprintf(stderr, "iteration: cached %d remaining %d\n", s->cached, remaining);*/ + LOG(("iteration: cached %d remaining %d", s->cached, remaining)); p = s->input; left = MIN(sizeof(s->input) - s->cached, remaining); @@ -147,7 +147,7 @@ s->cached += left; left = s->cached; - /*fprintf(stderr, "copied: cached %d remaining %d\n", s->cached, remaining);*/ + LOG(("copied: cached %d remaining %d", s->cached, remaining)); if (!s->head_done) { @@ -180,7 +180,7 @@ while (gopher_generate_row(&p, &left, buffer, sizeof(buffer))) { - /*fprintf(stderr, "done row, left %d\n", left);*/ + LOG(("done row, left %d", left)); /* send data to the caller */ /*LOG(("FETCH_DATA"));*/ msg.type = FETCH_DATA; @@ -188,7 +188,7 @@ msg.data.header_or_data.len = strlen(buffer); fetch_send_callback(&msg, s->fetch_handle); } - /*fprintf(stderr, "last row, left %d\n", left);*/ + LOG(("last row, left %d", left)); /* move the remainder to the beginning of the buffer */ if (left) @@ -587,7 +587,7 @@ type, fields[FIELD_SELECTOR]); break; default: - LOG(("warning: unknown gopher item type 0x%02x '%c'\n", type, type)); + LOG(("warning: unknown gopher item type 0x%02x '%c'", type, type)); error = snprintf(buffer, buffer_length, "<a href=\"gopher://%s%s%s/%c%s\">"HTML_LF "%s</a>"HTML_LF @@ -638,7 +638,7 @@ if (!type) { type = *p; if (!type || type == '\n' || type == '\r') { - LOG(("warning: invalid gopher item type 0x%02x\n", type)); + LOG(("warning: invalid gopher item type 0x%02x", type)); } s++; continue; @@ -646,15 +646,15 @@ switch (*p) { case '\n': if (field > 0) { - LOG(("warning: unterminated gopher item '%c'\n", type)); + LOG(("warning: unterminated gopher item '%c'", type)); } /* FALLTHROUGH */ case '\r': if (sz < 1 || p[1] != '\n') { - LOG(("warning: CR without LF in gopher item '%c'\n", type)); + LOG(("warning: CR without LF in gopher item '%c'", type)); } if (field < FIELD_PORT && type != '.') { - LOG(("warning: unterminated gopher item '%c'\n", type)); + LOG(("warning: unterminated gopher item '%c'", type)); } fields[field] = malloc(p - s + 1); memcpy(fields[field], s, p - s); @@ -680,7 +680,7 @@ return ok; case '\x09': if (field >= FIELD_GPFLAG) { - LOG(("warning: extra tab in gopher item '%c'\n", type)); + LOG(("warning: extra tab in gopher item '%c'", type)); break; } fields[field] = malloc(p - s + 1);

11 years, 1 month

1
0
0 / 0

r13811 mmu_man - /trunk/libdom/src/core/element.c

by netsurf＠semichrome.net

Author: mmu_man Date: Fri Apr 6 19:23:10 2012 New Revision: 13811 URL: http://source.netsurf-browser.org?rev=13811&view=rev Log: Fix a crash on http://gopher.floodgap.com/overbite/ _dom_element_attr_list_node_clone() forgot to init the list entry. Added some asserts. Modified: trunk/libdom/src/core/element.c Modified: trunk/libdom/src/core/element.c URL: http://source.netsurf-browser.org/trunk/libdom/src/core/element.c?rev=138... ============================================================================== --- trunk/libdom/src/core/element.c (original) +++ trunk/libdom/src/core/element.c Fri Apr 6 19:23:10 2012 @@ -182,6 +182,8 @@ static void _dom_element_attr_list_insert(dom_attr_list *list, dom_attr_list *new_attr) { + assert(list != NULL); + assert(new_attr != NULL); list_append(&list->list, &new_attr->list); } @@ -213,6 +215,7 @@ } attr = _dom_element_attr_list_next(attr); + assert(attr != NULL); } while (attr != list); return NULL; @@ -397,6 +400,8 @@ new_list_node = malloc(sizeof(*new_list_node)); if (new_list_node == NULL) return NULL; + + list_init(&new_list_node->list); new_list_node->name = NULL; new_list_node->namespace = NULL;

11 years, 1 month

1
0
0 / 0

r13810 mmu_man - in /trunk/libcss/src: parse/important.c select/properties/helpers.c

by netsurf＠semichrome.net

Author: mmu_man Date: Fri Apr 6 18:50:20 2012 New Revision: 13810 URL: http://source.netsurf-browser.org?rev=13810&view=rev Log: Fix debug build (warnings about comparing different enums). Modified: trunk/libcss/src/parse/important.c trunk/libcss/src/select/properties/helpers.c Modified: trunk/libcss/src/parse/important.c URL: http://source.netsurf-browser.org/trunk/libcss/src/parse/important.c?rev=... ============================================================================== --- trunk/libcss/src/parse/important.c (original) +++ trunk/libcss/src/parse/important.c Fri Apr 6 18:50:20 2012 @@ -100,10 +100,10 @@ case CSS_PROP_BORDER_LEFT_COLOR: case CSS_PROP_BACKGROUND_COLOR: case CSS_PROP_COLUMN_RULE_COLOR: - assert(BACKGROUND_COLOR_SET == - BORDER_COLOR_SET); - assert(BACKGROUND_COLOR_SET == - COLUMN_RULE_COLOR_SET); + assert((uint32_t)BACKGROUND_COLOR_SET == + (uint32_t)BORDER_COLOR_SET); + assert((uint32_t)BACKGROUND_COLOR_SET == + (uint32_t)COLUMN_RULE_COLOR_SET); if (value == BACKGROUND_COLOR_SET) offset++; /* colour */ @@ -113,10 +113,12 @@ case CSS_PROP_CUE_AFTER: case CSS_PROP_CUE_BEFORE: case CSS_PROP_LIST_STYLE_IMAGE: - assert(BACKGROUND_IMAGE_URI == CUE_AFTER_URI); - assert(BACKGROUND_IMAGE_URI == CUE_BEFORE_URI); - assert(BACKGROUND_IMAGE_URI == - LIST_STYLE_IMAGE_URI); + assert((uint32_t)BACKGROUND_IMAGE_URI == + (uint32_t)CUE_AFTER_URI); + assert((uint32_t)BACKGROUND_IMAGE_URI == + (uint32_t)CUE_BEFORE_URI); + assert((uint32_t)BACKGROUND_IMAGE_URI == + (uint32_t)LIST_STYLE_IMAGE_URI); if (value == BACKGROUND_IMAGE_URI) offset++; /* string table entry */ @@ -141,9 +143,10 @@ case CSS_PROP_BORDER_LEFT_WIDTH: case CSS_PROP_OUTLINE_WIDTH: case CSS_PROP_COLUMN_RULE_WIDTH: - assert(BORDER_WIDTH_SET == OUTLINE_WIDTH_SET); - assert(BORDER_WIDTH_SET == - COLUMN_RULE_WIDTH_SET); + assert((uint32_t)BORDER_WIDTH_SET == + (uint32_t)OUTLINE_WIDTH_SET); + assert((uint32_t)BORDER_WIDTH_SET == + (uint32_t)COLUMN_RULE_WIDTH_SET); if (value == BORDER_WIDTH_SET) offset += 2; /* length + units */ @@ -161,14 +164,14 @@ case CSS_PROP_WIDTH: case CSS_PROP_COLUMN_WIDTH: case CSS_PROP_COLUMN_GAP: - assert(BOTTOM_SET == LEFT_SET); - assert(BOTTOM_SET == RIGHT_SET); - assert(BOTTOM_SET == TOP_SET); - assert(BOTTOM_SET == HEIGHT_SET); - assert(BOTTOM_SET == MARGIN_SET); - assert(BOTTOM_SET == WIDTH_SET); - assert(BOTTOM_SET == COLUMN_WIDTH_SET); - assert(BOTTOM_SET == COLUMN_GAP_SET); + assert((uint32_t)BOTTOM_SET == (uint32_t)LEFT_SET); + assert((uint32_t)BOTTOM_SET == (uint32_t)RIGHT_SET); + assert((uint32_t)BOTTOM_SET == (uint32_t)TOP_SET); + assert((uint32_t)BOTTOM_SET == (uint32_t)HEIGHT_SET); + assert((uint32_t)BOTTOM_SET == (uint32_t)MARGIN_SET); + assert((uint32_t)BOTTOM_SET == (uint32_t)WIDTH_SET); + assert((uint32_t)BOTTOM_SET == (uint32_t)COLUMN_WIDTH_SET); + assert((uint32_t)BOTTOM_SET == (uint32_t)COLUMN_GAP_SET); if (value == BOTTOM_SET) offset += 2; /* length + units */ @@ -230,8 +233,8 @@ case CSS_PROP_COUNTER_INCREMENT: case CSS_PROP_COUNTER_RESET: - assert(COUNTER_INCREMENT_NONE == - COUNTER_RESET_NONE); + assert((uint32_t)COUNTER_INCREMENT_NONE == + (uint32_t)COUNTER_RESET_NONE); while (value != COUNTER_INCREMENT_NONE) { offset+=2; /* string + integer */ @@ -276,7 +279,8 @@ case CSS_PROP_LETTER_SPACING: case CSS_PROP_WORD_SPACING: - assert(LETTER_SPACING_SET == WORD_SPACING_SET); + assert((uint32_t)LETTER_SPACING_SET == + (uint32_t)WORD_SPACING_SET); if (value == LETTER_SPACING_SET) offset += 2; /* length + units */ @@ -296,7 +300,7 @@ case CSS_PROP_MAX_HEIGHT: case CSS_PROP_MAX_WIDTH: - assert(MAX_HEIGHT_SET == MAX_WIDTH_SET); + assert((uint32_t)MAX_HEIGHT_SET == (uint32_t)MAX_WIDTH_SET); if (value == MAX_HEIGHT_SET) offset += 2; /* length + units */ @@ -311,11 +315,11 @@ case CSS_PROP_PAUSE_AFTER: case CSS_PROP_PAUSE_BEFORE: case CSS_PROP_TEXT_INDENT: - assert(MIN_HEIGHT_SET == MIN_WIDTH_SET); - assert(MIN_HEIGHT_SET == PADDING_SET); - assert(MIN_HEIGHT_SET == PAUSE_AFTER_SET); - assert(MIN_HEIGHT_SET == PAUSE_BEFORE_SET); - assert(MIN_HEIGHT_SET == TEXT_INDENT_SET); + assert((uint32_t)MIN_HEIGHT_SET == (uint32_t)MIN_WIDTH_SET); + assert((uint32_t)MIN_HEIGHT_SET == (uint32_t)PADDING_SET); + assert((uint32_t)MIN_HEIGHT_SET == (uint32_t)PAUSE_AFTER_SET); + assert((uint32_t)MIN_HEIGHT_SET == (uint32_t)PAUSE_BEFORE_SET); + assert((uint32_t)MIN_HEIGHT_SET == (uint32_t)TEXT_INDENT_SET); if (value == MIN_HEIGHT_SET) offset += 2; /* length + units */ @@ -331,10 +335,10 @@ case CSS_PROP_RICHNESS: case CSS_PROP_STRESS: case CSS_PROP_WIDOWS: - assert(ORPHANS_SET == PITCH_RANGE_SET); - assert(ORPHANS_SET == RICHNESS_SET); - assert(ORPHANS_SET == STRESS_SET); - assert(ORPHANS_SET == WIDOWS_SET); + assert((uint32_t)ORPHANS_SET == (uint32_t)PITCH_RANGE_SET); + assert((uint32_t)ORPHANS_SET == (uint32_t)RICHNESS_SET); + assert((uint32_t)ORPHANS_SET == (uint32_t)STRESS_SET); + assert((uint32_t)ORPHANS_SET == (uint32_t)WIDOWS_SET); if (value == ORPHANS_SET) offset++; /* value */ Modified: trunk/libcss/src/select/properties/helpers.c URL: http://source.netsurf-browser.org/trunk/libcss/src/select/properties/help... ============================================================================== --- trunk/libcss/src/select/properties/helpers.c (original) +++ trunk/libcss/src/select/properties/helpers.c Fri Apr 6 18:50:20 2012 @@ -52,10 +52,12 @@ uint16_t value = CSS_BACKGROUND_COLOR_INHERIT; css_color color = 0; - assert(CSS_BACKGROUND_COLOR_INHERIT == CSS_BORDER_COLOR_INHERIT); - assert(CSS_BACKGROUND_COLOR_COLOR == CSS_BORDER_COLOR_COLOR); - assert(CSS_BACKGROUND_COLOR_CURRENT_COLOR == - CSS_BORDER_COLOR_CURRENT_COLOR); + assert((uint16_t)CSS_BACKGROUND_COLOR_INHERIT == + (uint16_t)CSS_BORDER_COLOR_INHERIT); + assert((uint16_t)CSS_BACKGROUND_COLOR_COLOR == + (uint16_t)CSS_BORDER_COLOR_COLOR); + assert((uint16_t)CSS_BACKGROUND_COLOR_CURRENT_COLOR == + (uint16_t)CSS_BORDER_COLOR_CURRENT_COLOR); if (isInherit(opv) == false) { switch (getValue(opv)) {

11 years, 1 month

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits April 2012