[w3m-dev 03823] Re: etc.c: treatment for "%7E" is added to expandName()

* url.c (parseURL2): file unquote
* etc.c (expandName): revert previous changes
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>

3 files changed, 12 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index eebf30d..1bfde58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-14  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+	* [w3m-dev 03823] Re: etc.c: treatment for "%7E" is added to  expandName()
+	* url.c (parseURL2): file unquote
+	* etc.c (expandName): revert previous changes
+
 2003-03-14  Fumitoshi UKAI  <ukai@debian.or.jp>
 
 	* [w3m-dev 03822] Re: etc.c: treatment for "%7E" is added to  expandName()
@@ -7535,4 +7541,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.794 2003/03/13 15:40:40 ukai Exp $
+$Id: ChangeLog,v 1.795 2003/03/13 17:47:45 ukai Exp $
diff --git a/etc.c b/etc.c
index ce95a42..d3fed39 100644
--- a/etc.c
+++ b/etc.c
@@ -1,4 +1,4 @@
-/* $Id: etc.c,v 1.69 2003/03/13 15:40:47 ukai Exp $ */
+/* $Id: etc.c,v 1.70 2003/03/13 17:47:49 ukai Exp $ */
 #include "fm.h"
 #include <pwd.h>
 #include "myctype.h"
@@ -1552,8 +1552,7 @@ expandName(char *name)
 	return NULL;
     p = name;
     if (*p == '/') {
-	if (((*(p + 1) == '~' && IS_ALPHA(*(p + 2)))
-	     || (strncasecmp(p + 1, "%7e", 3) == 0))
+	if ((*(p + 1) == '~' && IS_ALPHA(*(p + 2)))
 	    && personal_document_root) {
 	    char *q;
 	    p += 2;
diff --git a/url.c b/url.c
index 560c7fd..07b6e32 100644
--- a/url.c
+++ b/url.c
@@ -1,4 +1,4 @@
-/* $Id: url.c,v 1.74 2003/02/05 16:44:00 ukai Exp $ */
+/* $Id: url.c,v 1.75 2003/03/13 17:47:52 ukai Exp $ */
 #include "fm.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -994,9 +994,9 @@ parseURL2(char *url, ParsedURL *pu, ParsedURL *current)
 	    }
 	}
 	return;
-    }
+    }n
     if (pu->scheme == SCM_LOCAL)
-	pu->file = expandName(pu->file);
+	pu->file = file_quote(expandName(file_unquote(pu->file)));
 
     if (current && (pu->scheme == current->scheme ||
 		    (pu->scheme == SCM_FTP && current->scheme == SCM_FTPDIR) ||