aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-01-03 14:57:44 -05:00
Code

Merge branch 'master' into http2

Browse Source
This commit is contained in:
Witold Filipczyk 2023-06-28 12:40:56 +02:00
commit 4a7cfb8778
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/document/gemini/renderer.c
View File

@ -180,6 +180,8 @@ render_gemini_document(struct cache_entry *cached, struct document *document,
in_list = 1; in_list = 1;
add_to_string(&html, "<ul>\n"); add_to_string(&html, "<ul>\n");
add_string_to_string(&html, &html_line); add_string_to_string(&html, &html_line);
} else {
add_string_to_string(&html, &html_line);
} }
} else if (in_list) { } else if (in_list) {
in_list = 0; in_list = 0;

2
src/main/select.c
View File

@ -77,7 +77,7 @@ do { \
#define FD_SETSIZE 1024 #define FD_SETSIZE 1024
#endif #endif
#ifdef CONFIG_LIBEVENT #if defined(CONFIG_LIBEVENT) && defined(CONFIG_LIBCURL)
/* Information associated with a specific easy handle */ /* Information associated with a specific easy handle */
typedef struct _ConnInfo typedef struct _ConnInfo

10
src/mime/backend/mailcap.c
View File

@ -122,6 +122,15 @@ static union option_info mailcap_options[] = {
NULL_OPTION_INFO, NULL_OPTION_INFO,
}; };
#ifdef TEST_MAILCAP
#define get_opt_mailcap(which) mailcap_options[(which)].init
#define get_mailcap(which) get_opt_mailcap(which)
#define get_mailcap_ask() get_mailcap(MAILCAP_ASK).value_long
#define get_mailcap_description() get_mailcap(MAILCAP_DESCRIPTION).value_long
#define get_mailcap_enable() get_mailcap(MAILCAP_ENABLE).value_long
#define get_mailcap_prioritize() get_mailcap(MAILCAP_PRIORITIZE).value_long
#define get_mailcap_path() get_mailcap(MAILCAP_PATH).value_dataptr
#else
#define get_opt_mailcap(which) mailcap_options[(which)].option #define get_opt_mailcap(which) mailcap_options[(which)].option
#define get_mailcap(which) get_opt_mailcap(which).value #define get_mailcap(which) get_opt_mailcap(which).value
#define get_mailcap_ask() get_mailcap(MAILCAP_ASK).number #define get_mailcap_ask() get_mailcap(MAILCAP_ASK).number
@ -129,6 +138,7 @@ static union option_info mailcap_options[] = {
#define get_mailcap_enable() get_mailcap(MAILCAP_ENABLE).number #define get_mailcap_enable() get_mailcap(MAILCAP_ENABLE).number
#define get_mailcap_prioritize() get_mailcap(MAILCAP_PRIORITIZE).number #define get_mailcap_prioritize() get_mailcap(MAILCAP_PRIORITIZE).number
#define get_mailcap_path() get_mailcap(MAILCAP_PATH).string #define get_mailcap_path() get_mailcap(MAILCAP_PATH).string
#endif
/* State variables */ /* State variables */
static struct hash *mailcap_map = NULL; static struct hash *mailcap_map = NULL;

4
src/protocol/test/stub.c
View File

@ -52,10 +52,12 @@ STUB_MODULE(file_protocol_module);
STUB_MODULE(finger_protocol_module); STUB_MODULE(finger_protocol_module);
STUB_MODULE(fsp_protocol_module); STUB_MODULE(fsp_protocol_module);
STUB_MODULE(ftp_protocol_module); STUB_MODULE(ftp_protocol_module);
STUB_MODULE(ftpes_protocol_module);
STUB_MODULE(gemini_protocol_module); STUB_MODULE(gemini_protocol_module);
STUB_MODULE(gopher_protocol_module); STUB_MODULE(gopher_protocol_module);
STUB_MODULE(http_protocol_module); STUB_MODULE(http_protocol_module);
STUB_MODULE(nntp_protocol_module); STUB_MODULE(nntp_protocol_module);
STUB_MODULE(sftp_protocol_module);
STUB_MODULE(smb_protocol_module); STUB_MODULE(smb_protocol_module);
STUB_MODULE(uri_rewrite_module); STUB_MODULE(uri_rewrite_module);
STUB_MODULE(user_protocol_module); STUB_MODULE(user_protocol_module);
@ -90,12 +92,14 @@ STUB_PROTOCOL_HANDLER(file_protocol_handler);
STUB_PROTOCOL_HANDLER(finger_protocol_handler); STUB_PROTOCOL_HANDLER(finger_protocol_handler);
STUB_PROTOCOL_HANDLER(fsp_protocol_handler); STUB_PROTOCOL_HANDLER(fsp_protocol_handler);
STUB_PROTOCOL_HANDLER(ftp_protocol_handler); STUB_PROTOCOL_HANDLER(ftp_protocol_handler);
STUB_PROTOCOL_HANDLER(ftpes_protocol_handler);
STUB_PROTOCOL_HANDLER(gemini_protocol_handler); STUB_PROTOCOL_HANDLER(gemini_protocol_handler);
STUB_PROTOCOL_HANDLER(gopher_protocol_handler); STUB_PROTOCOL_HANDLER(gopher_protocol_handler);
STUB_PROTOCOL_HANDLER(http_protocol_handler); STUB_PROTOCOL_HANDLER(http_protocol_handler);
STUB_PROTOCOL_HANDLER(news_protocol_handler); STUB_PROTOCOL_HANDLER(news_protocol_handler);
STUB_PROTOCOL_HANDLER(nntp_protocol_handler); STUB_PROTOCOL_HANDLER(nntp_protocol_handler);
STUB_PROTOCOL_HANDLER(proxy_protocol_handler); STUB_PROTOCOL_HANDLER(proxy_protocol_handler);
STUB_PROTOCOL_HANDLER(sftp_protocol_handler);
STUB_PROTOCOL_HANDLER(smb_protocol_handler); STUB_PROTOCOL_HANDLER(smb_protocol_handler);
STUB_PROTOCOL_EXTERNAL_HANDLER(user_protocol_handler); STUB_PROTOCOL_EXTERNAL_HANDLER(user_protocol_handler);