From 7aa417f6d55ba9a158814b01b67abce24a27252f Mon Sep 17 00:00:00 2001
From: Fumitoshi UKAI <ukai@debian.or.jp>
Date: Fri, 15 Nov 2002 16:46:07 +0000
Subject: [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>

---
 ChangeLog |  9 ++++++++-
 file.c    | 17 ++++++++++-------
 main.c    |  4 ++--
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ee8ae23..fb09ae5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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
@@ -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 $
diff --git a/file.c b/file.c
index 7ae370e..8311784 100644
--- a/file.c
+++ b/file.c
@@ -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();
diff --git a/main.c b/main.c
index 212a75c..0960f78 100644
--- a/main.c
+++ b/main.c
@@ -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  --&gt; %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;
-- 
cgit v1.2.3