[SCM] master: Merge branch 'master' of ssh://sources.redhat.com/git/frysk

[scox@sourceware.org]

The branch, master has been updated
       via  815b8c4c2b6a75432eddf73cb74df27e9553acb5 (commit)
       via  847686667e0bee61585272f989e62d68595b4188 (commit)
      from  0631ebed24c1df74fb903d8429916768602aca43 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 815b8c4c2b6a75432eddf73cb74df27e9553acb5
Merge: 847686667e0bee61585272f989e62d68595b4188 0631ebed24c1df74fb903d8429916768602aca43
Author: Stan Cox <scox@redhat.com>
Date:   Mon Nov 12 19:39:55 2007 -0500

    Merge branch 'master' of ssh://sources.redhat.com/git/frysk

commit 847686667e0bee61585272f989e62d68595b4188
Author: Stan Cox <scox@redhat.com>
Date:   Mon Nov 12 19:39:16 2007 -0500

    Fix line numbers and current line position.
    
    * ListCommand.java (interpret): Initialize from function PC.
    Right adjust line numbers.

-----------------------------------------------------------------------

Summary of changes:
 frysk-core/frysk/hpd/ChangeLog        |    5 +++++
 frysk-core/frysk/hpd/ListCommand.java |   25 +++++++++++++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog
index 5f65f6c..75453df 100644
--- a/frysk-core/frysk/hpd/ChangeLog
+++ b/frysk-core/frysk/hpd/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-12  Stan Cox  <scox@redhat.com>
+
+	* ListCommand.java (interpret): Initialize from function PC.
+	Right adjust line numbers.   
+
 2007-11-12  Andrew Cagney  <cagney@redhat.com>
 
 	* TestStackCommands.java (testFrame()): New.
diff --git a/frysk-core/frysk/hpd/ListCommand.java b/frysk-core/frysk/hpd/ListCommand.java
index 8f76a8e..c4f3cc4 100644
--- a/frysk-core/frysk/hpd/ListCommand.java
+++ b/frysk-core/frysk/hpd/ListCommand.java
@@ -132,7 +132,7 @@ class ListCommand extends ParameterizedCommand {
                 line = exec_line - 10;
             }
  
-            if (file== null) {
+            if (file == null) {
                 if (frame.getLines().length > 0) {
                     file = (frame.getLines()[0]).getFile();
                     if (file == null) {
@@ -141,7 +141,8 @@ class ListCommand extends ParameterizedCommand {
                         return;
                     }
                     line = (frame.getLines()[0]).getLine() - 10;
-                    exec_line = line;
+		    if (exec_line == 0)
+			exec_line = line;
                 }
                 else { 
                     cli.outWriter.println("No source for current frame");
@@ -158,16 +159,28 @@ class ListCommand extends ParameterizedCommand {
                 boolean display = false;
                 int endLine = line + StrictMath.abs(windowSize);
                 String flag = "";
-                while ((str = lr.readLine()) != null) 		    {
+                while ((str = lr.readLine()) != null) {
                     if (lr.getLineNumber() == line)
                         display = true;
                     else if (lr.getLineNumber() == endLine)
                         break;
                     if (display && lr.getLineNumber() == exec_line)
                         flag = "*";
-                
-                    if (display)			    {
-                        cli.outWriter.println(lr.getLineNumber() + flag + "\t "+ str);
+		    else
+			flag = " ";
+
+                    if (display) {
+			int lineNumber = lr.getLineNumber();
+			String rightAdjust;
+			if (lineNumber < 10)
+			    rightAdjust = "   ";
+			else if (lineNumber < 100)
+			    rightAdjust = "  ";
+			else if (lineNumber < 1000)
+			    rightAdjust = " ";
+			else
+			    rightAdjust = "";
+                        cli.outWriter.println(flag + rightAdjust + lineNumber + "\t "+ str);
                         flag = "";
                     }
                 }


hooks/post-receive
--
frysk system monitor/debugger