From 30315f76c74a6935ef1aeb813597742f8f49095a Mon Sep 17 00:00:00 2001
From: Mikhail Khodjaiants <mikhailkhod@googlemail.com>
Date: Tue, 7 Feb 2006 20:10:20 +0000
Subject: [PATCH] Bug 126789: Use new "fullname" attribute of stack frame
 description.

---
 debug/org.eclipse.cdt.debug.mi.core/ChangeLog         |  5 +++++
 .../cdt/debug/mi/core/command/MIStackListFrames.java  |  4 ++++
 .../org/eclipse/cdt/debug/mi/core/output/MIFrame.java | 11 ++++++++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
index f3fdccea0fd..f35bf3755bd 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-07 Mikhail Khodjaiants
+	Bug 126789: Use new "fullname" attribute of stack frame description.
+	* MIStackListFrames.java
+	* MIFrame.java
+
 2006-02-06 Mikhail Khodjaiants
 	Suppress "set auto-solib" - returns error on Windows.
 	* StandardWinCommandFactory.java
diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListFrames.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListFrames.java
index 985b2ab339d..40531c47e35 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListFrames.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/MIStackListFrames.java
@@ -36,6 +36,10 @@ import org.eclipse.cdt.debug.mi.core.output.MIStackListFramesInfo;
  * `FILE'
  *    File name of the source file where the function lives.
  *
+ * `FULLNAME'
+ *    Absolute file name of the source file where the function lives.
+ *	@since gdb 6.4
+ *
  * `LINE'
  *   Line number corresponding to the `$pc'.
  *
diff --git a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIFrame.java b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIFrame.java
index a9aabbf552f..69ed99344ad 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIFrame.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/output/MIFrame.java
@@ -19,6 +19,8 @@ public class MIFrame {
 	String addr;
 	String func = ""; //$NON-NLS-1$
 	String file = ""; //$NON-NLS-1$
+	// since gdb 6.4
+	String fullname = ""; //$NON-NLS-1$
 	int line;
 	MIArg[] args = new MIArg[0];
 
@@ -31,7 +33,12 @@ public class MIFrame {
 	}
 
 	public String getFile() {
-		return file;
+		String fname = getFullname();
+		return ( fname.length() != 0 ) ? fname : file;
+	}
+
+	public String getFullname() {
+		return fullname;
 	}
 
 	public String getFunction() {
@@ -108,6 +115,8 @@ public class MIFrame {
 				}
 			} else if (var.equals("file")) { //$NON-NLS-1$
 				file = str;
+			} else if (var.equals("fullname")) { //$NON-NLS-1$
+				fullname = str;
 			} else if (var.equals("line")) { //$NON-NLS-1$
 				try {
 					line = Integer.parseInt(str.trim());