mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-15 21:15:23 +02:00
Code Issues Wiki Activity

[208912] Cannot expand /C on a VxWorks SSH Server

Browse source
This commit is contained in:
Javier Montalvo Orus 2007-11-07 19:45:39 +00:00
parent 6c5f63201a
commit a9cbb90104
1 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPService.java
View file

@ -65,6 +65,7 @@
* Javier Montalvo Orus (Symbian) - [196351] Delete a folder should do recursive Delete * Javier Montalvo Orus (Symbian) - [196351] Delete a folder should do recursive Delete
* Javier Montalvo Orus (Symbian) - [187096] Drag&Drop + Copy&Paste shows error message on FTP connection * Javier Montalvo Orus (Symbian) - [187096] Drag&Drop + Copy&Paste shows error message on FTP connection
* David McKnight (IBM) - [207178] changing list APIs for file service and subsystems * David McKnight (IBM) - [207178] changing list APIs for file service and subsystems
* Javier Montalvo Orus (Symbian) - [208912] Cannot expand /C on a VxWorks SSH Server
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.services.files.ftp; package org.eclipse.rse.internal.services.files.ftp;
@ -1085,11 +1086,11 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
if(!hasSucceeded){ if(!hasSucceeded){
if(isFile) if(isFile)
{ {
throw new RemoteFileIOException(new Exception(ftpClient.getReplyString()+" ("+parentPath+getSeparator()+fileName+")")); //$NON-NLS-1$ //$NON-NLS-2$ throw new RemoteFileIOException(new Exception(ftpClient.getReplyString()+" ("+concat(parentPath,fileName)+")")); //$NON-NLS-1$ //$NON-NLS-2$
} }
else //folder recursively else //folder recursively
{ {
String newParentPath = parentPath+getSeparator()+fileName; String newParentPath = concat(parentPath,fileName);
ftpClient.changeWorkingDirectory(newParentPath); ftpClient.changeWorkingDirectory(newParentPath);
FTPFile[] fileNames = ftpClient.listFiles(); FTPFile[] fileNames = ftpClient.listFiles();
@ -1101,7 +1102,7 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
hasSucceeded = internalDelete(ftpClient,newParentPath,fileNames[i].getName(),fileNames[i].isFile(),monitor); hasSucceeded = internalDelete(ftpClient,newParentPath,fileNames[i].getName(),fileNames[i].isFile(),monitor);
if(!hasSucceeded) if(!hasSucceeded)
{ {
throw new RemoteFileIOException(new Exception(ftpClient.getReplyString()+" ("+newParentPath+getSeparator()+fileNames[i].getName()+")")); //$NON-NLS-1$ //$NON-NLS-2$ throw new RemoteFileIOException(new Exception(ftpClient.getReplyString()+" ("+concat(newParentPath,fileNames[i].getName())+")")); //$NON-NLS-1$ //$NON-NLS-2$
} }
} }
@ -1180,8 +1181,8 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
try{ try{
FTPClient ftpClient = getFTPClient(); FTPClient ftpClient = getFTPClient();
String source = srcParent.endsWith(String.valueOf(getSeparator())) ? srcParent + srcName : srcParent + getSeparator() + srcName; String source = concat(srcParent,srcName);
String target = tgtParent.endsWith(String.valueOf(getSeparator())) ? tgtParent + tgtName : tgtParent + getSeparator() + tgtName; String target = concat(tgtParent,tgtName);
clearCache(srcParent); clearCache(srcParent);
clearCache(tgtParent); clearCache(tgtParent);
@ -1281,7 +1282,7 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
IHostFile remoteHostFile = getFile(srcParent, srcName, monitor); IHostFile remoteHostFile = getFile(srcParent, srcName, monitor);
MyProgressMonitor progressMonitor = new MyProgressMonitor(monitor); MyProgressMonitor progressMonitor = new MyProgressMonitor(monitor);
progressMonitor.init(0, srcParent+getSeparator()+srcName, tgtParent+getSeparator()+tgtName, remoteHostFile.getSize()*2); progressMonitor.init(0, concat(srcParent,srcName), concat(tgtParent,tgtName), remoteHostFile.getSize()*2);
if(_commandMutex.waitForLock(monitor, Long.MAX_VALUE)) { if(_commandMutex.waitForLock(monitor, Long.MAX_VALUE)) {
@ -1314,11 +1315,11 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
{ {
//create folder //create folder
success = ftpClient.makeDirectory(tgtParent+getSeparator()+tgtName); success = ftpClient.makeDirectory(concat(tgtParent,tgtName));
//copy contents //copy contents
String newSrcParentPath = srcParent+getSeparator()+srcName; String newSrcParentPath = concat(srcParent,srcName);
String newTgtParentPath = tgtParent+getSeparator()+tgtName; String newTgtParentPath = concat(tgtParent,tgtName);
ftpClient.changeWorkingDirectory(newSrcParentPath); ftpClient.changeWorkingDirectory(newSrcParentPath);
FTPFile[] fileNames = ftpClient.listFiles(); FTPFile[] fileNames = ftpClient.listFiles();
@ -1677,4 +1678,21 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
} }
} }
/**
* Concatenate a parent directory with a file name to form a new proper path name.
* @param parentDir path name of the parent directory.
* @param fileName file name to concatenate.
* @return path name concatenated from parent directory and file name.
*
*/
protected String concat(String parentDir, String fileName) {
StringBuffer path = new StringBuffer(parentDir);
if (!parentDir.endsWith(String.valueOf(getSeparator())))
{
path.append(getSeparator());
}
path.append(fileName);
return path.toString();
}
} }