Merge pull request #6703 from rjbou/filename-trailing-slash

API: remove duplicated directory separator when creating a filename

Author: kit-ty-kate

master_changes.md

@@ -34,6 +34,7 @@ users)
 ## UI
   * Show the invalid character when detecting an erroneous package name [#6638 @lefessan - fix #6396]
   * Handle non-displayable characters when detecting an erroneous package name or version [#6640 @kit-ty-kate]
+  * Remove duplicated directory separator when displaying some rare filenames [#6703 @rjbou]
 
 ## Switch
 
@@ -202,3 +203,4 @@ users)
   * `OpamStd.String.contains_char`: was removed. Use `Stdlib.String.contains` instead. [#6442 @kit-ty-kate]
   * `OpamStd.String.map`: was removed. Use `Stdlib.String.map` instead. [#6442 @kit-ty-kate]
   * `OpamStd.String.{starts_with,ends_with,for_all,fold_left}`: were moved to `OpamCompat.String` [#6442 @kit-ty-kate]
+  * `OpamFilename.create`: deduplicate the directory separator character when the basename starts with one [#6703 @rjbou]

src/core/opamFilename.ml

@@ -159,6 +159,11 @@ let create dirname basename =
   if basename = b2 then
     { dirname; basename }
   else
+    let b1 =
+      if dirname = ""
+      then b1
+      else OpamStd.String.remove_prefix ~prefix:Filename.dir_sep b1
+    in
     { dirname = dirname / b1; basename = b2 }
 
 let of_basename basename =

tests/reftests/extrafile.test

@@ -546,7 +546,7 @@ The following actions will be performed:
 
 <><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
 
-Sys_error("${BASEDIR}/OPAM/repo/default/packages/escape-absolute/escape-absolute.1/files//etc/passwdd: No such file or directory")
+Sys_error("${BASEDIR}/OPAM/repo/default/packages/escape-absolute/escape-absolute.1/files/etc/passwdd: No such file or directory")
 
 
 <><> Error report <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
@@ -562,7 +562,7 @@ The following actions will be performed:
 
 <><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
 
-Sys_error("${BASEDIR}/OPAM/repo/default/packages/escape-absolute/escape-absolute.1/files//etc/passwdd: No such file or directory")
+Sys_error("${BASEDIR}/OPAM/repo/default/packages/escape-absolute/escape-absolute.1/files/etc/passwdd: No such file or directory")
 
 
 <><> Error report <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
@@ -573,7 +573,7 @@ Sys_error("${BASEDIR}/OPAM/repo/default/packages/escape-absolute/escape-absolute
 # Return code 31 #
 ### opam source escape-absolute
 Fatal error:
-Sys_error("${BASEDIR}/OPAM/repo/default/packages/escape-absolute/escape-absolute.1/files//etc/passwdd: No such file or directory")
+Sys_error("${BASEDIR}/OPAM/repo/default/packages/escape-absolute/escape-absolute.1/files/etc/passwdd: No such file or directory")
 # Return code 99 #
 ### test -f escape-absolute.1/p.patch
 # Return code 1 #