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

r13809 mmu_man - /branches/mmu_man/netsurf-gopher-support-v3/content/fetchers/curl.c

by netsurf＠semichrome.net

Author: mmu_man Date: Fri Apr 6 17:11:59 2012 New Revision: 13809 URL: http://source.netsurf-browser.org?rev=13809&view=rev Log: Fix using an nsurl pointer in place of char *. Fix using uninitialized type when we actually initialize a field in the cookie struct. Convert ugly printfs to LOG calls. Modified: branches/mmu_man/netsurf-gopher-support-v3/content/fetchers/curl.c Modified: branches/mmu_man/netsurf-gopher-support-v3/content/fetchers/curl.c URL: http://source.netsurf-browser.org/branches/mmu_man/netsurf-gopher-support... ============================================================================== --- branches/mmu_man/netsurf-gopher-support-v3/content/fetchers/curl.c (original) +++ branches/mmu_man/netsurf-gopher-support-v3/content/fetchers/curl.c Fri Apr 6 17:11:59 2012 @@ -469,7 +469,7 @@ { struct curl_fetch_info *f; const char *mime; - char type; + f = fetch_curl_setup(parent_fetch, url, only_2xx, post_urlenc, post_multipart, headers); @@ -480,9 +480,10 @@ } if (url_gopher_type(nsurl_access(url), &f->gopher->type) != URL_FUNC_OK - || type == GOPHER_TYPE_NONE) { + || f->gopher->type == GOPHER_TYPE_NONE) { f->http_code = 404; fetch_set_http_code(f->fetch_handle, f->http_code); + LOG(("fetch %p, gopher error for '%s'", f, nsurl_access(url))); } mime = gopher_type_to_mime(f->gopher->type); @@ -490,13 +491,13 @@ * fetch_filetype() is wrongly assuming unknown files to be HTML. */ if (mime == NULL) - mime = fetch_filetype(url); + mime = fetch_filetype(nsurl_access(url)); if (mime) { char s[80]; fetch_msg msg; - fprintf(stderr, "gopher mime is '%s'\n", mime); + LOG(("fetch %p, gopher mime is '%s'", f, mime)); snprintf(s, sizeof s, "Content-type: %s\r\n", mime); s[sizeof s - 1] = 0; msg.type = FETCH_HEADER;

11 years, 1 month

1
0
0 / 0

r13808 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 16:51:42 2012 New Revision: 13808 URL: http://source.netsurf-browser.org?rev=13808&view=rev Log: Apply and merge r12428 from v2 branch: Add a gopher item type 'M' for MIME encoded data, not widely used though. Fix warnings. Comment out debug output. Fix remaining magic chars. 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 16:51:42 2012 @@ -109,11 +109,11 @@ size_t gopher_fetch_data(struct gopher_state *s, char *data, size_t size) { char buffer[1024]; - char *p = data; + const char *p = data; size_t remaining = size; size_t left; fetch_msg msg; - fprintf(stderr, "%s(,, %d)\n", __FUNCTION__, size); + /*fprintf(stderr, "%s(,, %d)\n", __FUNCTION__, 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); + /*fprintf(stderr, "iteration: cached %d remaining %d\n", 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); + /*fprintf(stderr, "copied: cached %d remaining %d\n", 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); + /*fprintf(stderr, "done row, left %d\n", 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); + /*fprintf(stderr, "last row, left %d\n", left);*/ /* move the remainder to the beginning of the buffer */ if (left) @@ -200,9 +200,10 @@ } -static char *html_escape_string(char *str) -{ - char *nice_str, *cnv, *tmp; +static char *html_escape_string(const char *str) +{ + char *nice_str, *cnv; + const char *tmp; if (str == NULL) { return NULL; @@ -244,7 +245,6 @@ static char *gen_nice_title(const char *path) { - const char *tmp; char *nice_path; char *title; int title_length; @@ -279,7 +279,7 @@ * \return MIME type string */ -const char *gopher_type_to_mime(char type) +const char *gopher_type_to_mime(gopher_item_type type) { int i; @@ -297,11 +297,11 @@ * */ -bool gopher_need_generate(char type) +bool gopher_need_generate(gopher_item_type type) { switch (type) { - case '1': - case '7': + case GOPHER_TYPE_DIRECTORY: + case GOPHER_TYPE_QUERY: return true; default: return false; @@ -376,7 +376,7 @@ { char *nice_text; char *redirect_url = NULL; - int error; + int error = 0; bool alt_port = false; char *username = NULL; @@ -509,7 +509,7 @@ error = snprintf(buffer, buffer_length, "<a href=\"gopher://%s%s%s/%c%s\">"HTML_LF "%s "HTML_LF /* */ - //""HTML_LF + /*""HTML_LF*/ "<img src=\"gopher://%s%s%s/%c%s\" alt=\"%s\"/>"HTML_LF "" "</a>" @@ -648,7 +648,7 @@ if (field > 0) { LOG(("warning: unterminated gopher item '%c'\n", type)); } - //FALLTHROUGH + /* FALLTHROUGH */ case '\r': if (sz < 1 || p[1] != '\n') { LOG(("warning: CR without LF in gopher item '%c'\n", type)); 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 16:51:42 2012 @@ -52,7 +52,10 @@ 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_PNG = 'p' /* cf. gopher://namcub.accelera-labs.com/1/pics */ + 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... */ + /* cf. http://nofixedpoint.motd.org/2011/02/22/an-introduction-to-the-gopher-pro... */ } gopher_item_type; struct gopher_state { @@ -70,8 +73,8 @@ size_t gopher_fetch_data(struct gopher_state *s, char *data, size_t size); -const char *gopher_type_to_mime(char type); -bool gopher_need_generate(char type); +const char *gopher_type_to_mime(gopher_item_type type); +bool gopher_need_generate(gopher_item_type type); #endif

11 years, 1 month

1
0
0 / 0

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

by netsurf＠semichrome.net

Author: mmu_man Date: Fri Apr 6 15:06:34 2012 New Revision: 13807 URL: http://source.netsurf-browser.org?rev=13807&view=rev Log: Apply and merge r12405 from v2 branch: Add a case for audio items, that generate an <audio> tag as well, hopefully we'll support this someday. 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 15:06:34 2012 @@ -570,6 +570,22 @@ "%s "HTML_LF, nice_text); break; + case GOPHER_TYPE_AUDIO: + error = snprintf(buffer, buffer_length, + "<a href=\"gopher://%s%s%s/%c%s\">"HTML_LF + "%s</a>"HTML_LF + "<audio src=\"gopher://%s%s%s/%c%s\" controls=\"controls\">" + "[player]</audio>"HTML_LF + " "HTML_LF, + fields[FIELD_HOST], + alt_port ? ":" : "", + alt_port ? fields[FIELD_PORT] : "", + type, fields[FIELD_SELECTOR], nice_text, + fields[FIELD_HOST], + alt_port ? ":" : "", + alt_port ? fields[FIELD_PORT] : "", + type, fields[FIELD_SELECTOR]); + break; default: LOG(("warning: unknown gopher item type 0x%02x '%c'\n", type, type)); error = snprintf(buffer, buffer_length,

11 years, 1 month

1
0
0 / 0

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

by netsurf＠semichrome.net

Author: mmu_man Date: Fri Apr 6 15:05:15 2012 New Revision: 13806 URL: http://source.netsurf-browser.org?rev=13806&view=rev Log: Apply and merge r12404 from v2 branch: Remove resolved TODO. 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 15:05:15 2012 @@ -325,7 +325,6 @@ * seems to trigger a reparsing of the gopher data itself as html... * "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n" */ - /* TODO: move this to clean CSS in internal.css */ "<link rel=\"stylesheet\" title=\"Standard\" " "type=\"text/css\" href=\"resource:internal.css\">\n");

11 years, 1 month

1
0
0 / 0

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

by netsurf＠semichrome.net

Author: mmu_man Date: Fri Apr 6 15:04:00 2012 New Revision: 13805 URL: http://source.netsurf-browser.org?rev=13805&view=rev Log: Apply and merge r12403 from v2 branch: Use enum members as indices to the fields[] array instead of numbers. 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 15:04:00 2012 @@ -44,6 +44,16 @@ static bool gopher_generate_row(const char **data, size_t *size, char *buffer, int buffer_length); static bool gopher_generate_bottom(char *buffer, int buffer_length); + +typedef enum { + FIELD_NAME, + FIELD_SELECTOR, + FIELD_HOST, + FIELD_PORT, + FIELD_GPFLAG, + FIELD_EOL, + FIELD_COUNT = FIELD_EOL +} gopher_field; static struct { gopher_item_type type; @@ -362,7 +372,7 @@ * Internal worker called by gopher_generate_row(). */ -static bool gopher_generate_row_internal(char type, char *fields[5], +static bool gopher_generate_row_internal(char type, char *fields[FIELD_COUNT], char *buffer, int buffer_length) { char *nice_text; @@ -371,11 +381,12 @@ bool alt_port = false; char *username = NULL; - if (fields[3] && fields[3][0] && strcmp(fields[3], "70")) + if (fields[FIELD_PORT] && fields[FIELD_PORT][0] + && strcmp(fields[FIELD_PORT], "70")) alt_port = true; /* escape html special characters */ - nice_text = html_escape_string(fields[0]); + nice_text = html_escape_string(fields[FIELD_NAME]); /* XXX: outputting \n generates better looking html code, * but currently screws up indentation due to a bug. @@ -393,20 +404,20 @@ "<a href=\"gopher://%s%s%s/%c%s\">"HTML_LF "%s</a>"HTML_LF " "HTML_LF, - fields[2], + fields[FIELD_HOST], alt_port ? ":" : "", - alt_port ? fields[3] : "", - type, fields[1], nice_text); + alt_port ? fields[FIELD_PORT] : "", + type, fields[FIELD_SELECTOR], nice_text); break; case GOPHER_TYPE_BINARY: error = snprintf(buffer, buffer_length, "<a href=\"gopher://%s%s%s/%c%s\">"HTML_LF "%s</a>"HTML_LF " "HTML_LF, - fields[2], + fields[FIELD_HOST], alt_port ? ":" : "", - alt_port ? fields[3] : "", - type, fields[1], nice_text); + alt_port ? fields[FIELD_PORT] : "", + type, fields[FIELD_SELECTOR], nice_text); break; case GOPHER_TYPE_DIRECTORY: /* @@ -416,10 +427,10 @@ "<a href=\"gopher://%s%s%s/%c%s\">"HTML_LF "%s</a>"HTML_LF " "HTML_LF, - fields[2], + fields[FIELD_HOST], alt_port ? ":" : "", - alt_port ? fields[3] : "", - type, fields[1], nice_text); + alt_port ? fields[FIELD_PORT] : "", + type, fields[FIELD_SELECTOR], nice_text); break; case GOPHER_TYPE_ERROR: error = snprintf(buffer, buffer_length, @@ -439,10 +450,10 @@ "</label>" "</form>"HTML_LF " "HTML_LF, - fields[2], + fields[FIELD_HOST], alt_port ? ":" : "", - alt_port ? fields[3] : "", - type, fields[1], nice_text); + alt_port ? fields[FIELD_PORT] : "", + type, fields[FIELD_SELECTOR], nice_text); break; case GOPHER_TYPE_TELNET: /* telnet: links @@ -450,9 +461,10 @@ * -> gopher://78.80.30.202:23/8/ps3/new -> new(a)78.80.30.202 */ alt_port = false; - if (fields[3] && fields[3][0] && strcmp(fields[3], "23")) + if (fields[FIELD_PORT] && fields[FIELD_PORT][0] && + strcmp(fields[FIELD_PORT], "23")) alt_port = true; - username = strrchr(fields[1], '/'); + username = strrchr(fields[FIELD_SELECTOR], '/'); if (username) username++; error = snprintf(buffer, buffer_length, @@ -461,9 +473,9 @@ " "HTML_LF, username ? username : "", username ? "@" : "", - fields[2], + fields[FIELD_HOST], alt_port ? ":" : "", - alt_port ? fields[3] : "", + alt_port ? fields[FIELD_PORT] : "", nice_text); break; case GOPHER_TYPE_TN3270: @@ -473,9 +485,10 @@ * note it wrongly uses 21 as default port though... */ alt_port = false; - if (fields[3] && fields[3][0] && strcmp(fields[3], "23")) + if (fields[FIELD_PORT] && fields[FIELD_PORT][0] && + strcmp(fields[FIELD_PORT], "23")) alt_port = true; - username = strrchr(fields[1], '/'); + username = strrchr(fields[FIELD_SELECTOR], '/'); if (username) username++; error = snprintf(buffer, buffer_length, @@ -484,9 +497,9 @@ " "HTML_LF, username ? username : "", username ? "@" : "", - fields[2], + fields[FIELD_HOST], alt_port ? ":" : "", - alt_port ? fields[3] : "", + alt_port ? fields[FIELD_PORT] : "", nice_text); break; case GOPHER_TYPE_GIF: @@ -502,15 +515,15 @@ "" "</a>" " "HTML_LF, - fields[2], + fields[FIELD_HOST], alt_port ? ":" : "", - alt_port ? fields[3] : "", - type, fields[1], + alt_port ? fields[FIELD_PORT] : "", + type, fields[FIELD_SELECTOR], nice_text, - fields[2], + fields[FIELD_HOST], alt_port ? ":" : "", - alt_port ? fields[3] : "", - type, fields[1], + alt_port ? fields[FIELD_PORT] : "", + type, fields[FIELD_SELECTOR], nice_text); break; } @@ -519,17 +532,21 @@ "<a href=\"gopher://%s%s%s/%c%s\">"HTML_LF "%s</a>"HTML_LF " "HTML_LF, - fields[2], + fields[FIELD_HOST], alt_port ? ":" : "", - alt_port ? fields[3] : "", - type, fields[1], nice_text); + alt_port ? fields[FIELD_PORT] : "", + type, fields[FIELD_SELECTOR], nice_text); break; case GOPHER_TYPE_HTML: - if (fields[1] && strncmp(fields[1], "URL:", 4) == 0) - redirect_url = fields[1] + 4; + if (fields[FIELD_SELECTOR] && + strncmp(fields[FIELD_SELECTOR], "URL:", SLEN("URL:")) == 0) + redirect_url = fields[FIELD_SELECTOR] + SLEN("URL:"); + /* cf. gopher://pineapple.vg/1 */ - if (fields[1] && strncmp(fields[1], "/URL:", 5) == 0) - redirect_url = fields[1] + 5; + if (fields[FIELD_SELECTOR] && + strncmp(fields[FIELD_SELECTOR], "/URL:", SLEN("/URL:")) == 0) + redirect_url = fields[FIELD_SELECTOR] + SLEN("/URL:"); + if (redirect_url) { error = snprintf(buffer, buffer_length, "<a href=\"%s\">"HTML_LF @@ -543,10 +560,10 @@ "<a href=\"gopher://%s%s%s/%c%s\">"HTML_LF "%s</a>"HTML_LF " "HTML_LF, - fields[2], + fields[FIELD_HOST], alt_port ? ":" : "", - alt_port ? fields[3] : "", - type, fields[1], nice_text); + alt_port ? fields[FIELD_PORT] : "", + type, fields[FIELD_SELECTOR], nice_text); } break; case GOPHER_TYPE_INFO: @@ -560,10 +577,10 @@ "<a href=\"gopher://%s%s%s/%c%s\">"HTML_LF "%s</a>"HTML_LF " "HTML_LF, - fields[2], + fields[FIELD_HOST], alt_port ? ":" : "", - alt_port ? fields[3] : "", - type, fields[1], nice_text); + alt_port ? fields[FIELD_PORT] : "", + type, fields[FIELD_SELECTOR], nice_text); break; } @@ -596,7 +613,7 @@ char type = 0; int field = 0; /* name, selector, host, port, gopher+ flag */ - char *fields[5] = { NULL, NULL, NULL, NULL, NULL }; + char *fields[FIELD_COUNT] = { NULL, NULL, NULL, NULL, NULL }; const char *s = *data; const char *p = *data; int i; @@ -621,7 +638,7 @@ if (sz < 1 || p[1] != '\n') { LOG(("warning: CR without LF in gopher item '%c'\n", type)); } - if (field < 3 && type != '.') { + if (field < FIELD_PORT && type != '.') { LOG(("warning: unterminated gopher item '%c'\n", type)); } fields[field] = malloc(p - s + 1); @@ -631,7 +648,7 @@ ;/* XXX: signal end of page? For now we just ignore it. */ } ok = gopher_generate_row_internal(type, fields, buffer, buffer_length); - for (i = 0; i < 5; i++) { + for (i = FIELD_NAME; i < FIELD_COUNT; i++) { free(fields[i]); fields[i] = NULL; } @@ -647,7 +664,7 @@ *size = sz; return ok; case '\x09': - if (field >= 4) { + if (field >= FIELD_GPFLAG) { LOG(("warning: extra tab in gopher item '%c'\n", type)); break; }

11 years, 1 month

1
0
0 / 0

r13804 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 14:57:01 2012 New Revision: 13804 URL: http://source.netsurf-browser.org?rev=13804&view=rev Log: Apply and merge r12402 from v2 branch: Use the item type enum in the switch statement instead of magic chars. 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 14:57:01 2012 @@ -384,11 +384,11 @@ /*#define HTML_LF "\n"*/ switch (type) { - case '.': + case GOPHER_TYPE_ENDOFPAGE: /* end of the page */ *buffer = '\0'; break; - case '0': /* text/plain link */ + case GOPHER_TYPE_TEXTPLAIN: error = snprintf(buffer, buffer_length, "<a href=\"gopher://%s%s%s/%c%s\">"HTML_LF "%s</a>"HTML_LF @@ -398,7 +398,7 @@ alt_port ? fields[3] : "", type, fields[1], nice_text); break; - case '9': /* binary */ + case GOPHER_TYPE_BINARY: error = snprintf(buffer, buffer_length, "<a href=\"gopher://%s%s%s/%c%s\">"HTML_LF "%s</a>"HTML_LF @@ -408,7 +408,7 @@ alt_port ? fields[3] : "", type, fields[1], nice_text); break; - case '1': + case GOPHER_TYPE_DIRECTORY: /* * directory link */ @@ -421,14 +421,12 @@ alt_port ? fields[3] : "", type, fields[1], nice_text); break; - case '3': - /* Error - */ + case GOPHER_TYPE_ERROR: error = snprintf(buffer, buffer_length, "%s "HTML_LF, nice_text); break; - case '7': + case GOPHER_TYPE_QUERY: /* TODO: handle search better. * For now we use an unnamed input field and accept sending ?=foo * as it seems at least Veronica-2 ignores the = but it's unclean. @@ -446,7 +444,7 @@ alt_port ? fields[3] : "", type, fields[1], nice_text); break; - case '8': + case GOPHER_TYPE_TELNET: /* telnet: links * cf. gopher://78.80.30.202/1/ps3 * -> gopher://78.80.30.202:23/8/ps3/new -> new(a)78.80.30.202 @@ -468,7 +466,7 @@ alt_port ? fields[3] : "", nice_text); break; - case 'T': + 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... @@ -491,9 +489,9 @@ alt_port ? fields[3] : "", nice_text); break; - case 'g': - case 'I': - case 'p': + case GOPHER_TYPE_GIF: + case GOPHER_TYPE_IMAGE: + case GOPHER_TYPE_PNG: /* quite dangerous, cf. gopher://namcub.accela-labs.com/1/pics */ if (nsoption_bool(gopher_inline_images)) { error = snprintf(buffer, buffer_length, @@ -526,7 +524,7 @@ alt_port ? fields[3] : "", type, fields[1], nice_text); break; - case 'h': + case GOPHER_TYPE_HTML: if (fields[1] && strncmp(fields[1], "URL:", 4) == 0) redirect_url = fields[1] + 4; /* cf. gopher://pineapple.vg/1 */ @@ -551,7 +549,7 @@ type, fields[1], nice_text); } break; - case 'i': + case GOPHER_TYPE_INFO: error = snprintf(buffer, buffer_length, "%s "HTML_LF, nice_text); 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 14:57:01 2012 @@ -28,6 +28,7 @@ typedef enum { GOPHER_TYPE_NONE = 0, /* none set */ + GOPHER_TYPE_ENDOFPAGE = '.', /* alone on a line */ /* these come from http://tools.ietf.org/html/rfc1436 */ GOPHER_TYPE_TEXTPLAIN = '0', GOPHER_TYPE_DIRECTORY = '1',

11 years, 1 month

1
0
0 / 0

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

by netsurf＠semichrome.net

Author: mmu_man Date: Fri Apr 6 14:53:12 2012 New Revision: 13803 URL: http://source.netsurf-browser.org?rev=13803&view=rev Log: Apply and merge r12401 from v2 branch: Add a case for TN2370 gopher items just for fun, there seems to be an IETF draft for the URI scheme: https://datatracker.ietf.org/doc/draft-yevstifeyev-tn3270-uri/ 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 14:53:12 2012 @@ -371,7 +371,7 @@ bool alt_port = false; char *username = NULL; - if (fields[3] && strcmp(fields[3], "70")) + if (fields[3] && fields[3][0] && strcmp(fields[3], "70")) alt_port = true; /* escape html special characters */ @@ -452,13 +452,36 @@ * -> gopher://78.80.30.202:23/8/ps3/new -> new(a)78.80.30.202 */ alt_port = false; - if (fields[3] && strcmp(fields[3], "23")) + if (fields[3] && fields[3][0] && strcmp(fields[3], "23")) alt_port = true; username = strrchr(fields[1], '/'); if (username) username++; error = snprintf(buffer, buffer_length, "<a href=\"telnet://%s%s%s%s%s\">"HTML_LF + "%s</a>"HTML_LF + " "HTML_LF, + username ? username : "", + username ? "@" : "", + fields[2], + alt_port ? ":" : "", + alt_port ? fields[3] : "", + nice_text); + break; + case 'T': + /* 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... + */ + alt_port = false; + if (fields[3] && fields[3][0] && strcmp(fields[3], "23")) + alt_port = true; + username = strrchr(fields[1], '/'); + if (username) + username++; + error = snprintf(buffer, buffer_length, + "<a href=\"tn3270://%s%s%s%s%s\">"HTML_LF "%s</a>"HTML_LF " "HTML_LF, username ? username : "",

11 years, 1 month

1
0
0 / 0

r13802 mmu_man - /branches/mmu_man/netsurf-gopher-support-v3/content/gopher.h

by netsurf＠semichrome.net

Author: mmu_man Date: Fri Apr 6 14:51:42 2012 New Revision: 13802 URL: http://source.netsurf-browser.org?rev=13802&view=rev Log: Apply and merge r12400 from v2 branch: Reorder gopher item types and mention their origin. Modified: branches/mmu_man/netsurf-gopher-support-v3/content/gopher.h 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 14:51:42 2012 @@ -39,13 +39,17 @@ 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 */ + /* 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_IMAGE = 'I', /* image (depends, usually jpeg) */ GOPHER_TYPE_AUDIO = 's', /* audio (wav?) */ - GOPHER_TYPE_TN3270 = 'T', /* tn3270 session */ - /* those are not standardized */ + /* not standardized, some servers use them */ GOPHER_TYPE_PDF = 'd', /* seems to be only for PDF files */ GOPHER_TYPE_PNG = 'p' /* cf. gopher://namcub.accelera-labs.com/1/pics */ } gopher_item_type;

11 years, 1 month

1
0
0 / 0

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

by netsurf＠semichrome.net

Author: mmu_man Date: Fri Apr 6 14:43:56 2012 New Revision: 13801 URL: http://source.netsurf-browser.org?rev=13801&view=rev Log: Apply and merge r12399 from v2 branch: Fix broken size calculation due to uninitialized pointer after factoring out html_escape_string of gen_nice_title. 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 14:43:56 2012 @@ -235,7 +235,7 @@ static char *gen_nice_title(const char *path) { const char *tmp; - char *nice_path, *cnv; + char *nice_path; char *title; int title_length; @@ -246,7 +246,7 @@ } /* Construct a localised title string */ - title_length = (cnv - nice_path) + strlen(messages_get("FileIndex")); + title_length = strlen(nice_path) + strlen(messages_get("FileIndex")); title = malloc(title_length + 1); if (title == NULL) {

11 years, 1 month

1
0
0 / 0

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

by netsurf＠semichrome.net

Author: mmu_man Date: Fri Apr 6 14:36:39 2012 New Revision: 13800 URL: http://source.netsurf-browser.org?rev=13800&view=rev Log: Apply and merge r12398 from v2 branch: Fix boggus SPAN classes. Make error items more visible. Modified: branches/mmu_man/netsurf-gopher-support-v3/!NetSurf/Resources/internal.css,f79 branches/mmu_man/netsurf-gopher-support-v3/content/gopher.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 14:36:39 2012 @@ -213,6 +213,9 @@ font-family: Courier, monospace; white-space: pre; } +body#gopher span.error { + color: #f00; } + body#gopher span.dir { background-image: url('resource:Icons/directory.png'); background-repeat: no-repeat; 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 14:36:39 2012 @@ -459,7 +459,7 @@ username++; error = snprintf(buffer, buffer_length, "<a href=\"telnet://%s%s%s%s%s\">"HTML_LF - "%s</a>"HTML_LF + "%s</a>"HTML_LF " "HTML_LF, username ? username : "", username ? "@" : "", @@ -496,7 +496,7 @@ /* fallback to default, link them */ error = snprintf(buffer, buffer_length, "<a href=\"gopher://%s%s%s/%c%s\">"HTML_LF - "%s</a>"HTML_LF + "%s</a>"HTML_LF " "HTML_LF, fields[2], alt_port ? ":" : "", @@ -512,7 +512,7 @@ if (redirect_url) { error = snprintf(buffer, buffer_length, "<a href=\"%s\">"HTML_LF - "%s</a>"HTML_LF + "%s</a>"HTML_LF " "HTML_LF, redirect_url, nice_text); @@ -520,7 +520,7 @@ /* cf. gopher://sdf.org/1/sdf/classes/ */ error = snprintf(buffer, buffer_length, "<a href=\"gopher://%s%s%s/%c%s\">"HTML_LF - "%s</a>"HTML_LF + "%s</a>"HTML_LF " "HTML_LF, fields[2], alt_port ? ":" : "", @@ -537,7 +537,7 @@ LOG(("warning: unknown gopher item type 0x%02x '%c'\n", type, type)); error = snprintf(buffer, buffer_length, "<a href=\"gopher://%s%s%s/%c%s\">"HTML_LF - "%s</a>"HTML_LF + "%s</a>"HTML_LF " "HTML_LF, fields[2], alt_port ? ":" : "",

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