aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

GOPHER: Blast end_gopher_connection which now only wraps abort_connection

Browse Source
This commit is contained in:
Jonas Fonseca 2006-02-08 21:47:54 +01:00 committed by Jonas Fonseca
parent 854bb90d88
commit 4b91866c84
1 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -329,29 +329,6 @@ init_gopher_connection_info(struct connection *conn)
} }
static void
end_gopher_connection(struct connection *conn, enum connection_state state)
{
if (state == S_OK && conn->cached) {
#if 0
/* Seeing dots at all files .. trying to remove the end-marker
* ".\r\n" */
struct gopher_connection_info *gopher = conn->info;
if (gopher
&& gopher->entity
&& gopher->entity->type != GOPHER_DIRECTORY
&& gopher->entity->type != GOPHER_INDEX
&& gopher->entity->type != GOPHER_CSO) {
conn->from -= 3;
}
#endif
}
abort_connection(conn, state);
}
/* Add a link. The title of the destination is set, as there is no way of /* Add a link. The title of the destination is set, as there is no way of
* knowing what the title is when we arrive. * knowing what the title is when we arrive.
* *
@ -712,7 +689,7 @@ read_gopher_response_data(struct socket *socket, struct read_buffer *rb)
assert(gopher && gopher->entity); assert(gopher && gopher->entity);
if (!conn->cached && !init_gopher_cache_entry(conn)) { if (!conn->cached && !init_gopher_cache_entry(conn)) {
end_gopher_connection(conn, S_OUT_OF_MEM); abort_connection(conn, S_OUT_OF_MEM);
return; return;
} }
@ -762,7 +739,7 @@ read_gopher_response_data(struct socket *socket, struct read_buffer *rb)
} }
if (state != S_TRANS) { if (state != S_TRANS) {
end_gopher_connection(conn, state); abort_connection(conn, state);
return; return;
} }
@ -796,7 +773,7 @@ gopher_protocol_handler(struct connection *conn)
* - FM */ * - FM */
if (uri->datalen == 1 && *uri->data == GOPHER_CSO) { if (uri->datalen == 1 && *uri->data == GOPHER_CSO) {
/* FIXME: redirect_cache() */ /* FIXME: redirect_cache() */
end_gopher_connection(conn, S_GOPHER_CSO_ERROR); abort_connection(conn, S_GOPHER_CSO_ERROR);
} }
break; break;
@ -809,7 +786,7 @@ gopher_protocol_handler(struct connection *conn)
* - FM */ * - FM */
if (uri->datalen >= 1 && *uri->data == GOPHER_FILE) { if (uri->datalen >= 1 && *uri->data == GOPHER_FILE) {
/* FIXME: redirect_cache() */ /* FIXME: redirect_cache() */
end_gopher_connection(conn, S_OK); abort_connection(conn, S_OK);
} }
#endif #endif
break; break;
@ -818,7 +795,7 @@ gopher_protocol_handler(struct connection *conn)
state = init_gopher_connection_info(conn); state = init_gopher_connection_info(conn);
if (state != S_CONN) { if (state != S_CONN) {
/* FIXME: Handle bad selector ... */ /* FIXME: Handle bad selector ... */
end_gopher_connection(conn, state); abort_connection(conn, state);
return; return;
} }