X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=GdbTerminal.py;h=ff6dc6b37356133c8d526fbb1f02f9f0dd6c9d3a;hb=ed2fac6a9e1b6f98e4847e1dda8c2a717d7a0b29;hp=5e6ba6d75d821583107faaccb258991bdd56032a;hpb=b621a683513577d563621942f1ba7c98fe423999;p=pygdb.git

diff --git a/GdbTerminal.py b/GdbTerminal.py
index 5e6ba6d..ff6dc6b 100644
--- a/GdbTerminal.py
+++ b/GdbTerminal.py
@@ -104,8 +104,7 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
 			#This line does not contain the file!
 			if not rxpos.search(line):
-				i += 1
-				line = bplines[i]
+				continue
 
 			pos = string.split(line)[-1]
 			[file,lineno] = string.split(pos,":")
@@ -114,7 +113,7 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 			if i+1<len(bplines) and rxcond.search(bplines[i+1]):
 				i +=1
 				line = bplines[i]
-				pre,cond = string.split(line,"if")
+				cond = string.join(string.split(line," if ")[1:], " if ")
 				cond = cond.strip()
 
 			bpnts += [[no, file, lineno, cond]]
@@ -164,11 +163,14 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
 		if string.find(line, "Program exited") == 0:
 			code = string.split(line)[-1]
-			code = code[1:-1]
 
 			codeno = 0
-			for c in code:
-				codeno = codeno*8 + int(c)
+		
+			#Parse the octal number
+			if code[0] == "O":
+				code = code[1:-1]
+				for c in code:
+					codeno = codeno*8 + int(c)
 
 			return "exited", codeno