Index: squid/src/ftp.c
diff -c squid/src/ftp.c:1.316.2.17 squid/src/ftp.c:1.316.2.20
*** squid/src/ftp.c:1.316.2.17	Sat Feb 5 17:53:29 2005
--- squid/src/ftp.c	Mon Feb 14 19:13:13 2005
***************
*** 433,439 ****
 if (ftpState->flags.listformat_unknown && !ftpState->flags.tried_nlst) {
 	storeAppendPrintf(e, "<a HREF="/index.cgi/contrast/http://www.squid-cache.org/Versions/v2/2.5/bugs/\"./;type=d\"">[As plain directory]</a>\n");
 } else if (ftpState->typecode == 'D') {
! 	storeAppendPrintf(e, "<a HREF="/index.cgi/contrast/http://www.squid-cache.org/Versions/v2/2.5/bugs/\"./\"">[As extended directory]</a>\n");
 }
 storeAppendPrintf(e, "<hr noshade size=\"1px\">\n");
 storeAppendPrintf(e, "<address>\n");
--- 433,440 ----
 if (ftpState->flags.listformat_unknown && !ftpState->flags.tried_nlst) {
 	storeAppendPrintf(e, "<a HREF="/index.cgi/contrast/http://www.squid-cache.org/Versions/v2/2.5/bugs/\"./;type=d\"">[As plain directory]</a>\n");
 } else if (ftpState->typecode == 'D') {
! 	const char *path = ftpState->filepath ? ftpState->filepath : ".";
! 	storeAppendPrintf(e, "<a HREF="/index.cgi/contrast/http://www.squid-cache.org/Versions/v2/2.5/bugs/\"%s/\"">[As extended directory]</a>\n", html_quote(path));
 }
 storeAppendPrintf(e, "<hr noshade size=\"1px\">\n");
 storeAppendPrintf(e, "<address>\n");
***************
*** 707,713 ****
 		"Back");
 	} else {		/* NO_DOTDOT && ROOT_DIR */
 	 /* "UNIX Root" directory */
! 	 strcpy(href, "../");
 	 strcpy(text, "Home Directory");
 	}
 	snprintf(html, 8192, "<a HREF="/index.cgi/contrast/http://www.squid-cache.org/Versions/v2/2.5/bugs/\"%s\"">%s</a> <a HREF="/index.cgi/contrast/http://www.squid-cache.org/Versions/v2/2.5/bugs/\"%s\"">%s</a> %s\n",
--- 708,714 ----
 		"Back");
 	} else {		/* NO_DOTDOT && ROOT_DIR */
 	 /* "UNIX Root" directory */
! 	 strcpy(href, "/");
 	 strcpy(text, "Home Directory");
 	}
 	snprintf(html, 8192, "<a HREF="/index.cgi/contrast/http://www.squid-cache.org/Versions/v2/2.5/bugs/\"%s\"">%s</a> <a HREF="/index.cgi/contrast/http://www.squid-cache.org/Versions/v2/2.5/bugs/\"%s\"">%s</a> %s\n",
***************
*** 1011,1030 ****
 	}
 }
 l = strLen(request->urlpath);
- ftpState->flags.use_base = 1;
 /* check for null path */
 if (!l) {
 	ftpState->flags.isdir = 1;
 	ftpState->flags.root_dir = 1;
 } else if (!strCmp(request->urlpath, "/%2f/")) {
 	/* UNIX root directory */
- 	ftpState->flags.use_base = 0;
 	ftpState->flags.isdir = 1;
 	ftpState->flags.root_dir = 1;
 } else if ((l>= 1) && (*(strBuf(request->urlpath) + l - 1) == '/')) {
 	/* Directory URL, ending in / */
 	ftpState->flags.isdir = 1;
- 	ftpState->flags.use_base = 0;
 	if (l == 1)
 	 ftpState->flags.root_dir = 1;
 }
--- 1012,1029 ----
 	}
 }
 l = strLen(request->urlpath);
 /* check for null path */
 if (!l) {
 	ftpState->flags.isdir = 1;
 	ftpState->flags.root_dir = 1;
+ 	ftpState->flags.use_base = 1;	/* Work around broken browsers */
 } else if (!strCmp(request->urlpath, "/%2f/")) {
 	/* UNIX root directory */
 	ftpState->flags.isdir = 1;
 	ftpState->flags.root_dir = 1;
 } else if ((l>= 1) && (*(strBuf(request->urlpath) + l - 1) == '/')) {
 	/* Directory URL, ending in / */
 	ftpState->flags.isdir = 1;
 	if (l == 1)
 	 ftpState->flags.root_dir = 1;
 }
***************
*** 1518,1524 ****
 	 if (*p)
 		*p++ = '0円';
 	 rfc1738_unescape(d);
! 	 wordlistAdd(&ftpState->pathcomps, d);
 	}
 	xfree(path);
 	if (ftpState->pathcomps)
--- 1517,1524 ----
 	 if (*p)
 		*p++ = '0円';
 	 rfc1738_unescape(d);
! 	 if (*d)
! 		wordlistAdd(&ftpState->pathcomps, d);
 	}
 	xfree(path);
 	if (ftpState->pathcomps)
***************
*** 1569,1578 ****
 } else {
 	ftpState->flags.no_dotdot = 0;
 }
! if (*path)
! 	snprintf(cbuf, 1024, "CWD %s\r\n", path);
! else
! 	snprintf(cbuf, 1024, "CWD\r\n");
 ftpWriteCommand(cbuf, ftpState);
 ftpState->state = SENT_CWD;
 }
--- 1569,1575 ----
 } else {
 	ftpState->flags.no_dotdot = 0;
 }
! snprintf(cbuf, 1024, "CWD %s\r\n", path);
 ftpWriteCommand(cbuf, ftpState);
 ftpState->state = SENT_CWD;
 }
***************
*** 1645,1651 ****
 	debug(9, 3) ("Directory path did not end in /\n");
 	strCat(ftpState->title_url, "/");
 	ftpState->flags.isdir = 1;
- 	ftpState->flags.use_base = 1;
 }
 ftpSendPasv(ftpState);
 }
--- 1642,1647 ----
***************
*** 2010,2016 ****
 debug(9, 3) ("This is ftpRestOrList\n");
 if (ftpState->typecode == 'D') {
 	ftpState->flags.isdir = 1;
- 	ftpState->flags.use_base = 1;
 	if (ftpState->flags.put) {
 	 ftpSendMkdir(ftpState);	/* PUT name;type=d */
 	} else {
--- 2006,2011 ----
***************
*** 2144,2150 ****
 {
 ftpState->flags.tried_nlst = 1;
 if (ftpState->filepath) {
- 	ftpState->flags.use_base = 1;
 	snprintf(cbuf, 1024, "NLST %s\r\n", ftpState->filepath);
 } else {
 	snprintf(cbuf, 1024, "NLST\r\n");
--- 2139,2144 ----
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE8-ftp_cleanup.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE8-ftp_cleanup.patch" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>