Skip to content

Commit

Permalink
ditto
Browse files Browse the repository at this point in the history
  • Loading branch information
mattn committed Dec 4, 2019
1 parent ce84684 commit 63eb7f4
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 18 deletions.
2 changes: 2 additions & 0 deletions list_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,13 @@ func TestCommandListUnknown(t *testing.T) {
func sortLines(s string) string {
ss := strings.Split(strings.TrimSpace(s), "\n")
sort.Strings(ss)
/* mattn
if runtime.GOOS == "windows" {
for i, p := range ss {
ss[i] = toFullPath(p)
}
}
*/
return strings.Join(ss, "\n")
}

Expand Down
4 changes: 2 additions & 2 deletions local_repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ func LocalRepositoryFromFullPath(fullPath string, backend *VCSBackend) (*LocalRe
return nil, err
}

fullPath = toFullPath(fullPath)
//fullPath = toFullPath(fullPath)

var root string
for _, root = range roots {
root = toFullPath(root)
//root = toFullPath(root)
if !strings.HasPrefix(fullPath, root) {
continue
}
Expand Down
31 changes: 15 additions & 16 deletions local_repository_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,24 @@

package main

import "syscall"

func toFullPath(s string) string {
/*
p := syscall.StringToUTF16(s)
b := p
n, err := syscall.GetLongPathName(&p[0], &b[0], uint32(len(b)))
p := syscall.StringToUTF16(s)
b := p
n, err := syscall.GetLongPathName(&p[0], &b[0], uint32(len(b)))
if err != nil {
println("error", err.Error())
return s
}
if n > uint32(len(b)) {
b = make([]uint16, n)
n, err = syscall.GetLongPathName(&p[0], &b[0], uint32(len(b)))
if err != nil {
println("error", err.Error())
return s
}
if n > uint32(len(b)) {
b = make([]uint16, n)
n, err = syscall.GetLongPathName(&p[0], &b[0], uint32(len(b)))
if err != nil {
println("error", err.Error())
return s
}
}
b = b[:n]
return syscall.UTF16ToString(b)
*/
return s
}
b = b[:n]
return syscall.UTF16ToString(b)
}

0 comments on commit 63eb7f4

Please sign in to comment.