diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | file.c | 17 | ||||
| -rw-r--r-- | main.c | 4 |
3 files changed, 20 insertions, 10 deletions
@@ -1,5 +1,12 @@ 2002-11-16 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp> + * [w3m-dev 03441] charset of save file + * file.c (_doFileCopy): use conv_from_system() + (doFileSave): conv_from_system() + * main.c (DownloadListBuffer): conv_from_system() + +2002-11-16 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp> + * [w3m-dev 03440] Re: restore alarm event * fm.h (BP_RELOAD): added (DOWNLOAD_LIST_TITLE): added @@ -4814,4 +4821,4 @@ a * [w3m-dev 03276] compile error on EWS4800 * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.524 2002/11/15 16:14:25 ukai Exp $ +$Id: ChangeLog,v 1.525 2002/11/15 16:46:07 ukai Exp $ @@ -1,4 +1,4 @@ -/* $Id: file.c,v 1.120 2002/11/15 15:57:16 ukai Exp $ */ +/* $Id: file.c,v 1.121 2002/11/15 16:46:09 ukai Exp $ */ #include "fm.h" #include <sys/types.h> #include "myctype.h" @@ -7214,13 +7214,14 @@ _doFileCopy(char *tmpf, char *defstr, int download) return; } if (checkCopyFile(tmpf, p) < 0) { - msg = Sprintf("Can't copy. %s and %s are identical.", tmpf, p); + msg = Sprintf("Can't copy. %s and %s are identical.", + conv_from_system(tmpf), conv_from_system(p)); disp_err_message(msg->ptr, FALSE); return; } if (!download) { if (_MoveFile(tmpf, p) < 0) { - msg = Sprintf("Can't save to %s", p); + msg = Sprintf("Can't save to %s", conv_from_system(p)); disp_err_message(msg->ptr, FALSE); } return; @@ -7251,7 +7252,7 @@ _doFileCopy(char *tmpf, char *defstr, int download) } if (!stat(tmpf, &st)) size = st.st_size; - addDownloadList(pid, tmpf, p, lock, size); + addDownloadList(pid, conv_from_system(tmpf), p, lock, size); } else { q = searchKeyData(); @@ -7314,13 +7315,14 @@ doFileSave(URLFile uf, char *defstr) if (checkOverWrite(p) < 0) return; if (checkSaveFile(uf.stream, p) < 0) { - msg = Sprintf("Can't save. Load file and %s are identical.", p); + msg = Sprintf("Can't save. Load file and %s are identical.", + conv_from_system(p)); disp_err_message(msg->ptr, FALSE); return; } /* * if (save2tmp(uf, p) < 0) { - * msg = Sprintf("Can't save to %s", p); + * msg = Sprintf("Can't save to %s", conv_from_system(p)); * disp_err_message(msg->ptr, FALSE); * } */ @@ -7349,7 +7351,8 @@ doFileSave(URLFile uf, char *defstr) unlink(lock); exit(0); } - addDownloadList(pid, uf.url, p, lock, current_content_length); + addDownloadList(pid, uf.url, p, lock, + current_content_length); } else { q = searchKeyData(); @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.139 2002/11/15 16:17:00 ukai Exp $ */ +/* $Id: main.c,v 1.140 2002/11/15 16:46:12 ukai Exp $ */ #define MAINPROGRAM #include "fm.h" #include <signal.h> @@ -5828,7 +5828,7 @@ DownloadListBuffer(void) d->ok = TRUE; Strcat_charp(src, "<pre>\n"); Strcat(src, Sprintf("%s\n --> %s\n ", html_quote(d->url), - html_quote(d->save))); + html_quote(conv_from_system(d->save)))); duration = cur_time - d->time; if (!stat(d->save, &st)) { size = st.st_size; |