mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-06 15:55:47 +02:00
Code Issues Wiki Activity

[337612] Failed to copy the content of a tar file

Browse source
This commit is contained in:
David McKnight 2011-02-28 22:28:11 +00:00
parent 781f40219e
commit bac970f24b
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java
View file

@ -69,12 +69,15 @@ import java.io.InputStreamReader;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URL;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.osgi.service.datalocation.Location;
import org.eclipse.osgi.util.NLS; import org.eclipse.osgi.util.NLS;
import org.eclipse.rse.internal.services.local.Activator; import org.eclipse.rse.internal.services.local.Activator;
import org.eclipse.rse.internal.services.local.ILocalMessageIds; import org.eclipse.rse.internal.services.local.ILocalMessageIds;
@ -1399,12 +1402,13 @@ public class LocalFileService extends AbstractFileService implements ILocalServi
} }
private boolean isTempFile(File resource){ private boolean isTempFile(File resource){
String workspaceLocation = System.getProperty("osgi.instance.area"); Location instanceLoc = Platform.getInstanceLocation();
if (workspaceLocation != null && workspaceLocation.length() > 0){ URL workspaceLocation = instanceLoc.getURL(); // currently, Eclipse doesn't escape URLs
workspaceLocation = workspaceLocation.substring(6).replace('/', File.separatorChar);
} String wsLocation = new File(workspaceLocation.getPath()).toURI().toString();
String path = resource.getAbsolutePath(); String fileLocation = resource.toURI().toString();
return (path.startsWith(workspaceLocation));
return fileLocation.startsWith(wsLocation);
} }
/** /**