]> git.ipfire.org Git - thirdparty/gcc.git/commit - libstdc++-v3/testsuite/27_io/filesystem/path/generation/normal.cc
PR libstdc++/87116 fix path::lexically_normal() handling of dot-dot
authorJonathan Wakely <jwakely@redhat.com>
Tue, 28 Aug 2018 15:33:53 +0000 (16:33 +0100)
committerJonathan Wakely <redi@gcc.gnu.org>
Tue, 28 Aug 2018 15:33:53 +0000 (16:33 +0100)
commitdd35da2cbef6d8bf9db86d7e66faeebb5022c881
tree4a236cb188b846308f29b7524e0686eb729df251
parentf30bafb7fcf78e1472cb6cadc6e953d1586a0db3
PR libstdc++/87116 fix path::lexically_normal() handling of dot-dot

Previously the logic that turned "a/b/c/../.." into "a/" failed to
preserve an empty path at the end of the iteration sequence, as required
by the trailing slash. That meant the result didn't meet the class
invariants, and that "a/b/c/d/../../.." would remove four components
instead of the three that "../../.." should remove.

PR libstdc++/87116
* src/filesystem/std-path.cc (path::lexically_normal): When handling
a dot-dot filename, preserve an empty final component in the iteration
sequence.
[_GLIBCXX_FILESYSTEM_IS_WINDOWS]: Use preferred-separator for
root-directory.
* testsuite/27_io/filesystem/path/generation/normal.cc: Add new tests
for more than two adjacent dot-dot filenames.
[_GLIBCXX_FILESYSTEM_IS_WINDOWS]: Replace slashes with
preferred-separator in expected normalized strings.

From-SVN: r263922
libstdc++-v3/ChangeLog
libstdc++-v3/src/filesystem/std-path.cc
libstdc++-v3/testsuite/27_io/filesystem/path/generation/normal.cc