Add fixup separators also revert prefix if filename has relative path

Andrey Kravchenko · Andrey Kravchenko · commit e4412c5a8489 · 2024-12-01T01:55:46.000+03:00
diff --git a/src/jrd/replication/Config.cpp b/src/jrd/replication/Config.cpp
@@ -246,7 +246,11 @@ Config* Config::get(const PathName& lookupName)
 								}
 								else if (key_source.equals(KEY_FILE))
 								{
-									const PathName sub_filename = sub_value.c_str();
+									PathName sub_filename = sub_value.c_str();
+									PathUtils::fixupSeparators(sub_filename);
+									if (PathUtils::isRelative(sub_filename))
+										sub_filename = fb_utils::getPrefix(IConfigManager::DIR_CONF, sub_filename.c_str());
+
 									AutoPtr<FILE> file(os_utils::fopen(sub_filename.c_str(), "rt"));
 									if (!file)
 										configError("missing or inaccessible file", value, sub_filename.c_str());

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,11 @@ Config* Config::get(const PathName& lookupName)`
`246`	`246`	`}`
`247`	`247`	`else if (key_source.equals(KEY_FILE))`
`248`	`248`	`{`
`249`		`- const PathName sub_filename = sub_value.c_str();`
	`249`	`+ PathName sub_filename = sub_value.c_str();`
	`250`	`+ PathUtils::fixupSeparators(sub_filename);`
	`251`	`+ if (PathUtils::isRelative(sub_filename))`
	`252`	`+ sub_filename = fb_utils::getPrefix(IConfigManager::DIR_CONF, sub_filename.c_str());`
	`253`	`+`
`250`	`254`	`AutoPtr<FILE> file(os_utils::fopen(sub_filename.c_str(), "rt"));`
`251`	`255`	`if (!file)`
`252`	`256`	`configError("missing or inaccessible file", value, sub_filename.c_str());`