Merge pull request #60 from arixmkii/cygpathsupport

AkihiroSuda · web-flow · commit c5bb0ead2051 · 2023-01-23T11:47:20.000+09:00
Accepting absolute Unix paths on Windows for use in Cygwin/msys2
diff --git a/pkg/reversesshfs/reversesshfs.go b/pkg/reversesshfs/reversesshfs.go
@@ -125,9 +125,12 @@ func DetectDriver(explicitOpensshSftpServerBinary string) (Driver, string, error
 func (rsf *ReverseSSHFS) Start() error {
 	sshBinary := rsf.SSHConfig.Binary()
 	sshArgs := rsf.SSHConfig.Args()
-	if !filepath.IsAbs(rsf.LocalPath) {
+	if !filepath.IsAbs(rsf.LocalPath) && !path.IsAbs(rsf.LocalPath) {
 		return fmt.Errorf("unexpected relative path: %q", rsf.LocalPath)
 	}
+	if runtime.GOOS == "windows" && path.IsAbs(rsf.LocalPath) {
+		logrus.Infof("Accepting %q Unix path, assuming Cygwin/msys2 OpenSSH", rsf.LocalPath)
+	}
 	if !path.IsAbs(rsf.RemotePath) {
 		return fmt.Errorf("unexpected relative path: %q", rsf.RemotePath)
 	}

Original file line number	Diff line number	Diff line change
`@@ -125,9 +125,12 @@ func DetectDriver(explicitOpensshSftpServerBinary string) (Driver, string, error`
`125`	`125`	`func (rsf *ReverseSSHFS) Start() error {`
`126`	`126`	`sshBinary := rsf.SSHConfig.Binary()`
`127`	`127`	`sshArgs := rsf.SSHConfig.Args()`
`128`		`- if !filepath.IsAbs(rsf.LocalPath) {`
	`128`	`+ if !filepath.IsAbs(rsf.LocalPath) && !path.IsAbs(rsf.LocalPath) {`
`129`	`129`	`return fmt.Errorf("unexpected relative path: %q", rsf.LocalPath)`
`130`	`130`	`}`
	`131`	`+ if runtime.GOOS == "windows" && path.IsAbs(rsf.LocalPath) {`
	`132`	`+ logrus.Infof("Accepting %q Unix path, assuming Cygwin/msys2 OpenSSH", rsf.LocalPath)`
	`133`	`+ }`
`131`	`134`	`if !path.IsAbs(rsf.RemotePath) {`
`132`	`135`	`return fmt.Errorf("unexpected relative path: %q", rsf.RemotePath)`
`133`	`136`	`}`