From a9d1e672f0e4df714973c2c44c4e8939d8905edf Mon Sep 17 00:00:00 2001 From: kelson42 Date: Sat, 9 Aug 2014 21:41:08 +0200 Subject: [PATCH] + fix kiwix-mange and kiwix-serve to be able to deal with relative library paths --- src/manager/kiwix-manage.cpp | 1 + src/server/kiwix-serve.cpp | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/manager/kiwix-manage.cpp b/src/manager/kiwix-manage.cpp index e8f15b1..19c4e38 100644 --- a/src/manager/kiwix-manage.cpp +++ b/src/manager/kiwix-manage.cpp @@ -86,6 +86,7 @@ int main(int argc, char **argv) { } /* Try to read the file */ + libraryPath = isRelativePath(libraryPath) ? computeAbsolutePath(removeLastPathElement(getExecutablePath(), true, false), libraryPath) : libraryPath; libraryManager.readFile(libraryPath, false); /* SHOW */ diff --git a/src/server/kiwix-serve.cpp b/src/server/kiwix-serve.cpp index b92ed2b..a80a4e6 100644 --- a/src/server/kiwix-serve.cpp +++ b/src/server/kiwix-serve.cpp @@ -566,8 +566,10 @@ int main(int argc, char **argv) { for ( itr = libraryPaths.begin(); itr != libraryPaths.end(); ++itr ) { if (!(*itr).empty()) { bool retVal = false; + string libraryPath = isRelativePath(*itr) ? computeAbsolutePath(removeLastPathElement(getExecutablePath(), true, false), *itr) : *itr; + try { - retVal = libraryManager.readFile(*itr, true); + retVal = libraryManager.readFile(libraryPath, true); } catch (...) { retVal = false; }