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

Bug 196154: "Run to Line" command fails with native windows paths

Browse source
This commit is contained in:
John Cortell 2010-09-28 14:27:53 +00:00
parent d3275f0232
commit 6583f63849
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java
View file

@ -76,6 +76,7 @@ import org.eclipse.cdt.dsf.service.AbstractDsfService;
import org.eclipse.cdt.dsf.service.DsfServiceEventHandler; import org.eclipse.cdt.dsf.service.DsfServiceEventHandler;
import org.eclipse.cdt.dsf.service.DsfSession; import org.eclipse.cdt.dsf.service.DsfSession;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.Status;
import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.DebugException;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;
@ -1344,6 +1345,10 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService implements IMIRunCo
*/ */
public void runToLine(IExecutionDMContext context, String sourceFile, public void runToLine(IExecutionDMContext context, String sourceFile,
int lineNumber, boolean skipBreakpoints, RequestMonitor rm) { int lineNumber, boolean skipBreakpoints, RequestMonitor rm) {
// Hack around a MinGW bug; see 196154
sourceFile = adjustDebuggerPath(sourceFile);
runToLocation(context, sourceFile + ":" + Integer.toString(lineNumber), skipBreakpoints, rm); //$NON-NLS-1$ runToLocation(context, sourceFile + ":" + Integer.toString(lineNumber), skipBreakpoints, rm); //$NON-NLS-1$
} }
@ -1454,4 +1459,23 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService implements IMIRunCo
} }
} }
/**
* See bug 196154
*
* @param path
* the absolute path to the source file
* @return the simple filename if running on Windows and [path] is not an
* absolute UNIX one. Otherwise, [path] is returned
*/
private static String adjustDebuggerPath(String path) {
String result = path;
// Make it MinGW-specific
if (Platform.getOS().startsWith("win")) { //$NON-NLS-1$
if (!path.startsWith("/")) { //$NON-NLS-1$
path = path.replace('\\', '/');
result = path.substring(path.lastIndexOf('/') + 1);
}
}
return result;
}
} }