Merge pull request #151 from duncan-roe/hack_fix

Expand test to not use line number hack

Author: rocky

libdebugger/fns.c

@@ -319,8 +319,8 @@ print_debugger_location(const file_t *p_target, debug_enter_reason_t reason,
 	   before the first command? Or should we list the line
 	   that the command starts on - so we know we've faked the location?
 	*/
-	/* Not OK to subtract 1 if b_debugger_goal sent us here */
-	if (!b_debugger_goal) {
+	/* Not OK to subtract 1 if already zero */
+	if (floc.lineno) {
 	  floc.lineno--;
 	}
 	p_target_loc->filenm = floc.filenm;

src/print.c

@@ -309,8 +309,8 @@ print_target_stack_entry (const file_t *p_target, int i, int i_pos)
        before the first command? Or should we list the line
        that the command starts on - so we know we've faked the location?
     */
-    /* Not OK to subtract 1 if b_debugger_goal sent us here */
-    if (!b_debugger_goal) {
+    /* Not OK to subtract 1 if already zero */
+    if (floc.lineno) {
       floc.lineno--;
     }
   } else {