mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-14 20:45:22 +02:00
Code Issues Wiki Activity

[264607] Unable to delete a broken symlink

Browse source
This commit is contained in:
David McKnight 2009-02-13 17:20:23 +00:00
parent 03d54c199f
commit df8126c8aa
2 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java
View file

@ -60,6 +60,7 @@
* David McKnight (IBM) - [251860] Rename a file/folder to a hidden file causes problems * David McKnight (IBM) - [251860] Rename a file/folder to a hidden file causes problems
* David McKnight (IBM) - [261019] New File/Folder actions available in Work Offline mode * David McKnight (IBM) - [261019] New File/Folder actions available in Work Offline mode
* David McKnight (IBM) - [254769] Don't get latest file when opening a file always * David McKnight (IBM) - [254769] Don't get latest file when opening a file always
* David McKnight (IBM) - [264607] Unable to delete a broken symlink
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.files.ui.view; package org.eclipse.rse.internal.files.ui.view;
@ -2736,7 +2737,15 @@ public class SystemViewRemoteFileAdapter
{ {
IRemoteFile file = (IRemoteFile) element; IRemoteFile file = (IRemoteFile) element;
boolean offline = file.getParentRemoteFileSubSystem().isOffline(); boolean offline = file.getParentRemoteFileSubSystem().isOffline();
return !file.isRoot() && file.canRead() && !offline;
if (offline || file.isRoot()){
return false;
}
else {
// for deletion, you need write access to the containing directory
IRemoteFile parentFile = file.getParentRemoteFile();
return parentFile.canWrite();
}
} }

18
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/DeleteThread.java
View file

@ -13,6 +13,7 @@
* Xuan Chen (IBM) - [209827] Update DStore command implementation to enable cancelation of archive operations * Xuan Chen (IBM) - [209827] Update DStore command implementation to enable cancelation of archive operations
* Noriaki Takatsu (IBM) - [220126] [dstore][api][breaking] Single process server for multiple clients * Noriaki Takatsu (IBM) - [220126] [dstore][api][breaking] Single process server for multiple clients
* Martin Oberhuber (Wind River) - [199854][api] Improve error reporting for archive handlers * Martin Oberhuber (Wind River) - [199854][api] Improve error reporting for archive handlers
* David McKnight (IBM) - [264607] Unable to delete a broken symlink
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.dstore.universal.miners.filesystem; package org.eclipse.rse.internal.dstore.universal.miners.filesystem;
@ -126,7 +127,22 @@ public class DeleteThread extends SecuredThread implements ICancellableHandler {
File deleteObj = new File(subject.getAttribute(DE.A_VALUE) File deleteObj = new File(subject.getAttribute(DE.A_VALUE)
+ File.separatorChar + subject.getName()); + File.separatorChar + subject.getName());
DataElement deObj = null; DataElement deObj = null;
if (!deleteObj.exists()) {
boolean exists = deleteObj.exists();
if (!exists){
// special case for broken symbolic link
String attributes = subject.getSource();
String classification = "file"; //$NON-NLS-1$
String[] str = attributes.split("\\"+IServiceConstants.TOKEN_SEPARATOR); //$NON-NLS-1$
if (str.length > 11){ // 11 is classification index
classification = str[11];
}
if (classification.startsWith("broken symbolic link")){ //$NON-NLS-1$
exists = true;
}
}
if (!exists) {
thisStatus.setAttribute(DE.A_SOURCE, IServiceConstants.FAILED_WITH_DOES_NOT_EXIST + "|" + deleteObj.getAbsolutePath()); //$NON-NLS-1$ thisStatus.setAttribute(DE.A_SOURCE, IServiceConstants.FAILED_WITH_DOES_NOT_EXIST + "|" + deleteObj.getAbsolutePath()); //$NON-NLS-1$
UniversalServerUtilities.logError(CLASSNAME, UniversalServerUtilities.logError(CLASSNAME,
"The object to delete does not exist", null, _dataStore); //$NON-NLS-1$ "The object to delete does not exist", null, _dataStore); //$NON-NLS-1$