kiwix/kiwix-tools
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-tools.git synced 2025-09-25 13:19:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Adapt kiwix-tools to the new libkiwix headers.

Browse Source 
Fix #467
This commit is contained in:
Matthieu Gautier 2021-07-08 10:09:17 +02:00
parent d1edbc11d3
commit 81ac333cc9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/manager/kiwix-manage.cpp
View File

@ -18,8 +18,8 @@
*/ */
#include <getopt.h> #include <getopt.h>
#include <kiwix/tools/stringTools.h>
#include <kiwix/manager.h> #include <kiwix/manager.h>
#include <kiwix/tools.h>
#include <cstdlib> #include <cstdlib>
#include <iostream> #include <iostream>
@ -255,8 +255,8 @@ int main(int argc, char** argv)
} }
/* Try to read the file */ /* Try to read the file */
libraryPath = isRelativePath(libraryPath) libraryPath = kiwix::isRelativePath(libraryPath)
? computeAbsolutePath(getCurrentDirectory(), libraryPath) ? kiwix::computeAbsolutePath(kiwix::getCurrentDirectory(), libraryPath)
: libraryPath; : libraryPath;
kiwix::Manager manager(&library); kiwix::Manager manager(&library);
manager.readFile(libraryPath, false); manager.readFile(libraryPath, false);

6
src/server/kiwix-serve.cpp
View File

@ -21,7 +21,7 @@
#include <kiwix/manager.h> #include <kiwix/manager.h>
#include <kiwix/server.h> #include <kiwix/server.h>
#include <kiwix/name_mapper.h> #include <kiwix/name_mapper.h>
#include <kiwix/tools/otherTools.h> #include <kiwix/tools.h>
#ifdef _WIN32 #ifdef _WIN32
# include <windows.h> # include <windows.h>
@ -196,8 +196,8 @@ int main(int argc, char** argv)
try { try {
string libraryPath string libraryPath
= isRelativePath(*itr) = kiwix::isRelativePath(*itr)
? computeAbsolutePath(getCurrentDirectory(), *itr) ? kiwix::computeAbsolutePath(kiwix::getCurrentDirectory(), *itr)
: *itr; : *itr;
retVal = manager.readFile(libraryPath, true, trustlibrary); retVal = manager.readFile(libraryPath, true, trustlibrary);
} catch (...) { } catch (...) {