From b32d13b9d036af133a1697940f521cc5321ea35d Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Tue, 29 Jan 2008 14:11:03 +0000 Subject: [PATCH] Check again "." for expanding relative path name --- kernel/src/bbtkInterpreter.cxx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx index eba8ce6..c34a785 100644 --- a/kernel/src/bbtkInterpreter.cxx +++ b/kernel/src/bbtkInterpreter.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkInterpreter.cxx,v $ $ Language: C++ - Date: $Date: 2008/01/29 14:01:31 $ - Version: $Revision: 1.11 $ + Date: $Date: 2008/01/29 14:11:03 $ + Version: $Revision: 1.12 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -814,22 +814,23 @@ verbose = true; std::string::size_type slash_position = name.find_last_of("/\\"); - // if name contains a slash (anywhere), user is assumed to have passed a relative/absolute name + // if name starts with a / or a . or contains : user is assumed to have passed a relative/absolute name // (not only a plain script name) - // we trust him, and try to explade the directory name + // we trust him, and try to expland the directory name // WARNING : starting from current local directory : ./whatYouWant (./ mandatory!) // if (slash_position != std::string::npos) - if (name[0]=='/' || name[1] == ':') + if (name[0]=='/' || name[1] == ':' || name[0]=='.') // absolute path (linux/windows) or relative path { // ===========================================================check user supplied location fullnameGiven = true; - + fullPathScriptName = Utilities::ExpandLibName(name, verbose); - + // allow user to always forget ".bbs" int l = fullPathScriptName.size(); + if (l!=0) { if (l>4) @@ -844,16 +845,15 @@ verbose = true; fullPathScriptName = fullPathScriptName + ".bbs"; } - //if (fullPathScriptName != "") { if ( Utilities::FileExists(fullPathScriptName)) { foundFile = true; } - //} + } // endif l != 0 } else - + // =============================================================== iterate on the paths { std::string path; -- 2.45.1