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

Merge with git+ssh://pasky.or.cz/srv/git/elinks.git

Browse Source
This commit is contained in:
Jonas Fonseca 2006-01-21 23:38:15 +01:00 committed by Jonas Fonseca
commit ba3e4a611d
7 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.in
View File

@ -1136,6 +1136,7 @@ EL_ARG_ENABLE(CONFIG_FINGER, finger, [Finger protocol],
dnl =================================================================== dnl ===================================================================
dnl FSP protocol dnl FSP protocol
dnl =================================================================== dnl ===================================================================
EL_SAVE_FLAGS
if test "x${enable_fsp}" != xno; then if test "x${enable_fsp}" != xno; then
AC_CHECK_HEADERS(fsplib.h, HAVE_FSPLIB=yes, HAVE_FSPLIB=no) AC_CHECK_HEADERS(fsplib.h, HAVE_FSPLIB=yes, HAVE_FSPLIB=no)
@ -1156,6 +1157,10 @@ fi
EL_ARG_DEPEND(CONFIG_FSP, fsp, [HAVE_FSPLIB:yes], [FSP protocol], EL_ARG_DEPEND(CONFIG_FSP, fsp, [HAVE_FSPLIB:yes], [FSP protocol],
[ --enable-fsp enable FSP protocol support]) [ --enable-fsp enable FSP protocol support])
if test "x$CONFIG_FSP" = xno; then
EL_RESTORE_FLAGS
fi
EL_ARG_ENABLE(CONFIG_FTP, ftp, [FTP protocol], EL_ARG_ENABLE(CONFIG_FTP, ftp, [FTP protocol],
[ --disable-ftp disable ftp protocol support]) [ --disable-ftp disable ftp protocol support])

5
src/main/object.h
View File

@ -15,8 +15,9 @@ struct object {
}; };
#define OBJECT_HEAD(type) \ #define OBJECT_HEAD(type) \
LIST_HEAD(type); \ type *next; \
struct object object; type *prev; \
struct object object
struct object_head { struct object_head {
OBJECT_HEAD(struct object *); OBJECT_HEAD(struct object *);

2
src/network/connection.c
View File

@ -847,7 +847,7 @@ load_uri(struct uri *uri, struct uri *referrer, struct download *download,
struct cache_entry *cached; struct cache_entry *cached;
struct connection *conn; struct connection *conn;
struct uri *proxy_uri, *proxied_uri; struct uri *proxy_uri, *proxied_uri;
enum connection_state connection_state = S_OK; int connection_state = S_OK;
if (download) { if (download) {
download->conn = NULL; download->conn = NULL;

4
src/network/connection.h
View File

@ -86,8 +86,8 @@ int has_keepalive_connection(struct connection *);
void add_keepalive_connection(struct connection *conn, long timeout_in_seconds, void add_keepalive_connection(struct connection *conn, long timeout_in_seconds,
void (*done)(struct connection *)); void (*done)(struct connection *));
void abort_connection(struct connection *, int); void abort_connection(struct connection *, enum connection_state);
void retry_connection(struct connection *, int); void retry_connection(struct connection *, enum connection_state);
void change_connection(struct download *old, struct download *new, void change_connection(struct download *old, struct download *new,
enum connection_priority newpri, int interrupt); enum connection_priority newpri, int interrupt);

4
src/network/dns.c
View File

@ -77,7 +77,7 @@ static struct dnsquery *dns_queue = NULL;
static INIT_LIST_HEAD(dns_cache); static INIT_LIST_HEAD(dns_cache);
static void done_dns_lookup(struct dnsquery *query, int res); static void done_dns_lookup(struct dnsquery *query, enum dns_result res);
/* DNS cache management: */ /* DNS cache management: */
@ -136,7 +136,7 @@ del_dns_cache_entry(struct dnsentry *dnsentry)
/* Synchronous DNS lookup management: */ /* Synchronous DNS lookup management: */
int enum dns_result
do_real_lookup(unsigned char *name, struct sockaddr_storage **addrs, int *addrno, do_real_lookup(unsigned char *name, struct sockaddr_storage **addrs, int *addrno,
int in_thread) int in_thread)
{ {

2
src/network/state.c
View File

@ -140,7 +140,7 @@ static INIT_LIST_HEAD(strerror_buf); /* struct strerror_val */
* It never returns NULL (if one changes that, be warn that * It never returns NULL (if one changes that, be warn that
* callers may not test for this condition) --Zas */ * callers may not test for this condition) --Zas */
unsigned char * unsigned char *
get_state_message(int state, struct terminal *term) get_state_message(enum connection_state state, struct terminal *term)
{ {
unsigned char *e; unsigned char *e;
struct strerror_val *s; struct strerror_val *s;

2
src/protocol/ftp/ftp.c
View File

@ -126,7 +126,7 @@ static void ftp_pass_info(struct socket *, struct read_buffer *);
static void ftp_retr_file(struct socket *, struct read_buffer *); static void ftp_retr_file(struct socket *, struct read_buffer *);
static void ftp_got_final_response(struct socket *, struct read_buffer *); static void ftp_got_final_response(struct socket *, struct read_buffer *);
static void got_something_from_data_connection(struct connection *); static void got_something_from_data_connection(struct connection *);
static void ftp_end_request(struct connection *, int); static void ftp_end_request(struct connection *, enum connection_state);
static struct ftp_connection_info *add_file_cmd_to_str(struct connection *); static struct ftp_connection_info *add_file_cmd_to_str(struct connection *);
static void ftp_data_accept(struct connection *conn); static void ftp_data_accept(struct connection *conn);