diff options
| author | Fumitoshi UKAI <ukai@debian.or.jp> | 2003-01-17 17:05:57 +0000 |
|---|---|---|
| committer | Fumitoshi UKAI <ukai@debian.or.jp> | 2003-01-17 17:05:57 +0000 |
| commit | c09389519e3b83e995e8ea30e1bc424e55c437ba (patch) | |
| tree | ceadd73b0818fe3273b9daa4a92dbd95d20183b1 /file.c | |
| parent | fix indent (diff) | |
| download | w3m-c09389519e3b83e995e8ea30e1bc424e55c437ba.tar.gz w3m-c09389519e3b83e995e8ea30e1bc424e55c437ba.zip | |
[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>
Diffstat (limited to 'file.c')
| -rw-r--r-- | file.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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 <sys/types.h> #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) { |