From 6990a8aeeaf98fc901ed193b95365b2eee2fb950 Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Tue, 22 Jan 2008 16:55:04 +0000 Subject: [PATCH] Move some general usage methods to Utilities, to avoid dupplicate code : static inline bool FileExists(std::string strFilename) static std::string ExtractPackageName(const std::string &name, std::string& path) static std::string ExtractScriptName(const std::string &name static std::string ExpandLibName(const std::string &name, bool verbose) static std::string MakeLibnameFromPath(std::string path, std::string pkgname) static inline bool IsAtRoot(std::string cwd) static inline void SplitAroundFirstDot( const std::string& in, std::string& left, std::string& right) CVS: ---------------------------------------------------------------------- --- kernel/src/bbtkExecuter.h | 16 +- kernel/src/bbtkFactory.cxx | 221 ++------------------------- kernel/src/bbtkFactory.h | 23 +-- kernel/src/bbtkInterpreter.cxx | 269 +++++---------------------------- kernel/src/bbtkInterpreter.h | 50 +++--- kernel/src/bbtkUtilities.cxx | 25 +-- kernel/src/bbtkUtilities.h | 265 +++++++++++++++++++++++++++++++- kernel/src/bbtkVirtualExec.h | 4 +- 8 files changed, 346 insertions(+), 527 deletions(-) diff --git a/kernel/src/bbtkExecuter.h b/kernel/src/bbtkExecuter.h index be6099a..5477c91 100644 --- a/kernel/src/bbtkExecuter.h +++ b/kernel/src/bbtkExecuter.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkExecuter.h,v $ $ Language: C++ - Date: $Date: 2008/01/22 15:02:00 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/01/22 16:55:04 $ + Version: $Revision: 1.2 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -43,16 +43,6 @@ namespace bbtk public: - /* - typedef enum - { - NoDialog, - TextDialog, - GraphicalDialog - } - DialogModeType; -*/ - /// Constructor Executer(); @@ -174,7 +164,7 @@ namespace bbtk /// The root ComplexBlackBox, in which operations are done when outside a define/endefine block /// Its name in bbi is 'workspace' ComplexBlackBoxDescriptor* mRoot; - + /// Struct that stores info on user defined complex black boxes struct CBBDefinition { diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx index eb0b829..2accdca 100644 --- a/kernel/src/bbtkFactory.cxx +++ b/kernel/src/bbtkFactory.cxx @@ -4,8 +4,8 @@ Program: bbtk Module: $RCSfile: bbtkFactory.cxx,v $ Language: C++ -Date: $Date: 2008/01/22 15:02:00 $ -Version: $Revision: 1.1 $ +Date: $Date: 2008/01/22 16:55:04 $ +Version: $Revision: 1.2 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de @@ -27,6 +27,7 @@ PURPOSE. See the above copyright notices for more information. #include "bbtkMessageManager.h" #include "bbtkConnection.h" #include "bbtkConfigurationFile.h" +#include "bbtkUtilities.h" #include // for struct stat stFileInfo @@ -97,210 +98,7 @@ namespace bbtk } //=================================================================== -// --> usefull in many places (at least : ConfigurationFile, Factory, Interpreter) -// should be factorized ( "bbtk::Util class ?) -/* -bool Factory::FileExists(std::string strFilename) -bool Factory::IsAtRoot(std::string cwd) -std::string Factory::ExtractPackageName(const std::string &name) -std::string Factory::ExpandLibName(const std::string &name, bool verbose) -std::string Factory::MakeLibnameFromPath(std::string path, std::string pkgname) -bool Factory::CheckIfLibraryContainsPackage(std::string libname,std::string pkgname, bool verbose) -*/ - -// See : http://www.techbytes.ca/techbyte103.html for more O.S. -bool Factory::FileExists(std::string strFilename) { - struct stat stFileInfo; - bool blnReturn; - int intStat; - - // Attempt to get the file attributes - intStat = stat(strFilename.c_str(),&stFileInfo); - if(intStat == 0) { - // We were able to get the file attributes - // so the file obviously exists. - blnReturn = true; - } else { - // We were not able to get the file attributes. - // This may mean that we don't have permission to - // access the folder which contains this file. If you - // need to do that level of checking, lookup the - // return values of stat which will give you - // more details on why stat failed. - blnReturn = false; - } - - return(blnReturn); -} - -// =================================================================================== - - std::string Factory::ExtractPackageName(const std::string &name, - std::string& path) - { - std::string pkgname; - path = ""; - - std::string::size_type slash_position = name.find_last_of("/\\"); - if (slash_position != std::string::npos) - { - pkgname = name.substr(slash_position+1,std::string::npos); - path = name.substr(0,slash_position); - // std::cout << "F:P='"<.so - - // remove {libbb} if any - if (memcmp ( pkgname.c_str(), "libbb", 5) == 0) { - pkgname = pkgname.substr(5, pkgname.length()); - } - /* - /// \ \todo what would happen if (stupid) user names his package 'libbb' ?!? - /// \ --> Should be forbidden! - */ -#elif defined(_WIN32) - - // WIN 32 mechanism - // shared lib name = .dll - - // remove {bb} if any - if (memcmp (pkgname.c_str(), "bb", 2) == 0) { - pkgname = pkgname.substr(2, pkgname.length()); - } - - /* - /// \ \todo what would happen if (stupid) user names his package 'bb' ?!? - /// \ --> Should be forbidden! - */ -#else - bbtkError("neither __GNUC__ nor _WIN32 ?!? How did you compile ?"); -#endif - return pkgname; - } - -// =================================================================================== - - std::string Factory::ExpandLibName(const std::string &name, bool verbose) - { - // ----- Think of expanding path name ( ./ ../ ../../ ) - - char buf[2048]; // for getcwd - char * currentDir = getcwd(buf, 2048); - std::string cwd(currentDir); - std::string libname(name); - - // tooHigh : true is user supplies a library pathname with too many "../" - bool tooHigh = false; - - if ( name[0] == '/' || name[0] == '\\' ) - { - - return(libname); - } - else if (name[0] == '.' && (name[1] == '/' || name[1] == '\\') ) - { - libname = cwd + ConfigurationFile::GetInstance().Get_file_separator () + name.substr(2, name.length()); - return(libname); - } - else if ( name[0] == '.' && name[1] == '.' && (name[2] == '/' || name[2] == '\\') ) - { - if ( IsAtRoot(cwd) ) // hope it gets / (for Linux), C: D: (for Windows) - { - // if we are already at / or c: --> hopeless - if (verbose) - std::cout << " File path [" << name << "] doesn't exist" << std::endl; - tooHigh = true; - } - else - { - // iterate on ../ and go up from the current working dir! - std::string a(name); - bool alreadyProcessRoot = false; - for(;;) - { - std::string::size_type slash_position = cwd.find_last_of(ConfigurationFile::GetInstance().Get_file_separator ()); - if (slash_position != std::string::npos) { - if (slash_position == 0) - slash_position = 1; - cwd = cwd.substr(0,slash_position/*+1*/); - a = a.substr(3, name.length()); // remove ../ - if (a == "" || alreadyProcessRoot) - { - if (verbose) - std::cout << " File path [" << name << "] doesn't exist" << std::endl; - tooHigh = true; - break; - } - libname = cwd; - char c = cwd[cwd.size()-1]; - if (c != '/' && c != '\\' ) - libname += ConfigurationFile::GetInstance().Get_file_separator (); - libname += a; - - if ( a[0] != '.' ) // if . (probabely ../), loop again - break; - - if (IsAtRoot(cwd)) - alreadyProcessRoot = true; - } - } // end iterating on ../ - } - if (tooHigh) - libname=""; -// std::cout << "=======================================3 libname [" << libname << "]" << std::endl; - - return (libname); - - } // ----- End of expanding path name ( ./ ../ ../../ ) - // avoid warnings - return(""); // will never get here! - } - -// =================================================================================== - - std::string Factory::MakeLibnameFromPath(std::string path, std::string pkgname) - { - std::string libname = path; - char c = path[path.size()-1]; -#if defined(__GNUC__) - if (c != '/') - libname += "/libbb"; - libname += pkgname; - libname += ".so"; - -#elif defined(_WIN32) - if (c != '\\') - libname = path+"\\bb"; - libname += pkgname; - libname += ".dll"; -#endif - return libname; - } - -// =================================================================================== - - bool Factory::IsAtRoot(std::string cwd) - { - if ( cwd == "/" // hope it gets / (for Linux) - || (cwd.size() <= 3 && cwd[1] == ':') ) // hope it gets C: D: (for Windows) - return (true); - else - return(false); -} // =================================================================================== bool Factory::DoLoadPackage(std::string libname, @@ -421,8 +219,9 @@ bool Factory::FileExists(std::string strFilename) { + ".." + docreldoc; std::string doc = path + separator + ".." + separator + BBTK_STRINGIFY_SYMBOL(BBTK_DOC_REL_PATH) - + docreldoc; - std::cout << "doc='"<SetDocURL(doc); pack.mPackage->SetDocRelativeURL(reldoc); @@ -476,7 +275,7 @@ bool Factory::FileExists(std::string strFilename) { std::string pkgname; // e.g. libbb.so std::string upath; - pkgname = ExtractPackageName(name,upath); + pkgname = Utilities::ExtractPackageName(name,upath); bbtkMessage("Debug",1,"Package name ["< Trying to load ["< should be factorized : bbtk::Util class? - bool FileExists(std::string strFilename); + private: - /// the methods for LoadPackage - std::string ExtractPackageName(const std::string &name, - std::string& path); - std::string ExpandLibName(const std::string &name, bool v); - std::string MakeLibnameFromPath(std::string path, std::string pkgname); + bool DoLoadPackage(std::string libname, std::string pkgname, std::string path, bool v); - bool IsAtRoot(std::string cwd); - private: + /// The structure storing info on a package class PackageInfoType { diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx index f500e92..ef03a40 100644 --- a/kernel/src/bbtkInterpreter.cxx +++ b/kernel/src/bbtkInterpreter.cxx @@ -3,13 +3,13 @@ Program: bbtk Module: $RCSfile: bbtkInterpreter.cxx,v $ $ Language: C++ - Date: $Date: 2008/01/22 15:02:00 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/01/22 16:55:04 $ + Version: $Revision: 1.2 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details. - + This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. @@ -37,8 +37,6 @@ namespace bbtk Interpreter* Interpreter::mGlobalInterpreter = NULL; - - //======================================================================= /** * @@ -51,7 +49,6 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL; bbtk::MessageManager::RegisterMessageType("Interpreter","Messages of the interpreter",0); bbtkDebugMessageInc("Interpreter",9,"Interpreter::Interpreter()" <Connect(left,right,left2,right2); break; case cDefine : - if (mFileName.size()>0) - { - filename = Utilities::get_file_name(mFileName.back()); - } - if (words.size()==2) - { - mExecuter->Define(words[1],"user",filename); - } - else - { - mExecuter->Define(words[1],words[2],filename); - } - break; + if (mFileName.size()>0) + { + filename = Utilities::get_file_name(mFileName.back()); + } + if (words.size()==2) + { + mExecuter->Define(words[1],"user",filename); + } + else + { + mExecuter->Define(words[1],words[2],filename); + } + break; case cEndDefine : mExecuter->EndDefine(); break; case cPrint : - Print(words[1]); + Print(words[1]); /// \todo use mExecuter break; case cExec : - if (words[1]=="freeze") mExecuter->SetNoExecMode(true); - else if (words[1]=="unfreeze") mExecuter->SetNoExecMode(false); - else mExecuter->Update(words[1]); - break; + if (words[1]=="freeze") + mExecuter->SetNoExecMode(true); + else if (words[1]=="unfreeze") + mExecuter->SetNoExecMode(false); + else + mExecuter->Update(words[1]); + break; case cInput : - SplitAroundFirstDot(words[2],left,right); + Utilities::SplitAroundFirstDot(words[2],left,right); mExecuter->DefineInput(words[1],left,right,words[3]); break; case cOutput : - SplitAroundFirstDot(words[2],left,right); + Utilities::SplitAroundFirstDot(words[2],left,right); mExecuter->DefineOutput(words[1],left,right,words[3]); break; case cSet : - SplitAroundFirstDot(words[1],left,right); + Utilities::SplitAroundFirstDot(words[1],left,right); mExecuter->Set(left,right,words[2]); break; @@ -485,8 +485,8 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) } else { - sscanf(words[2].c_str(),"%d",&level); - bbtk::MessageManager::SetMessageLevel(words[1],level); + sscanf(words[2].c_str(),"%d",&level); + bbtk::MessageManager::SetMessageLevel(words[1],level); } break; @@ -532,7 +532,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) case cWorkspace : if (words.size() == 2) { - if (words[1]=="freeze") mExecuter->SetNoExecMode(true); + if (words[1]=="freeze") mExecuter->SetNoExecMode(true); else if (words[1]=="unfreeze") mExecuter->SetNoExecMode(false); } else @@ -642,7 +642,6 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& bbtkDebugMessageInc("Interpreter",9,"Interpreter::SplitLine(\""< chains; std::string delimiters("$"); @@ -667,7 +666,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& // is an output (between $$) : decode std::string tok,box,output; tok = str.substr(lastPos, pos - lastPos); - SplitAroundFirstDot(tok,box,output); + Utilities::SplitAroundFirstDot(tok,box,output); chains.push_back( mExecuter->Get(box,output) ); // std::cout << "outp='"<& * */ - -// --> usefull in many places (at least : ConfigurationFile, Factory, Interpreter) -// should be factorized ( "bbtk::Util class ?) -/* -bool Interpreter::FileExists(std::string strFilename) -bool Interpreter::IsAtRoot(std::string cwd) -std::string Interpreter::ExtractPackageName(const std::string &name) -std::string Interpreter::ExpandLibName(const std::string &name, bool verbose) -std::string Interpreter::MakeLibnameFromPath(std::string path, std::string pkgname) -*/ -// =================================================================================== - -// See : http://www.techbytes.ca/techbyte103.html for more O.S. -bool Interpreter::FileExists(std::string strFilename) { - struct stat stFileInfo; - bool blnReturn; - int intStat; - - // Attempt to get the file attributes - intStat = stat(strFilename.c_str(),&stFileInfo); - if(intStat == 0) { - // We were able to get the file attributes - // so the file obviously exists. - blnReturn = true; - } else { - // We were not able to get the file attributes. - // This may mean that we don't have permission to - // access the folder which contains this file. If you - // need to do that level of checking, lookup the - // return values of stat which will give you - // more details on why stat failed. - blnReturn = false; - } - - return(blnReturn); -} - -// =================================================================================== - - std::string Interpreter::ExtractScriptName(const std::string &name) - { - std::string pkgname; - - std::string::size_type slash_position = name.find_last_of("/\\"); - if (slash_position != std::string::npos) { - pkgname =name.substr(slash_position+1,std::string::npos); - } else { - pkgname = name; - } - - // remove {.bbs } if any - std::string::size_type dot_position = pkgname.find_last_of('.'); - if (dot_position != std::string::npos){ - pkgname = pkgname.substr(0,dot_position); - } - return pkgname; - } - -// =================================================================================== - - std::string Interpreter::ExpandLibName(const std::string &name, bool verbose) - { - // ----- Think of expanding path name ( ./ ../ ../../ ) - - char buf[2048]; // for getcwd - char * currentDir = getcwd(buf, 2048); - std::string cwd(currentDir); - std::string libname(name); - - // tooHigh : true is user supplies a library pathname with too many "../" - bool tooHigh = false; - - if ( name[0] == '/' || name[0] == '\\' ) - { - return(libname); - } - else if (name[0] == '.' && (name[1] == '/' || name[1] == '\\') ) - { - libname = cwd + ConfigurationFile::GetInstance().Get_file_separator () + name.substr(2, name.length()); - return(libname); - } - else if ( name[0] == '.' && name[1] == '.' && (name[2] == '/' || name[2] == '\\') ) - { - if ( IsAtRoot(cwd) ) // hope it gets / (for Linux), C: D: (for Windows) - { - // if we are already at / or c: --> hopeless - if (verbose) - std::cout << " File path [" << name << "] doesn't exist" << std::endl; - tooHigh = true; - } - else - { - // iterate on ../ and go up from the current working dir! - std::string a(name); - bool alreadyProcessRoot = false; - for(;;) - { - std::string::size_type slash_position = cwd.find_last_of(ConfigurationFile::GetInstance().Get_file_separator ()); - if (slash_position != std::string::npos) { - if (slash_position == 0) - slash_position = 1; - cwd = cwd.substr(0,slash_position/*+1*/); - a = a.substr(3, name.length()); // remove ../ - if (a == "" || alreadyProcessRoot) - { - if (verbose) - std::cout << " File path [" << name << "] doesn't exist" << std::endl; - tooHigh = true; - break; - } - // std::string b = cwd + a; - libname = cwd; - char c = cwd[cwd.size()-1]; - if (c != '/' && c != '\\' ) - libname += ConfigurationFile::GetInstance().Get_file_separator (); - libname += a; - - if ( a[0] != '.' ) // if . (probabely ../), loop again - break; - - if (IsAtRoot(cwd)) - alreadyProcessRoot = true; - } - } // end iterating on ../ - } - if (tooHigh) - libname=""; - return (libname); - - } // ----- End of expanding path name ( ./ ../ ../../ ) - - // To avoid warning - return(""); // Will never get here! - } - - -// =================================================================================== - - std::string Interpreter::MakeLibnameFromPath(std::string path, std::string pkgname) - { - std::string libname = path; - char c = path[path.size()-1]; - if (c != '/' && c != '\\') - libname += ConfigurationFile::GetInstance().Get_file_separator (); - libname += pkgname; - libname += ".bbs"; - return libname; - } - -// =================================================================================== - - bool Interpreter::IsAtRoot(std::string cwd) - { - if ( cwd == "/" // hope it gets / (for Linux) - || (cwd.size() <= 3 && cwd[1] == ':') ) // hope it gets C: D: (for Windows) - return (true); - else - return(false); -} - - // =================================================================================== @@ -869,7 +707,7 @@ bool Interpreter::FileExists(std::string strFilename) { std::string libname; // full path library name std::string pkgname; // e.g. .bbs - pkgname = ExtractScriptName(name); + pkgname = Utilities::ExtractScriptName(name); if (use_configuration_file) { @@ -885,9 +723,9 @@ bool Interpreter::FileExists(std::string strFilename) { if (slash_position != std::string::npos) { fullnameGiven = true; - libname = ExpandLibName(name, verbose); + libname = Utilities::ExpandLibName(name, verbose); if (libname != "") { - if (FileExists(libname)) + if ( Utilities::FileExists(libname)) { foundFile = true; } @@ -909,10 +747,10 @@ bool Interpreter::FileExists(std::string strFilename) { path = currentDir; } - libname = MakeLibnameFromPath(path, pkgname); + libname = Utilities::MakePkgnameFromPath(path, pkgname); // Check if library exists - if ( !FileExists(libname) ) + if ( ! Utilities::FileExists(libname) ) { if (verbose) std::cout <<" [" <& words) bbtkDebugDecTab("Interpreter",9); } - //======================================================================= - - - //======================================================================= - void Interpreter::SplitAroundFirstDot( const std::string& in, - std::string& left, - std::string& right) - { - bbtkDebugMessageInc("Interpreter",9, - "Interpreter::SplitAroundFirstDot(\"" - <& words) diff --git a/kernel/src/bbtkInterpreter.h b/kernel/src/bbtkInterpreter.h index b078a58..4d81c65 100644 --- a/kernel/src/bbtkInterpreter.h +++ b/kernel/src/bbtkInterpreter.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkInterpreter.h,v $ $ Language: C++ - Date: $Date: 2008/01/22 15:02:00 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/01/22 16:55:04 $ + Version: $Revision: 1.2 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -27,15 +27,16 @@ #ifndef __bbtkInterpreter_h__ #define __bbtkInterpreter_h__ - +#include "bbtkVirtualExec.h" #include "bbtkExecuter.h" +#include "bbtkTranscriptor.h" + #include #include namespace bbtk { - class BBTK_EXPORT Interpreter { @@ -67,7 +68,7 @@ namespace bbtk cPrint, cWorkspace // LG } CommandCodeType; - + /// The structure storing the informations on a command typedef struct { @@ -78,14 +79,13 @@ namespace bbtk std::string help; } CommandInfoType; - - /// The type of dictionnary of commands typedef std::map CommandDictType; public: /// Constructor - Interpreter(); + Interpreter(); + /// Destructor ~Interpreter(); @@ -104,7 +104,8 @@ namespace bbtk void SetNoExecMode(bool b) { mExecuter->SetNoExecMode(b); } /// - typedef Executer::DialogModeType DialogModeType; + //typedef Executer::DialogModeType DialogModeType; + typedef VirtualExec::DialogModeType DialogModeType; void SetDialogMode(DialogModeType t) { mExecuter->SetDialogMode(t); } @@ -150,11 +151,7 @@ namespace bbtk void Config(bool verbose) const; // JPR /// void Print(const std::string&); - - /// Splits the string in around the first dot encountered - void SplitAroundFirstDot( const std::string& in, - std::string& left, - std::string& right); + /// void FindCommandsWithPrefix( char* buf, int n, @@ -163,32 +160,35 @@ namespace bbtk /// Sets the bool that indicates wether we are in command line context void SetCommandLine(bool v = true) { mCommandLine = v; } - private: - /// the methods for include bbs - bool FileExists(std::string strFilename); - std::string ExtractScriptName(const std::string &name); - std::string ExpandLibName(const std::string &name, bool v); - std::string MakeLibnameFromPath(std::string path, std::string pkgname); - bool IsAtRoot(std::string cwd); + private: private: //================================================================== // ATTRIBUTES + /// The factory // bbtk::Factory* mFactory; + /// The command executer - bbtk::Executer* mExecuter; + // bbtk::Executer* mExecuter; + bbtk::VirtualExec* mExecuter; + /// Vector of opened files - std::vector mFile; + std::vector mFile; + /// Vector of names of open files - std::vector mFileName; + std::vector mFileName; + /// Stores the current line number in each open file - std::vector mLine; + std::vector mLine; + /// The dictionnary of commands CommandDictType mCommandDict; + /// Are we in a command line context ? bool mCommandLine; + /// The history of commands std::deque< char* > mHistory; diff --git a/kernel/src/bbtkUtilities.cxx b/kernel/src/bbtkUtilities.cxx index 6ebbe61..f15e708 100644 --- a/kernel/src/bbtkUtilities.cxx +++ b/kernel/src/bbtkUtilities.cxx @@ -3,28 +3,5 @@ namespace bbtk { - /* - //======================================================================== - /// Usefull functions for html generation - static void replace( std::string& str, - const std::string& from, const std::string& to ) - { - using std::string; - string::size_type pos = str.find( from ); - while ( pos != string::npos ) - { - // std::cout << "'" << str << "' -> '"; - str.replace( pos, from.size(), to ); - pos = str.find( from, pos+from.size()-1 ); - // std::cout << str << "'"<< std::endl; - } - } - //========================================================================== - inline void html_format(std::string& str) - { - replace( str, "&", "&" ); - replace( str, "<", "<"# ); - replace( str, ">", ">" ); - } - */ + } diff --git a/kernel/src/bbtkUtilities.h b/kernel/src/bbtkUtilities.h index b83193f..d9c3193 100644 --- a/kernel/src/bbtkUtilities.h +++ b/kernel/src/bbtkUtilities.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkUtilities.h,v $ Language: C++ - Date: $Date: 2008/01/22 15:02:00 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/01/22 16:55:04 $ + Version: $Revision: 1.2 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See doc/license.txt or @@ -30,14 +30,271 @@ #ifndef __bbtkUtilities_h_INCLUDED__ #define __bbtkUtilities_h_INCLUDED__ +#include "bbtkConfigurationFile.h" #include "bbtkSystem.h" #include +#include +#ifdef CMAKE_HAVE_TERMIOS_H +#include +#define BBTK_USE_TERMIOS_BASED_PROMPT +#endif namespace bbtk { /// Holds various usefull methods struct BBTK_EXPORT Utilities - { + { + // See : http://www.techbytes.ca/techbyte103.html for more O.S. + static inline bool FileExists(std::string strFilename) + { + struct stat stFileInfo; + bool blnReturn; + int intStat; + + // Attempt to get the file attributes + intStat = stat(strFilename.c_str(),&stFileInfo); + if(intStat == 0) { + // We were able to get the file attributes + // so the file obviously exists. + blnReturn = true; + } else { + // We were not able to get the file attributes. + // This may mean that we don't have permission to + // access the folder which contains this file. If you + // need to do that level of checking, lookup the + // return values of stat which will give you + // more details on why stat failed. + blnReturn = false; + } + + return(blnReturn); + } + + +// =================================================================================== + + static std::string ExtractPackageName(const std::string &name, + std::string& path) + { + std::string pkgname; + path = ""; + + std::string::size_type slash_position = name.find_last_of("/\\"); + if (slash_position != std::string::npos) + { + pkgname = name.substr(slash_position+1,std::string::npos); + path = name.substr(0,slash_position); + // std::cout << "F:P='"<.so + + // remove {libbb} if any + if (memcmp ( pkgname.c_str(), "libbb", 5) == 0) { + pkgname = pkgname.substr(5, pkgname.length()); + } + /* + /// \ \todo what would happen if (stupid) user names his package 'libbb' ?!? + /// \ --> Should be forbidden! + */ +#elif defined(_WIN32) + + // WIN 32 mechanism + // shared lib name = .dll + + // remove {bb} if any + if (memcmp (pkgname.c_str(), "bb", 2) == 0) { + pkgname = pkgname.substr(2, pkgname.length()); + } + + /* + /// \ \todo what would happen if (stupid) user names his package 'bb' ?!? + /// \ --> Should be forbidden! + */ +#else + bbtkError("neither __GNUC__ nor _WIN32 ?!? How did you compile ?"); +#endif + return pkgname; + } + +// =================================================================================== + + static std::string ExtractScriptName(const std::string &name) + { + std::string pkgname; + + std::string::size_type slash_position = name.find_last_of("/\\"); + if (slash_position != std::string::npos) { + pkgname =name.substr(slash_position+1,std::string::npos); + } else { + pkgname = name; + } + // remove {.bbs } if any + std::string::size_type dot_position = pkgname.find_last_of('.'); + if (dot_position != std::string::npos){ + pkgname = pkgname.substr(0,dot_position); + } + return pkgname; + } + +// =================================================================================== + + static std::string ExpandLibName(const std::string &name, bool verbose) + { + // ----- Think of expanding path name ( ./ ../ ../../ ) + + char buf[2048]; // for getcwd + char * currentDir = getcwd(buf, 2048); + std::string cwd(currentDir); + std::string libname(name); + + // tooHigh : true is user supplies a library pathname with too many "../" + bool tooHigh = false; + + if ( name[0] == '/' || name[0] == '\\' ) + { + return(libname); + } + else if (name[0] == '.' && (name[1] == '/' || name[1] == '\\') ) + { + libname = cwd + ConfigurationFile::GetInstance().Get_file_separator () + name.substr(2, name.length()); + return(libname); + } + else if ( name[0] == '.' && name[1] == '.' && (name[2] == '/' || name[2] == '\\') ) + { + if ( IsAtRoot(cwd) ) // hope it gets / (for Linux), C: D: (for Windows) + { + // if we are already at / or c: --> hopeless + if (verbose) + std::cout << " File path [" << name << "] doesn't exist" << std::endl; + tooHigh = true; + } + else + { + // iterate on ../ and go up from the current working dir! + std::string a(name); + bool alreadyProcessRoot = false; + for(;;) + { + std::string::size_type slash_position = cwd.find_last_of(ConfigurationFile::GetInstance().Get_file_separator ()); + if (slash_position != std::string::npos) { + if (slash_position == 0) + slash_position = 1; + cwd = cwd.substr(0,slash_position/*+1*/); + a = a.substr(3, name.length()); // remove ../ + if (a == "" || alreadyProcessRoot) + { + if (verbose) + std::cout << " File path [" << name << "] doesn't exist" << std::endl; + tooHigh = true; + break; + } + // std::string b = cwd + a; + libname = cwd; + char c = cwd[cwd.size()-1]; + if (c != '/' && c != '\\' ) + libname += ConfigurationFile::GetInstance().Get_file_separator (); + libname += a; + + if ( a[0] != '.' ) // if . (probabely ../), loop again + break; + + if (IsAtRoot(cwd)) + alreadyProcessRoot = true; + } + } // end iterating on ../ + } + if (tooHigh) + libname=""; + return (libname); + + } // ----- End of expanding path name ( ./ ../ ../../ ) + + // To avoid warning + return(""); // Will never get here! + } + +// =================================================================================== + + static std::string MakeLibnameFromPath(std::string path, std::string pkgname) + { + std::string libname = path; + char c = path[path.size()-1]; +#if defined(__GNUC__) + if (c != '/') + libname += "/libbb"; + libname += pkgname; + libname += ".so"; + +#elif defined(_WIN32) + if (c != '\\') + libname = path+"\\bb"; + libname += pkgname; + libname += ".dll"; +#endif + return libname; + } + +// =================================================================================== + + static inline std::string MakePkgnameFromPath(std::string path, std::string pkgname) + { + std::string libname = path; + char c = path[path.size()-1]; + if (c != '/' && c != '\\') + libname += ConfigurationFile::GetInstance().Get_file_separator (); + libname += pkgname; + libname += ".bbs"; + return libname; + } + +// =================================================================================== + + static inline bool IsAtRoot(std::string cwd) + { + if ( cwd == "/" // hope it gets / (for Linux) + || (cwd.size() <= 3 && cwd[1] == ':') ) // hope it gets C: D: (for Windows) + return (true); + else + return(false); +} + +// =================================================================================== + + static inline void SplitAroundFirstDot( const std::string& in, + std::string& left, + std::string& right) + { + std::string delimiter = "."; + std::string::size_type pos = in.find_first_of(delimiter); + if (std::string::npos != pos) + { + left = in.substr(0,pos); + right = in.substr(pos+1,in.size()); + + } + /* + else + { + bbtkError(in<<" : expected 'a.b' format but no dot found"); + } + */ + left =""; + right = ""; + } + static inline std::string get_file_name(const std::string& s) { std::string::size_type slash_position = s.find_last_of("/\\"); @@ -48,7 +305,7 @@ namespace bbtk else { return s; - } + } } diff --git a/kernel/src/bbtkVirtualExec.h b/kernel/src/bbtkVirtualExec.h index 9a15909..2edbd0e 100644 --- a/kernel/src/bbtkVirtualExec.h +++ b/kernel/src/bbtkVirtualExec.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkVirtualExec.h,v $ $ Language: C++ - Date: $Date: 2008/01/22 15:02:00 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/01/22 16:55:04 $ + Version: $Revision: 1.2 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or -- 2.45.2