arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix DataDir for C++03 and below (GH #760)

pull/762/head
Jeffrey Walton 2018-12-07 23:42:31 -05:00
parent 5b0df2592a
commit eee358b025
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
validate.h
View File

@ -256,25 +256,28 @@ inline std::string AddSeparator(std::string str)
inline std::string DataDir(const std::string& filename) inline std::string DataDir(const std::string& filename)
{ {
std::string name;
std::ifstream file; std::ifstream file;
#ifndef CRYPTOPP_DISABLE_DATA_DIR_SEARCH #ifndef CRYPTOPP_DISABLE_DATA_DIR_SEARCH
// Data files in PWD are probably the newest. This is probably a build directory. // Data files in PWD are probably the newest. This is probably a build directory.
file.open(std::string("./") + filename); name = std::string("./") + filename;
file.open(name.c_str());
if (file.is_open()) if (file.is_open())
return std::string("./") + filename; return name;
#endif #endif
#ifdef CRYPTOPP_DATA_DIR #ifdef CRYPTOPP_DATA_DIR
// Honor the user's setting next. This is likely an install directory if it is not "./". // Honor the user's setting next. This is likely an install directory if it is not "./".
std::string data_dir(AddSeparator(CRYPTOPP_DATA_DIR)); name = AddSeparator(CRYPTOPP_DATA_DIR) + filename;
file.open(data_dir + filename); file.open(name.c_str());
if (file.is_open()) if (file.is_open())
data_dir + filename; return name;
#endif #endif
#ifndef CRYPTOPP_DISABLE_DATA_DIR_SEARCH #ifndef CRYPTOPP_DISABLE_DATA_DIR_SEARCH
// Finally look in {$ORIGIN}/bin/../share/ // Finally look in {$ORIGIN}/bin/../share/
file.open(std::string("../share/cryptopp/") + filename); name = std::string("../share/cryptopp/") + filename;
file.open(name.c_str());
if (file.is_open()) if (file.is_open())
return std::string("../share/cryptopp/") + filename; return name;
#endif #endif
// This will cause the expected exception in the caller // This will cause the expected exception in the caller
return filename; return filename;