PR libstdc++/82777 fix path normalization for dot-dot

	PR libstdc++/82777
	* src/filesystem/std-path.cc (path::lexically_normal): Remove dot-dot
	elements correctly.
	* testsuite/27_io/filesystem/path/generation/normal.cc: Add testcase.
	* testsuite/util/testsuite_fs.h (compare_paths): Improve exception
	text.

From-SVN: r254317

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b5adbb19dce2e63d7570f4325f0848a4674ccdd4..9805e4ba6647cab35e1dac5a94c1cf9bc0c822a7 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2017-11-01  Jonathan Wakely  <jwakely@redhat.com>
+
+       PR libstdc++/82777
+       * src/filesystem/std-path.cc (path::lexically_normal): Remove dot-dot
+       elements correctly.
+       * testsuite/27_io/filesystem/path/generation/normal.cc: Add testcase.
+       * testsuite/util/testsuite_fs.h (compare_paths): Improve exception
+       text.
+
 2017-10-30  Jonathan Wakely  <jwakely@redhat.com>
 
        * include/Makefile.am (stamp-bits-sup): Do not create broken symlink

diff --git a/libstdc++-v3/src/filesystem/std-path.cc b/libstdc++-v3/src/filesystem/std-path.cc
index 1e2a8fad584ad322d99337fc56bb9f63291fa5cc..330aee72b139efc96cab13539a7c2526a68fea64 100644 (file)
--- a/libstdc++-v3/src/filesystem/std-path.cc
+++ b/libstdc++-v3/src/filesystem/std-path.cc
@@ -388,10 +388,35 @@ path::lexically_normal() const
 #endif
       if (is_dotdot(p))
        {
-         if (ret.has_filename() && !is_dotdot(ret.filename()))
-           ret.remove_filename();
-         else if (ret.has_filename() || !ret.has_root_directory())
-           ret /= p;
+         if (ret.has_filename())
+           {
+             // remove a non-dot-dot filename immediately followed by /..
+             if (!is_dotdot(ret.filename()))
+               ret.remove_filename();
+             else
+               ret /= p;
+           }
+         else if (!ret.has_relative_path())
+           {
+             if (!ret.is_absolute())
+               ret /= p;
+           }
+         else
+           {
+             // Got a path with a relative path (i.e. at least one non-root
+             // element) and no filename at the end (i.e. empty last element),
+             // so must have a trailing slash. See what is before it.
+             auto elem = std::prev(ret.end(), 2);
+             if (elem->has_filename() && !is_dotdot(*elem))
+               {
+                 // Remove the filename before the trailing slash
+                 // (equiv. to ret = ret.parent_path().remove_filename())
+                 ret._M_pathname.erase(elem._M_cur->_M_pos);
+                 ret._M_cmpts.erase(elem._M_cur, ret._M_cmpts.end());
+               }
+             else // ???
+               ret /= p;
+           }
        }
       else if (is_dot(p))
        ret /= path();

diff --git a/libstdc++-v3/testsuite/27_io/filesystem/path/generation/normal.cc b/libstdc++-v3/testsuite/27_io/filesystem/path/generation/normal.cc
index 789ce186f82a8eeb4c5baba94ebc2b306cb7bccc..df3b7154ab3e20f2c5587aafa1fcf8db154cf6f1 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/filesystem/path/generation/normal.cc
+++ b/libstdc++-v3/testsuite/27_io/filesystem/path/generation/normal.cc
@@ -46,6 +46,10 @@ test02()
   compare_paths( path().lexically_normal(), "" );
 
   compare_paths( path("/..").lexically_normal(), "/" );
+
+  // PR libstdc++/82777
+  compare_paths( path("./a/b/c/../.././b/c").lexically_normal(), "a/b/c" );
+  compare_paths( path("/a/b/c/../.././b/c").lexically_normal(), "/a/b/c" );
 }
 
 void

diff --git a/libstdc++-v3/testsuite/util/testsuite_fs.h b/libstdc++-v3/testsuite/util/testsuite_fs.h
index 47f56090b4755772709cc35d3a646f43f8558da1..c18dae28fcc909ac10a6581feee2344dd5a6439b 100644 (file)
--- a/libstdc++-v3/testsuite/util/testsuite_fs.h
+++ b/libstdc++-v3/testsuite/util/testsuite_fs.h
@@ -40,7 +40,7 @@ namespace __gnu_test
 {
 #define PATH_CHK(p1, p2, fn) \
     if ( p1.fn() != p2.fn() ) \
-      throw test_fs::filesystem_error( #fn, p1, p2, \
+      throw test_fs::filesystem_error("comparing '" #fn "' failed", p1, p2, \
          std::make_error_code(std::errc::invalid_argument) )
 
   void