[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, 34 insertions, 22 deletions

diff --git a/etc.c b/etc.c
index c48771d..52366c0 100644
--- a/etc.c
+++ b/etc.c
@@ -1,4 +1,4 @@
-/* $Id: etc.c,v 1.50 2003/01/17 16:57:18 ukai Exp $ */
+/* $Id: etc.c,v 1.51 2003/01/17 17:06:00 ukai Exp $ */
 #include "fm.h"
 #include <pwd.h>
 #include "myctype.h"
@@ -1046,10 +1046,13 @@ parsePasswd(FILE * fp, int netrc)
 FILE *
 openSecretFile(char *fname)
 {
+    char *efname;
     struct stat st;
+
     if (fname == NULL)
 	return NULL;
-    if (stat(expandName(fname), &st) < 0)
+    efname = expandPath(fname);
+    if (stat(efname, &st) < 0)
 	return NULL;
 
     /* check permissions, if group or others readable or writable,
@@ -1076,7 +1079,7 @@ openSecretFile(char *fname)
 	return NULL;
     }
 
-    return fopen(expandName(fname), "r");
+    return fopen(efname, "r");
 }
 
 void
@@ -1429,35 +1432,44 @@ myEditor(char *cmd, char *file, int line)
 char *
 expandName(char *name)
 {
-    Str userName = NULL;
     char *p;
     struct passwd *passent, *getpwnam(const char *);
-    Str extpath = Strnew();
+    Str extpath = NULL;
 
+    if (name == NULL)
+	return NULL;
     p = name;
-    if (*p == '/' && *(p + 1) == '~' && IS_ALPHA(*(p + 2))) {
-	if (personal_document_root != NULL) {
-	    userName = Strnew();
+    if (*p == '/') {
+	if (*(p + 1) == '~' && IS_ALPHA(*(p + 2)) && personal_document_root) {
+	    char *q;
 	    p += 2;
-	    while (IS_ALNUM(*p) || *p == '_' || *p == '-')
-		Strcat_char(userName, *(p++));
-	    passent = getpwnam(userName->ptr);
-	    if (passent == NULL) {
-		p = name;
-		goto rest;
+	    q = strchr(p, '/');
+            if (q) {			/* /~user/dir... */
+		passent = getpwnam(allocStr(p, q - p));
+		p = q;
+	    }
+	    else {			/* /~user */
+		passent = getpwnam(p);
+		p = "";
 	    }
-	    Strcat_charp(extpath, passent->pw_dir);
-	    Strcat_char(extpath, '/');
-	    Strcat_charp(extpath, personal_document_root);
-	    if (Strcmp_charp(extpath, "/") == 0 && *p == '/')
+	    if (!passent)
+		goto rest;
+	    extpath = Strnew_m_charp(passent->pw_dir, "/",
+				     personal_document_root, NULL);
+	    if (*personal_document_root == '\0' && *p == '/')
 		p++;
 	}
+	else
+	    goto rest;
+	if (Strcmp_charp(extpath, "/") == 0 && *p == '/')
+	    p++;
+	Strcat_charp(extpath, p);
+	return extpath->ptr;
     }
     else
-	p = expandPath(p);
+	return expandPath(p);
   rest:
-    Strcat_charp(extpath, p);
-    return extpath->ptr;
+    return name;
 }
 
 char *
@@ -1471,7 +1483,7 @@ file_to_url(char *file)
     char *host = NULL;
 #endif
 
-    file = expandName(file);
+    file = expandPath(file);
 #ifdef SUPPORT_NETBIOS_SHARE
     if (file[0] == '/' && file[1] == '/') {
 	char *p;