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

Fix bug 153649 recursive directory delete on ssh

Browse source
This commit is contained in:
Martin Oberhuber 2006-08-25 08:32:22 +00:00
parent d9a5cc2b10
commit f0eead0d80
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/services/ssh/files/SftpFileService.java
View file

@ -45,7 +45,6 @@ import org.eclipse.rse.services.files.IFileService;
import org.eclipse.rse.services.files.IHostFile; import org.eclipse.rse.services.files.IHostFile;
import org.eclipse.rse.services.files.RemoteFileIOException; import org.eclipse.rse.services.files.RemoteFileIOException;
import org.eclipse.rse.services.files.RemoteFileSecurityException; import org.eclipse.rse.services.files.RemoteFileSecurityException;
import org.eclipse.rse.services.files.RemoteFolderNotEmptyException;
import org.eclipse.rse.services.ssh.Activator; import org.eclipse.rse.services.ssh.Activator;
import org.eclipse.rse.services.ssh.ISshService; import org.eclipse.rse.services.ssh.ISshService;
import org.eclipse.rse.services.ssh.ISshSessionProvider; import org.eclipse.rse.services.ssh.ISshSessionProvider;
@ -543,6 +542,7 @@ public class SftpFileService extends AbstractFileService implements IFileService
public boolean delete(IProgressMonitor monitor, String remoteParent, String fileName) throws SystemMessageException public boolean delete(IProgressMonitor monitor, String remoteParent, String fileName) throws SystemMessageException
{ {
boolean ok=false; boolean ok=false;
Activator.trace("SftpFileService.delete"); //$NON-NLS-1$
if (fDirChannelMutex.waitForLock(monitor, fDirChannelTimeout)) { if (fDirChannelMutex.waitForLock(monitor, fDirChannelTimeout)) {
try { try {
String fullPath = remoteParent + '/' + fileName; String fullPath = remoteParent + '/' + fileName;
@ -560,20 +560,26 @@ public class SftpFileService extends AbstractFileService implements IFileService
} }
if (attrs==null) { if (attrs==null) {
//doesn't exist, nothing to do //doesn't exist, nothing to do
ok=true;
} else if (attrs.isDir()) { } else if (attrs.isDir()) {
try { try {
getChannel("SftpFileService.delete.rmdir").rmdir(fullPath); //$NON-NLS-1$ getChannel("SftpFileService.delete.rmdir").rmdir(fullPath); //$NON-NLS-1$
ok=true;
} catch(SftpException e) { } catch(SftpException e) {
if(e.id==ChannelSftp.SSH_FX_FAILURE) { if(e.id==ChannelSftp.SSH_FX_FAILURE) {
throw new RemoteFolderNotEmptyException(); //Bug 153649: Recursive directory delete
//throw new RemoteFolderNotEmptyException();
String fullPathQuoted = enQuote(fullPath);
int rv = runCommand(monitor, "rm -rf "+fullPathQuoted); //$NON-NLS-1$
ok = (rv==0);
} else { } else {
throw e; throw e;
} }
} }
} else { } else {
getChannel("SftpFileService.delete.rm").rm(fullPath); //$NON-NLS-1$ getChannel("SftpFileService.delete.rm").rm(fullPath); //$NON-NLS-1$
}
ok=true; ok=true;
}
Activator.trace("SftpFileService.delete ok"); //$NON-NLS-1$ Activator.trace("SftpFileService.delete ok"); //$NON-NLS-1$
} catch (Exception e) { } catch (Exception e) {
Activator.trace("SftpFileService.delete: "+e.toString()); //$NON-NLS-1$ Activator.trace("SftpFileService.delete: "+e.toString()); //$NON-NLS-1$