[w3m-dev 02497]

From: WATANABE Katsuyuki <katsuyuki_1.watanabe@toppan.co.jp>
This commit is contained in:
Fumitoshi UKAI
2001-11-22 13:30:02 +00:00
parent 2807a2d5e0
commit 4493ae705f
3 changed files with 11 additions and 20 deletions

View File

@@ -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]

View File

@@ -1,4 +1,4 @@
/* $Id: indep.c,v 1.6 2001/11/21 16:29:46 ukai Exp $ */
/* $Id: indep.c,v 1.7 2001/11/22 13:30:02 ukai Exp $ */
#include "fm.h"
#include <stdio.h>
#include <pwd.h>
@@ -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);

16
url.c
View File

@@ -1,4 +1,4 @@
/* $Id: url.c,v 1.7 2001/11/21 16:29:47 ukai Exp $ */
/* $Id: url.c,v 1.8 2001/11/22 13:30:02 ukai Exp $ */
#include "fm.h"
#include <sys/types.h>
#include <sys/socket.h>
@@ -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