From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24344 invoked by alias); 30 Apr 2008 18:13:50 -0000 Received: (qmail 24318 invoked by uid 440); 30 Apr 2008 18:13:50 -0000 Date: Wed, 30 Apr 2008 18:13:00 -0000 Message-ID: <20080430181350.24303.qmail@sourceware.org> From: scox@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Consider relative paths when searching for executable. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 0cc129863793737189bc3a50c885836ad8abc0f9 X-Git-Newrev: 784366432a48d3f5e5072dee4c456d4dbb569c9c Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2008-q2/txt/msg00167.txt.bz2 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 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 + + * SysRoot.java (findExe): Consider relative paths. + 2008-04-24 Stan Cox * 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