cp: Fix Windows paths (#3250)

klauspost · web-flow · commit bdefdc0169b5 · 2020-06-10T09:31:59.000-07:00
Paths without `/` separator were not trimmed correctly. Fixes #3241 Regression originating from #3115
diff --git a/cmd/cp-url.go b/cmd/cp-url.go
@@ -201,7 +201,7 @@ func makeCopyContentTypeC(sourceAlias string, sourceURL ClientURL, sourceContent
 				return URLs{Error: probe.NewError(err)}
 			}
 			if fileInfo.IsDir() {
-				sourcePrefix = sourceURL.Path
+				sourcePrefix = filepath.ToSlash(sourceURL.Path)
 			}
 		}
 		newSourceSuffix = strings.TrimPrefix(newSourceSuffix, sourcePrefix)

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ func makeCopyContentTypeC(sourceAlias string, sourceURL ClientURL, sourceContent`
`201`	`201`	`return URLs{Error: probe.NewError(err)}`
`202`	`202`	`}`
`203`	`203`	`if fileInfo.IsDir() {`
`204`		`- sourcePrefix = sourceURL.Path`
	`204`	`+ sourcePrefix = filepath.ToSlash(sourceURL.Path)`
`205`	`205`	`}`
`206`	`206`	`}`
`207`	`207`	`newSourceSuffix = strings.TrimPrefix(newSourceSuffix, sourcePrefix)`