mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-07 00:05:53 +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-03-01 16:04:29 +00:00
parent bac970f24b
commit 59a93f1376
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,14 +69,19 @@ 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.URI;
import java.net.URISyntaxException;
import java.net.URL; 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.IPath;
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.Path;
import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.URIUtil;
import org.eclipse.osgi.service.datalocation.Location; 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;
@ -1402,13 +1407,20 @@ public class LocalFileService extends AbstractFileService implements ILocalServi
} }
private boolean isTempFile(File resource){ private boolean isTempFile(File resource){
Location instanceLoc = Platform.getInstanceLocation(); try {
URL workspaceLocation = instanceLoc.getURL(); // currently, Eclipse doesn't escape URLs URI wsURI = URIUtil.toURI(Platform.getInstanceLocation().getURL());
File wsRoot = URIUtil.toFile(wsURI);
String wsLocation = new File(workspaceLocation.getPath()).toURI().toString(); if (wsRoot!=null) {
String fileLocation = resource.toURI().toString(); File rsProj = new File(wsRoot, "RemoteSystemsTempFiles"); //$NON-NLS-1$
IPath rsProjPath = new Path(rsProj.getAbsolutePath());
return fileLocation.startsWith(wsLocation); IPath resPath = new Path(resource.getAbsolutePath());
return rsProjPath.isPrefixOf(resPath);
//could also compare canonical paths at this point but won't do here
//since it is costly and most likely not needed for the Tempfiles project.
}
} catch (URISyntaxException e) {
}
return false;
} }
/** /**