w3m

commit 9da2512f75a067a3600df774d532c59c7c7ba3e7
parent bf606e89ed8c62257aa102c6341de5bac2d089ad
Author: ukai <ukai>
Date:   Thu, 13 Mar 2003 17:47:45 +0000

[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>

Diffstat:
M
ChangeLog
 | 
6
++++++
M
etc.c
 | 
3
+--
M
url.c
 | 
4
++--

3 files changed, 9 insertions(+), 4 deletions(-)
diff --git 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()
diff --git a/etc.c b/etc.c
@@ -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
@@ -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) ||