0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fs: Fix relative directory creation incongruity with Boost.filesystem

Browse source 
The non-BFS version of create_directory_if_missing_recursive() handles
relative path names (e.g. "foo") correctly and doesn't attempt to create
a parent that is left unspecified in the path (i.e. empty), but the BFS
version does, predictably failing the whole operation.

This fixes an issue where `./wesnoth -p data foo` from the source tree
would fail with `error filesystem: Could not create parents to foo` if
`foo` did not already exist, when using the Boost.filesystem-based
implementation. `./wesnoth -p data ./foo` would succeed because there is
a visible parent directory '.' that already exists and needs not be
created again.
This commit is contained in:
Ignacio R. Morelle 2014-11-09 18:53:49 -03:00
parent c87134f36e
commit 83907ce8ca
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changelog
View file

@ -1,6 +1,10 @@
Version 1.11.19+dev:
* Language and i18n:
* Updated translations: German
* Miscellaneous and bug fixes:
* Fixed recursive directory creation failing for working dir-relative paths
without an explicit `./` at the start (e.g. in `wesnoth -p data/core foo`)
for builds using Boost.filesystem.
Version 1.11.19:
* Campaigns:

2
src/filesystem_boost.cpp
View file

@ -284,7 +284,7 @@ static bool create_directory_if_missing_recursive(const path& dirpath)
return false;
}
if (create_directory_if_missing_recursive(dirpath.parent_path())) {
if (!dirpath.has_parent_path() || create_directory_if_missing_recursive(dirpath.parent_path())) {
return create_directory_if_missing(dirpath);
} else {
ERR_FS << "Could not create parents to " << dirpath.string() << '\n';