kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

pkg/system: replace more uses of "syscall"

Browse source 
follow-up to 069fdc8a08, replacing
more uses of the syscall package in favor of their "windows"
equivalents in golang.org/x/sys.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2020-03-09 11:50:32 +01:00
parent 6004b9ad52
commit 079fb80657
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkg/system/path_windows.go
View file

@ -1,24 +1,27 @@
package system // import "github.com/docker/docker/pkg/system" package system // import "github.com/docker/docker/pkg/system"
import "syscall" import "golang.org/x/sys/windows"
// GetLongPathName converts Windows short pathnames to full pathnames. // GetLongPathName converts Windows short pathnames to full pathnames.
// For example C:\Users\ADMIN~1 --> C:\Users\Administrator. // For example C:\Users\ADMIN~1 --> C:\Users\Administrator.
// It is a no-op on non-Windows platforms // It is a no-op on non-Windows platforms
func GetLongPathName(path string) (string, error) { func GetLongPathName(path string) (string, error) {
// See https://groups.google.com/forum/#!topic/golang-dev/1tufzkruoTg // See https://groups.google.com/forum/#!topic/golang-dev/1tufzkruoTg
p := syscall.StringToUTF16(path) p, err := windows.UTF16FromString(path)
if err != nil {
return "", err
}
b := p // GetLongPathName says we can reuse buffer b := p // GetLongPathName says we can reuse buffer
n, err := syscall.GetLongPathName(&p[0], &b[0], uint32(len(b))) n, err := windows.GetLongPathName(&p[0], &b[0], uint32(len(b)))
if err != nil { if err != nil {
return "", err return "", err
} }
if n > uint32(len(b)) { if n > uint32(len(b)) {
b = make([]uint16, n) b = make([]uint16, n)
_, err = syscall.GetLongPathName(&p[0], &b[0], uint32(len(b))) _, err = windows.GetLongPathName(&p[0], &b[0], uint32(len(b)))
if err != nil { if err != nil {
return "", err return "", err
} }
} }
return syscall.UTF16ToString(b), nil return windows.UTF16ToString(b), nil
} }