allow more abs paths on windows, transform unix

mafredri · mafredri · commit 4891cbfac273 · 2023-12-19T13:15:03.000Z
diff --git a/cli/open.go b/cli/open.go
@@ -243,14 +243,15 @@ func isWindowsAbsPath(p string) bool {
 		return filepath.IsAbs(p)
 	}
 
+	// Remove the drive letter, if present.
+	if len(p) >= 2 && p[1] == ':' {
+		p = p[2:]
+	}
+
 	switch {
-	case len(p) < 2:
+	case len(p) == 0:
 		return false
-	case p[1] == ':':
-		// Path starts with a drive letter.
-		return len(p) == 2 || (len(p) >= 3 && p[2] == '\\')
-	case p[0] == '\\' && p[1] == '\\':
-		// Path starts with \\.
+	case p[0] == '/' || p[0] == '\\':
 		return true
 	default:
 		return false
@@ -309,7 +310,7 @@ func resolveAgentAbsPath(workingDirectory, relOrAbsPath, agentOS string, local b
 		case workingDirectory != "" && !isWindowsAbsPath(relOrAbsPath):
 			return windowsJoinPath(workingDirectory, relOrAbsPath), nil
 		case isWindowsAbsPath(relOrAbsPath):
-			return relOrAbsPath, nil
+			return windowsJoinPath(relOrAbsPath), nil
 		default:
 			return "", xerrors.Errorf("path %q not supported, use an absolute path instead", relOrAbsPath)
 		}
diff --git a/cli/open_internal_test.go b/cli/open_internal_test.go
@@ -33,6 +33,8 @@ func Test_resolveAgentAbsPath(t *testing.T) {
 		{"ok with working directory and rel path on windows", args{workingDirectory: "C:\\some\\path", relOrAbsPath: "other\\path", agentOS: "windows"}, "C:\\some\\path\\other\\path", false},
 		{"ok with working directory and abs path on windows", args{workingDirectory: "C:\\some\\path", relOrAbsPath: "C:\\other\\path", agentOS: "windows"}, "C:\\other\\path", false},
 		{"ok with no working directory and abs path on windows", args{relOrAbsPath: "C:\\other\\path", agentOS: "windows"}, "C:\\other\\path", false},
+		{"ok abs unix path on windows", args{workingDirectory: "C:\\some\\path", relOrAbsPath: "/other/path", agentOS: "windows"}, "\\other\\path", false},
+		{"ok rel unix path on windows", args{workingDirectory: "C:\\some\\path", relOrAbsPath: "other/path", agentOS: "windows"}, "C:\\some\\path\\other\\path", false},
 
 		{"fail with no working directory and rel path on windows", args{relOrAbsPath: "other\\path", agentOS: "windows"}, "", true},
 	}

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,8 @@ func Test_resolveAgentAbsPath(t *testing.T) {`
`33`	`33`	`{"ok with working directory and rel path on windows", args{workingDirectory: "C:\\some\\path", relOrAbsPath: "other\\path", agentOS: "windows"}, "C:\\some\\path\\other\\path", false},`
`34`	`34`	`{"ok with working directory and abs path on windows", args{workingDirectory: "C:\\some\\path", relOrAbsPath: "C:\\other\\path", agentOS: "windows"}, "C:\\other\\path", false},`
`35`	`35`	`{"ok with no working directory and abs path on windows", args{relOrAbsPath: "C:\\other\\path", agentOS: "windows"}, "C:\\other\\path", false},`
	`36`	`+ {"ok abs unix path on windows", args{workingDirectory: "C:\\some\\path", relOrAbsPath: "/other/path", agentOS: "windows"}, "\\other\\path", false},`
	`37`	`+ {"ok rel unix path on windows", args{workingDirectory: "C:\\some\\path", relOrAbsPath: "other/path", agentOS: "windows"}, "C:\\some\\path\\other\\path", false},`
`36`	`38`
`37`	`39`	`{"fail with no working directory and rel path on windows", args{relOrAbsPath: "other\\path", agentOS: "windows"}, "", true},`
`38`	`40`	`}`