diff options
| author | Dai Sato <satodai@w3m.jp> | 2006-04-05 14:18:53 +0000 |
|---|---|---|
| committer | Dai Sato <satodai@w3m.jp> | 2006-04-05 14:18:53 +0000 |
| commit | bc7f9c90263523dc9c19c63c520cbc8f46c3cbdb (patch) | |
| tree | e7632ff276fbfed9e41e487bad1375f46c1f4fa7 /indep.c | |
| parent | replace pclose passed to localcgi_post/get() with fclose in openURL() (diff) | |
| download | w3m-bc7f9c90263523dc9c19c63c520cbc8f46c3cbdb.tar.gz w3m-bc7f9c90263523dc9c19c63c520cbc8f46c3cbdb.zip | |
apply multiple patches on w3m-dev(-en) ML since Jun 2005 to Jan 2006.
Diffstat (limited to 'indep.c')
| -rw-r--r-- | indep.c | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -1,7 +1,9 @@ -/* $Id: indep.c,v 1.35 2004/04/09 17:18:49 ukai Exp $ */ +/* $Id: indep.c,v 1.36 2006/04/05 14:18:54 inu Exp $ */ #include "fm.h" #include <stdio.h> +#ifndef __MINGW32_VERSION #include <pwd.h> +#endif /* __MINGW32_VERSION */ #include <sys/param.h> #include <sys/types.h> #include <stdlib.h> @@ -225,6 +227,7 @@ expandPath(char *name) p = name; if (*p == '~') { p++; +#ifndef __MINGW32_VERSION if (IS_ALPHA(*p)) { char *q = strchr(p, '/'); if (q) { /* ~user/dir... */ @@ -238,8 +241,9 @@ expandPath(char *name) if (!passent) goto rest; extpath = Strnew_charp(passent->pw_dir); - } - else if (*p == '/' || *p == '\0') { /* ~/dir... or ~ */ + } else +#endif /* __MINGW32_VERSION */ + if (*p == '/' || *p == '\0') { /* ~/dir... or ~ */ extpath = Strnew_charp(getenv("HOME")); } else |