From dfd33cccd5e2b4d169eb0f0ca7cccfc998b979b2 Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Wed, 15 Jan 2003 16:11:43 +0000 Subject: [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 --- form.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'form.c') diff --git a/form.c b/form.c index 2096661..332330e 100644 --- a/form.c +++ b/form.c @@ -1,4 +1,4 @@ -/* $Id: form.c,v 1.27 2003/01/10 16:58:31 ukai Exp $ */ +/* $Id: form.c,v 1.28 2003/01/15 16:11:43 ukai Exp $ */ /* * HTML forms */ @@ -447,11 +447,7 @@ form_fputs_decode(Str s, FILE * f) break; } } -#ifdef JP_CHARSET fputs(conv_str(z, InnerCode, DisplayCode)->ptr, f); -#else /* not JP_CHARSET */ - fputs(z->ptr, f); -#endif /* not JP_CHARSET */ } @@ -462,7 +458,7 @@ input_textarea(FormItemList *fi) Str tmp; FILE *f; #ifdef JP_CHARSET - char code = DisplayCode, ic; + char code = DisplayCode; #endif f = fopen(tmpf, "w"); @@ -497,8 +493,7 @@ input_textarea(FormItemList *fi) Strcat_charp(tmp, "\r\n"); } #ifdef JP_CHARSET - if ((ic = checkShiftCode(tmp, code)) != '\0') - tmp = conv_str(tmp, (code = ic), InnerCode); + tmp = convertLine(NULL, tmp, &code, RAW_MODE); #endif /* not JP_CHARSET */ Strcat(fi->value, tmp); } -- cgit v1.2.3