Merge pull request #214 from ipfs/fix/windows-path

Stebalien · web-flow · commit 35a667a9f292 · 2021-08-25T10:18:26.000-07:00
fix: preserve windows file paths
diff --git a/cli/parse.go b/cli/parse.go
@@ -304,7 +304,7 @@ func parseArgs(req *cmds.Request, root *cmds.Command, stdin *os.File) error {
 					}
 					file = files.NewWebFile(u)
 				} else {
-					fpath = filepath.ToSlash(filepath.Clean(fpath))
+					fpath = filepath.Clean(fpath)
 					derefArgs, _ := req.Options[cmds.DerefLong].(bool)
 					var err error
 
@@ -332,7 +332,7 @@ func parseArgs(req *cmds.Request, root *cmds.Command, stdin *os.File) error {
 						return err
 					}
 
-					fpath = path.Base(fpath)
+					fpath = filepath.Base(fpath)
 					file = nf
 				}
 

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ func parseArgs(req cmds.Request, root cmds.Command, stdin *os.File) error {`
`304`	`304`	`}`
`305`	`305`	`file = files.NewWebFile(u)`
`306`	`306`	`} else {`
`307`		`- fpath = filepath.ToSlash(filepath.Clean(fpath))`
	`307`	`+ fpath = filepath.Clean(fpath)`
`308`	`308`	`derefArgs, _ := req.Options[cmds.DerefLong].(bool)`
`309`	`309`	`var err error`
`310`	`310`
`@@ -332,7 +332,7 @@ func parseArgs(req cmds.Request, root cmds.Command, stdin *os.File) error {`
`332`	`332`	`return err`
`333`	`333`	`}`
`334`	`334`
`335`		`- fpath = path.Base(fpath)`
	`335`	`+ fpath = filepath.Base(fpath)`
`336`	`336`	`file = nf`
`337`	`337`	`}`
`338`	`338`