Marown/yacy_search_server
1
0
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2024-09-19 00:01:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

ftpc fix for npe

Browse Source 
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4789 6c8d7289-2bf4-0310-a012-ef5d649a1542
This commit is contained in:
danielr 2008-05-10 22:03:51 +00:00
parent e021278bf0
commit 2080ff72b7
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source/de/anomic/net/ftpc.java
View File

@ -1112,7 +1112,7 @@ public class ftpc {
* 8 1994 etc
*
* @param line
* @return
* @return null if not parseable
*/
private entryInfo parseListData(final String line) {
final Pattern lsStyle = Pattern
@ -2539,9 +2539,12 @@ public class ftpc {
}
}
public StringBuilder dirhtml(final String remotePath) {
public StringBuilder dirhtml(String remotePath) {
// returns a directory listing using an existing connection
try {
if(isFolder(remotePath) && !"/".equals(remotePath.charAt(remotePath.length()-1))) {
remotePath += '/';
}
final List<String> list = list(remotePath, true);
if (remotesystem == null) {
sys();
@ -2596,10 +2599,24 @@ public class ftpc {
page.append(" </pre></p>\n");
page.append(" <hr>\n");
page.append(" <pre>\n");
int nameStart, nameEnd;
entryInfo info;
for (final String line : list) {
final entryInfo info = parseListData(line);
page.append(line.substring(0, line.indexOf(info.name)));
page.append("<a href=\"" + base + info.name + ((info.isDir) ? "/" : "") + "\">" + info.name + "</a>\n");
info = parseListData(line);
if(info != null) {
// with link
nameStart = line.indexOf(info.name);
page.append(line.substring(0, nameStart));
page.append("<a href=\"" + base + info.name + ((info.isDir) ? "/" : "") + "\">" + info.name + "</a>");
nameEnd = nameStart + info.name.length();
if(line.length() > nameEnd) {
page.append(line.substring(nameEnd));
}
} else {
// raw
page.append(line);
}
page.append('\n');
}
page.append(" </pre>\n");
page.append(" <hr>\n");