commit 419b8b28d683888627fcc749a888b7d93fdcc904
parent c776e1ca43fef2649be35d8e440ec15c7508dfb7
Author: ukai <ukai>
Date: Fri, 15 Nov 2002 16:46:07 +0000
[w3m-dev 03441] charset of save file
* file.c (_doFileCopy): use conv_from_system()
(doFileSave): conv_from_system()
* main.c (DownloadListBuffer): conv_from_system()
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
Diffstat:
3 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -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
diff --git a/file.c b/file.c
@@ -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();
diff --git a/main.c b/main.c
@@ -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;