[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>

1 files changed, 10 insertions, 6 deletions

diff --git a/proto.h b/proto.h
index a9d0dd3..c2ea361 100644
--- a/proto.h
+++ b/proto.h
@@ -1,4 +1,4 @@
-/* $Id: proto.h,v 1.77 2003/01/11 15:54:09 ukai Exp $ */
+/* $Id: proto.h,v 1.78 2003/01/15 16:11:43 ukai Exp $ */
 /* 
  *   This file was automatically generated by version 1.7 of cextract.
  *   Manual editing not recommended.
@@ -218,7 +218,7 @@ extern void loadHTMLstream(URLFile *f, Buffer *newBuf, FILE * src,
 			   int internal);
 extern Buffer *loadHTMLString(Str page);
 #ifdef USE_GOPHER
-extern Buffer *loadGopherDir(URLFile *uf, Buffer *newBuf);
+extern Str loadGopherDir(URLFile *uf, ParsedURL *pu, char *code);
 #endif				/* USE_GOPHER */
 extern Buffer *loadBuffer(URLFile *uf, Buffer *newBuf);
 #ifdef USE_IMAGE
@@ -477,6 +477,8 @@ extern char checkShiftCode(Str buf, unsigned char hint);
 extern char str_to_code(char *str);
 extern char *code_to_str(char code);
 extern void put_sjis(Str os, unsigned char ub, unsigned char lb);
+#else
+#define conv_str(is, fc, tc) (is)
 #endif				/* JP_CHARSET */
 extern void initMimeTypes();
 extern void free_ssl_ctx();
@@ -506,12 +508,13 @@ extern char *guessContentType(char *filename);
 extern TextList *make_domain_list(char *domain_list);
 extern int check_no_proxy(char *domain);
 extern InputStream openFTPStream(ParsedURL *pu, URLFile *uf);
-extern Str readFTPDir(ParsedURL *pu);
+extern Str loadFTPDir(ParsedURL *pu, char *code);
 extern void closeFTP(void);
 extern void disconnectFTP(void);
 #ifdef USE_NNTP
 extern InputStream openNewsStream(ParsedURL *pu);
-extern Str readNewsgroup(ParsedURL *pu);
+extern Str loadNewsgroup(ParsedURL *pu, char *code);
+extern void closeNews(void);
 extern void disconnectNews(void);
 #endif
 extern AnchorList *putAnchor(AnchorList *al, char *url, char *target,
@@ -569,7 +572,7 @@ extern char *auxbinFile(char *base);
 extern char *libFile(char *base);
 extern char *helpFile(char *base);
 extern void setLocalCookie(void);
-extern Buffer *dirBuffer(char *dirname);
+extern Str loadLocalDir(char *dirname);
 extern void set_environ(char *var, char *value);
 extern FILE *localcgi_post(char *, char *, FormList *, char *);
 extern FILE *localcgi_get(char *, char *, char *);
@@ -585,7 +588,8 @@ extern char *last_modified(Buffer *buf);
 extern Str romanNumeral(int n);
 extern Str romanAlphabet(int n);
 extern void reset_signals(void);
-extern void close_all_fds(int i);
+extern void close_all_fds_except(int i, int f);
+#define close_all_fds(i) close_all_fds_except(i, -1)
 #ifdef HAVE_SETPGRP
 extern void myExec(char *command);
 #endif