diff options
| author | Fumitoshi UKAI <ukai@debian.or.jp> | 2003-01-15 16:11:43 +0000 |
|---|---|---|
| committer | Fumitoshi UKAI <ukai@debian.or.jp> | 2003-01-15 16:11:43 +0000 |
| commit | dfd33cccd5e2b4d169eb0f0ca7cccfc998b979b2 (patch) | |
| tree | e48a0e99a4922bf7a8504fbbf03442c12fee49ff /main.c | |
| parent | [w3m-dev 03639] Re: smb.cgi (diff) | |
| download | w3m-dfd33cccd5e2b4d169eb0f0ca7cccfc998b979b2.tar.gz w3m-dfd33cccd5e2b4d169eb0f0ca7cccfc998b979b2.zip | |
[w3m-dev 03640] Re: cleanup (don't close connection of news server)
* anchor.c (_put_ahchor_news): always conv_str
(_put_anchor_all): always conv_str
* etc.c (close_all_fds): deleted
(close_all_fds_except): added, except fd=f is left open
* file.c (guess_filename): added
(UFhalfclose): added
(convertLine): cleanup_line if not raw mode
check uf
(readHeader): always convertLine
(loadGeneralFile): rewrite
(loadGopherDir): return Str, args change to ParsedURL and code
rewrite
(saveBuffer): always conv_str
(_doFileCopy): close_all_fds
(doFileSave): close_all_fds_except
(uncompress_stream): dup, close_all_fds_except
* form.c (form_fputs_decode): always conv_str
(input_textarea): convertLine
* frame.c (createFrameFile): convertLine
* ftp.c (loadFTPDir): arg code
rewrite
(readFTPDir): convertLine
* html.h (UFfileno): added
* image.c (loadImage): close_all_fds
* indep.h (RAW_MODE): added
* local.c (loadLocalDir): return Str
(dirBuffer): rewrite
(localcgi_popen_r): close_all_fds
* main.c (main): check SCM_LOCAL
print err_msg
* news.c (news_command): args cmd and arg
(news_quit): news_command
(openNewsStream): news_command
(readNewsgroup): deleted
(loadNewsgroup): added
(closeNews): added
* proto.h (loadGopherDir): update
(conv_str): define for no JP_CHARSET
(readFTPDir): deleted
(loadFTPDir): added
(readNewsgroup): deleted
(loadNewsgroup): added
(dirBuffer): deleted
(loadLocalDir): added
(close_all_fds): defined by close_all_fds_except
(close_all_fds_except): added
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
Diffstat (limited to 'main.c')
| -rw-r--r-- | main.c | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.191 2003/01/11 16:17:43 ukai Exp $ */ +/* $Id: main.c,v 1.192 2003/01/15 16:11:43 ukai Exp $ */ #define MAINPROGRAM #include "fm.h" #include <signal.h> @@ -889,7 +889,8 @@ main(int argc, char **argv, char **envp) else if (newbuf == NO_BUFFER) continue; if (newbuf->pagerSource || - (newbuf->currentURL.file && strcmp(newbuf->currentURL.file, "-"))) + (newbuf->real_scheme == SCM_LOCAL && newbuf->header_source && + newbuf->currentURL.file && strcmp(newbuf->currentURL.file, "-"))) newbuf->search_header = search_header; if (CurrentTab == NULL) { FirstTab = LastTab = CurrentTab = newTab(); @@ -928,6 +929,8 @@ main(int argc, char **argv, char **envp) } } if (w3m_dump) { + if (err_msg->length) + fprintf(stderr, "%s", err_msg->ptr); #ifdef USE_COOKIE save_cookies(); #endif /* USE_COOKIE */ @@ -4409,7 +4412,9 @@ vwSrc(void) return; } } - else if (Currentbuf->real_scheme == SCM_LOCAL) { + else if (Currentbuf->real_scheme == SCM_LOCAL && + !(Currentbuf->real_type && + !strcasecmp(Currentbuf->real_type, "local:directory"))) { fn = Currentbuf->filename; } else { |