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

Bug 315244 - Can't map sources if the executable was built on a different file system

Browse source
This commit is contained in:
Ken Ryall 2010-06-01 16:43:19 +00:00
parent 12978a0406
commit a137a7f097
1 changed files with 46 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/MapEntrySourceContainer.java
View file

@ -12,7 +12,6 @@ package org.eclipse.cdt.debug.internal.core.sourcelookup;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList; import java.util.ArrayList;
import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.CoreModel;
@ -30,6 +29,8 @@ import org.eclipse.debug.core.sourcelookup.ISourceContainerType;
import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector; import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector;
import org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainer; import org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainer;
import org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage; import org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage;
import com.ibm.icu.text.MessageFormat;
/** /**
* The source container that maps a backend path to the local filesystem path. * The source container that maps a backend path to the local filesystem path.
@ -62,11 +63,54 @@ public class MapEntrySourceContainer extends AbstractSourceContainer {
fLocalPath = local; fLocalPath = local;
} }
/**
* Create an IPath from a string which may be a Win32 path. <p>
* <p>
* ("new Path(...)" won't work in Unix when using a Win32 path: the backslash
* separator and the device notation are completely munged.)
* Copied from org.eclipse.cdt.debug.edc.internal.PathUtils
* @param path
* @return converted string
*/
public static IPath createPath(String path) {
if (path == null) return null;
if (path.contains("\\")) {
// handle Windows slashes and canonicalize
path = path.replaceAll("\\\\", "/");
}
// also check for device or UNC
int idx = path.indexOf(":");
if (idx > 0) {
String device = path.substring(0, idx + 1);
path = path.substring(idx + 1);
return new Path(path).setDevice(device);
}
else {
// Cygwin or UNC path
if (path.startsWith("//")) {
String network;
idx = path.indexOf("/", 2);
if (idx > 0) {
network = path.substring(0, idx);
path = path.substring(idx);
} else {
network = path;
path = "";
}
return new Path(network, path).makeUNC(true);
}
}
// fallthrough
return new Path(path);
}
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.debug.core.sourcelookup.ISourceContainer#findSourceElements(java.lang.String) * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#findSourceElements(java.lang.String)
*/ */
public Object[] findSourceElements( String name ) throws CoreException { public Object[] findSourceElements( String name ) throws CoreException {
IPath path = new Path( name ); IPath path = createPath(name);
if ( getBackendPath().isPrefixOf( path ) ) { if ( getBackendPath().isPrefixOf( path ) ) {
path = path.removeFirstSegments( getBackendPath().segmentCount() ); path = path.removeFirstSegments( getBackendPath().segmentCount() );
path = getLocalPath().append( path ); path = getLocalPath().append( path );