From c09389519e3b83e995e8ea30e1bc424e55c437ba Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Fri, 17 Jan 2003 17:05:57 +0000 Subject: [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 --- file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'file.c') diff --git a/file.c b/file.c index 99f0a1c..1e7b4cf 100644 --- a/file.c +++ b/file.c @@ -1,4 +1,4 @@ -/* $Id: file.c,v 1.188 2003/01/17 16:57:19 ukai Exp $ */ +/* $Id: file.c,v 1.189 2003/01/17 17:06:01 ukai Exp $ */ #include "fm.h" #include #include "myctype.h" @@ -7454,7 +7454,7 @@ _doFileCopy(char *tmpf, char *defstr, int download) p = unescape_spaces(Strnew_charp(q))->ptr; p = conv_to_system(q); } - p = expandName(p); + p = expandPath(p); if (checkOverWrite(p) < 0) return -1; } @@ -7511,7 +7511,7 @@ _doFileCopy(char *tmpf, char *defstr, int download) if (*p == '|' && PermitSaveToPipe) is_pipe = TRUE; else { - p = expandName(p); + p = expandPath(p); if (checkOverWrite(p) < 0) return -1; } @@ -7606,7 +7606,7 @@ doFileSave(URLFile uf, char *defstr) *(p + 1) = '\0'; if (*q == '\0') return -1; - p = expandName(q); + p = expandPath(q); if (checkOverWrite(p) < 0) return -1; if (checkSaveFile(uf.stream, p) < 0) { -- cgit v1.2.3