fix: Handle extra slashes in path arguments

twpayne · Nov 30, 2023 · c68ddac · c68ddac
1 parent 0b38793
commit c68ddac
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/internal/chezmoi/path_unix.go b/internal/chezmoi/path_unix.go
@@ -12,6 +12,7 @@ var devNullAbsPath = NewAbsPath("/dev/null")
 // NewAbsPathFromExtPath returns a new AbsPath by converting extPath to use
 // slashes, performing tilde expansion, and making the path absolute.
 func NewAbsPathFromExtPath(extPath string, homeDirAbsPath AbsPath) (AbsPath, error) {
+	extPath = filepath.Clean(extPath)
 	switch {
 	case extPath == "~":
 		return homeDirAbsPath, nil

diff --git a/internal/chezmoi/path_windows.go b/internal/chezmoi/path_windows.go
@@ -11,6 +11,7 @@ var devNullAbsPath = NewAbsPath("NUL:")
 // slashes, performing tilde expansion, making the path absolute, and converting
 // the volume name to uppercase.
 func NewAbsPathFromExtPath(extPath string, homeDirAbsPath AbsPath) (AbsPath, error) {
+	extPath = filepath.Clean(extPath)
 	switch {
 	case extPath == "~":
 		return homeDirAbsPath, nil

diff --git a/internal/cmd/testdata/scripts/issue3374.txtar b/internal/cmd/testdata/scripts/issue3374.txtar
@@ -0,0 +1,8 @@
+# test that chezmoi copes with extra slashes in path arguments
+exec chezmoi cat $HOME//.file
+cmp stdout golden/.file
+
+-- golden/.file --
+# contents of .file
+-- home/user/.local/share/chezmoi/dot_file --
+# contents of .file