Skip to content

Fixed relative locate_root path normalization #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Flast wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fixed relative locate_root path normalization #49

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion common/src/process_jam_log.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,14 @@ int process_jam_log( const std::vector<std::string> & args )
}
else if ( !locate_root.has_root_path() )
{
locate_root = ( fs::initial_path() / locate_root ).normalize();
// path.normalize() encodes to dot terinated path if trailing non-root slash is present.
// path{"/foo/"}.normalize() //=> /foo/.
// In this case, stringized path is 2 chars longer than non dot terminated path, and it
// may fail to construct correct path in target_directory(). To avoid this behaviour
// make file path form once, and get normalized parent path.
//
// https://www.boost.org/libs/filesystem/doc/reference.html#path-iterators
locate_root = ( fs::initial_path() / locate_root / "entry" ).normalize().parent_path();
}

if ( input == 0 )
Expand Down