Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix calculation of relative include files - look in same directory as the current file

This commit is contained in:
Wilfried Goesgens 2017-02-20 16:43:54 +01:00
parent a5025e0b02
commit b75a9e7be0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ProgramOptions/IniFileParser.h
View File

@ -23,7 +23,7 @@
#ifndef ARANGODB_PROGRAM_OPTIONS_INI_FILE_PARSER_H
#define ARANGODB_PROGRAM_OPTIONS_INI_FILE_PARSER_H 1
#include "Basics/Common.h"
#include "Basics/FileUtils.h"
#include <fstream>
#include <iostream>
@ -114,7 +114,6 @@ class IniFileParser {
if (!basics::StringUtils::isSuffix(include, ".conf")) {
include += ".conf";
}
if (_seen.find(include) != _seen.end()) {
LOG_TOPIC(FATAL, Logger::CONFIG) << "recursive include of file '"
<< include << "'";
@ -123,6 +122,11 @@ class IniFileParser {
_seen.insert(include);
if (! basics::FileUtils::isRegularFile(include)) {
auto dn = basics::FileUtils::dirname(filename);
include = basics::FileUtils::buildFilename(dn, include);
}
LOG_TOPIC(DEBUG, Logger::CONFIG) << "reading include file '" << include
<< "'";