[w3m-dev 03647] expandName() and expandPath()

* etc.c (openSecretFile): use expandPath
	(expandName): rewrite
	(file_to_url): use expandPath
* file.c (_doFileCopy): use expandPath
	(doFileSave): use expandPath
* indep.c (expandPath): rewrite
* linein.c (inputLineHistSearch): use expandPath
	(next_dcompl): use expandPath
	(doComplete): use expandPath
* local.c (set_cgi_environ): rewrite
* mailcap.c (loadMailcap): use expandPath
* main.c (svBuf): use expandPath
	(addDownloadList): use expandPath
* rc.c (init_rc): use expandPath
	(rcFile): rewrite
	(auxbinFile): use expandPath
	(libFile): use expandPath
	(etcFile): use expandPath
	(helpFile): use expandPath
* url.c (loadMimeTypes): use expandPath
	(loadURIMethods): use expandPath
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>

1 files changed, 3 insertions, 3 deletions

diff --git a/main.c b/main.c
index 83a1198..428d2ae 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.194 2003/01/15 17:13:22 ukai Exp $ */
+/* $Id: main.c,v 1.195 2003/01/17 17:06:04 ukai Exp $ */
 #define MAINPROGRAM
 #include "fm.h"
 #include <signal.h>
@@ -4241,7 +4241,7 @@ svBuf(void)
 	    file = unescape_spaces(Strnew_charp(qfile))->ptr;
 	    file = conv_to_system(file);
 	}
-	file = expandName(file);
+	file = expandPath(file);
 	if (checkOverWrite(file) < 0) {
 	    displayBuffer(Currentbuf, B_NORMAL);
 	    return;
@@ -6080,7 +6080,7 @@ addDownloadList(pid_t pid, char *url, char *save, char *lock, clen_t size)
     d->url = url;
     if (save[0] != '/' && save[0] != '~')
 	save = Strnew_m_charp(CurrentDir, "/", save, NULL)->ptr;
-    d->save = expandName(save);
+    d->save = expandPath(save);
     d->lock = lock;
     d->size = size;
     d->time = time(0);