aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-02-02 15:09:23 -05:00
Code

This years batch of Gopher fixes

Browse Source 
Two crash fixes, and really make the directory 'view' the default.
This commit is contained in:
Jonas Fonseca 2006-01-09 15:13:44 +01:00 committed by Jonas Fonseca
parent dd2516f597
commit 9877579c63
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/protocol/gopher/gopher.c
View File

@ -140,7 +140,7 @@ get_gopher_entity_info(enum gopher_entity type)
{ {
int entry; int entry;
for (entry = 0; entry < sizeof(gopher_entity_info) - 1; entry++) for (entry = 0; entry < sizeof_array(gopher_entity_info) - 1; entry++)
if (gopher_entity_info[entry].type == type) if (gopher_entity_info[entry].type == type)
return &gopher_entity_info[entry]; return &gopher_entity_info[entry];
@ -282,7 +282,7 @@ init_gopher_connection_info(struct connection *conn)
/* Get entity type, and selector string. */ /* Get entity type, and selector string. */
/* Pick up gopher_entity */ /* Pick up gopher_entity */
if (selectorlen > 0) { if (selectorlen > 1 && selector[1] == '/') {
entity = *selector++; entity = *selector++;
selectorlen--; selectorlen--;
} }
@ -296,7 +296,7 @@ init_gopher_connection_info(struct connection *conn)
* _after_ the Gopher entity. If the <entity-char> '/' combo is not * _after_ the Gopher entity. If the <entity-char> '/' combo is not
* found assume that the whole URI data part is the selector. */ * found assume that the whole URI data part is the selector. */
entity_info = get_gopher_entity_info(entity); entity_info = get_gopher_entity_info(entity);
if (entity_info->type == GOPHER_UNKNOWN) { if (entity_info->type == GOPHER_UNKNOWN && entity != GOPHER_UNKNOWN) {
selector--; selector--;
selectorlen++; selectorlen++;
} }
@ -518,7 +518,8 @@ add_gopher_menu_line(struct string *buffer, unsigned char *line)
default: default:
{ {
struct string address; struct string address;
unsigned char *format = *selector ? "%s://%s@%s/" : "%s://%s%s/"; unsigned char *format = selector && *selector
? "%s://%s@%s/" : "%s://%s%s/";
/* If port is defined it means that both @selector and @host /* If port is defined it means that both @selector and @host
* was correctly parsed. */ * was correctly parsed. */