[SCM] master: Consider relative paths when searching for executable.

[scox@sourceware.org]

The branch, master has been updated
       via  784366432a48d3f5e5072dee4c456d4dbb569c9c (commit)
      from  0cc129863793737189bc3a50c885836ad8abc0f9 (commit)

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

- Log -----------------------------------------------------------------
commit 784366432a48d3f5e5072dee4c456d4dbb569c9c
Author: Stan Cox <scox@redhat.com>
Date:   Wed Apr 30 12:56:21 2008 -0400

    Consider relative paths when searching for executable.
    
    * SysRoot.java (findExe): Consider relative paths.

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

Summary of changes:
 frysk-core/frysk/sysroot/ChangeLog    |    4 ++++
 frysk-core/frysk/sysroot/SysRoot.java |   14 +++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/sysroot/ChangeLog b/frysk-core/frysk/sysroot/ChangeLog
index 25c2a17..3309028 100644
--- a/frysk-core/frysk/sysroot/ChangeLog
+++ b/frysk-core/frysk/sysroot/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-30  Stan Cox  <scox@redhat.com>
+
+	* SysRoot.java (findExe): Consider relative paths.
+
 2008-04-24  Stan Cox  <scox@redhat.com>
 
 	*  package.html: New file.
diff --git a/frysk-core/frysk/sysroot/SysRoot.java b/frysk-core/frysk/sysroot/SysRoot.java
index 19437aa..7bbbdd3 100644
--- a/frysk-core/frysk/sysroot/SysRoot.java
+++ b/frysk-core/frysk/sysroot/SysRoot.java
@@ -115,17 +115,25 @@ public class SysRoot {
 
 
     private File findExe(String pathVar, String arg0) {
+	File exeFile = new File(arg0);
         if (pathVar == null) {
-            return new File(arg0);
+            return exeFile;
         }
 
         if (arg0.startsWith("/")) {
-            return new File(arg0);
+            return exeFile;
         }
 
         String[] path = pathVar.split(":");
         if (path == null) {
-            return new File(arg0);
+            return exeFile;
+        }
+        
+        if (sysRoot.getPath().compareTo("/") == 0) { 
+            if (! exeFile.isAbsolute() && exeFile.exists()) {
+        	// given "./executable" with sysroot "/"
+        	return exeFile;
+            }
         }
 
         for (int i = 0; i < path.length; i++) {


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