aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-09-29 03:17:53 -04:00
Code

file: Directory listings are in the system charset.

Browse Source 
Give them a corresponding Content-Type header.  This must go in
cached->head because cached->content_type is supposed to be just
type/subtype.  It will also be deduced from cached->head, so don't set
it separately.
This commit is contained in:
Kalle Olavi Niemitalo 2007-03-20 10:07:51 +02:00 committed by Kalle Olavi Niemitalo
parent baee24bb3c
commit 9a8fa9d7db
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/protocol/file/file.c
View File

@ -77,7 +77,7 @@ struct module file_protocol_module = struct_module(
/* Directory listing */
/* Based on the @entry attributes and file-/dir-/linkname is added to the @data
* fragment. */
* fragment. All the strings are in the system charset. */
static inline void
add_dir_entry(struct directory_entry *entry, struct string *page,
int pathlen, unsigned char *dircolor)
@ -242,7 +242,7 @@ file_protocol_handler(struct connection *connection)
unsigned char *redirect_location = NULL;
struct string page, name;
enum connection_state state;
unsigned char *type = NULL;
int set_dir_content_type = 0;
if (get_cmd_opt_bool("anonymous")) {
if (strcmp(connection->uri->string, "file:///dev/stdin")
@ -280,7 +280,7 @@ file_protocol_handler(struct connection *connection)
state = S_OK;
} else {
state = list_directory(connection, name.source, &page);
type = "text/html";
set_dir_content_type = 1;
}
} else {
@ -323,17 +323,24 @@ file_protocol_handler(struct connection *connection)
add_fragment(cached, 0, page.source, page.length);
connection->from += page.length;
if (!cached->content_type) {
unsigned char *ctype = null_or_stracpy(type);
if (!cached->head && set_dir_content_type) {
unsigned char *head;
/* If the system charset somehow
* changes after the directory listing
* has been generated, it should be
* parsed with the original charset. */
head = straconcat("\r\nContent-Type: text/html; charset=",
get_cp_mime_name(get_cp_index("System")),
"\r\n", (unsigned char *) NULL);
/* Not so gracefully handle failed memory
* allocation. */
if (type && !ctype)
if (!head)
state = S_OUT_OF_MEM;
/* Setup file read or directory listing for
* viewing. */
mem_free_set(&cached->content_type, ctype);
/* Setup directory listing for viewing. */
mem_free_set(&cached->head, head);
}
done_string(&page);