commit acc8f08a55235b700328959d15867b037794333a
parent 0026ee129d1ba6e5467d6a5e78278fa14386a819
Author: ukai <ukai>
Date: Thu, 22 Nov 2001 13:30:02 +0000
[w3m-dev 02497]
From: WATANABE Katsuyuki <katsuyuki_1.watanabe@toppan.co.jp>
Diffstat:
3 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-22 WATANABE Katsuyuki <katsuyuki_1.watanabe@toppan.co.jp>
+
+ * [w3m-dev 02497]
+ * url.c (parseURL2): fix #ifdef __EMX__ code
+ * indep.c (cleanupName): remove #if 0 /* SUPPORT_NETBIOS_SHARE */ code
+
2001-11-22 Fumitoshi UKAI <ukai@debian.or.jp>
* [w3m-dev 02494]
diff --git a/indep.c b/indep.c
@@ -122,13 +122,6 @@ cleanupName(char *name)
}
else if (strncmp(p, "//", 2) == 0) { /* foo//bar */
/* -> foo/bar */
-#if 0 /* ifdef SUPPORT_NETBIOS_SHARE */
- if (p == buf) { /* //DRIVE/foo or //host/path */
- p += 2;
- q += 2;
- continue;
- }
-#endif /* SUPPORT_NETBIOS_SHARE */
*p = '\0';
q++;
strcat(buf, q);
diff --git a/url.c b/url.c
@@ -931,18 +931,10 @@ parseURL2(char *url, ParsedURL * pu, ParsedURL * current)
#ifdef __EMX__
if (pu->scheme == SCM_LOCAL) {
if (strncmp(pu->file, "/$LIB/", 6)) {
- char *arg, abs[_MAX_PATH], tmp[_MAX_PATH];
+ char abs[_MAX_PATH];
- if (!(arg = strchr(strcpy(tmp, pu->file), '?'))) {
- _abspath(abs, tmp, _MAX_PATH);
- pu->file = cleanupName(abs);
- }
- else {
- *arg = 0;
- _abspath(abs, tmp, _MAX_PATH);
- *arg = '?';
- pu->file = cleanupName(strcat(abs, arg));
- }
+ _abspath(abs, pu->file, _MAX_PATH);
+ pu->file = cleanupName(abs);
}
}
#else