octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-09 23:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix go lint warnings

Browse Source
This commit is contained in:
Audrius Butkevicius 2015-06-24 22:05:27 +01:00
parent 070eced2f6
commit 824fa8f17a
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/osutil/glob_windows.go
View File

@ -15,6 +15,7 @@ import (
"strings" "strings"
) )
// Glob implements filepath.Glob, but works with Windows long path prefixes.
// Deals with https://github.com/golang/go/issues/10577 // Deals with https://github.com/golang/go/issues/10577
func Glob(pattern string) (matches []string, err error) { func Glob(pattern string) (matches []string, err error) {
if !hasMeta(pattern) { if !hasMeta(pattern) {

20
internal/symlinks/symlink_windows.go
View File

@ -21,11 +21,11 @@ import (
) )
const ( const (
FSCTL_GET_REPARSE_POINT = 0x900a8 Win32FsctlGetReparsePoint = 0x900a8
FILE_FLAG_OPEN_REPARSE_POINT = 0x00200000 Win32FileFlagOpenReparsePoint = 0x00200000
FILE_ATTRIBUTE_REPARSE_POINT = 0x400 Win32FileAttributeReparsePoint = 0x400
IO_REPARSE_TAG_SYMLINK = 0xA000000C Win32IOReparseTagSymlink = 0xA000000C
SYMBOLIC_LINK_FLAG_DIRECTORY = 0x1 Win32SymbolicLinkFlagDirectory = 0x1
) )
var ( var (
@ -106,7 +106,7 @@ func Read(path string) (string, uint32, error) {
if err != nil { if err != nil {
return "", protocol.FlagSymlinkMissingTarget, err return "", protocol.FlagSymlinkMissingTarget, err
} }
handle, err := syscall.CreateFile(ptr, 0, syscall.FILE_SHARE_READ|syscall.FILE_SHARE_WRITE|syscall.FILE_SHARE_DELETE, nil, syscall.OPEN_EXISTING, syscall.FILE_FLAG_BACKUP_SEMANTICS|FILE_FLAG_OPEN_REPARSE_POINT, 0) handle, err := syscall.CreateFile(ptr, 0, syscall.FILE_SHARE_READ|syscall.FILE_SHARE_WRITE|syscall.FILE_SHARE_DELETE, nil, syscall.OPEN_EXISTING, syscall.FILE_FLAG_BACKUP_SEMANTICS|Win32FileFlagOpenReparsePoint, 0)
if err != nil || handle == syscall.InvalidHandle { if err != nil || handle == syscall.InvalidHandle {
return "", protocol.FlagSymlinkMissingTarget, err return "", protocol.FlagSymlinkMissingTarget, err
} }
@ -114,12 +114,12 @@ func Read(path string) (string, uint32, error) {
var ret uint16 var ret uint16
var data reparseData var data reparseData
r1, _, err := syscall.Syscall9(procDeviceIoControl.Addr(), 8, uintptr(handle), FSCTL_GET_REPARSE_POINT, 0, 0, uintptr(unsafe.Pointer(&data)), unsafe.Sizeof(data), uintptr(unsafe.Pointer(&ret)), 0, 0) r1, _, err := syscall.Syscall9(procDeviceIoControl.Addr(), 8, uintptr(handle), Win32FsctlGetReparsePoint, 0, 0, uintptr(unsafe.Pointer(&data)), unsafe.Sizeof(data), uintptr(unsafe.Pointer(&ret)), 0, 0)
if r1 == 0 { if r1 == 0 {
return "", protocol.FlagSymlinkMissingTarget, err return "", protocol.FlagSymlinkMissingTarget, err
} }
var flags uint32 = 0 var flags uint32
attr, err := syscall.GetFileAttributes(ptr) attr, err := syscall.GetFileAttributes(ptr)
if err != nil { if err != nil {
flags = protocol.FlagSymlinkMissingTarget flags = protocol.FlagSymlinkMissingTarget
@ -154,10 +154,10 @@ func Create(source, target string, flags uint32) error {
stat, err := os.Stat(path) stat, err := os.Stat(path)
if err == nil && stat.IsDir() { if err == nil && stat.IsDir() {
mode = SYMBOLIC_LINK_FLAG_DIRECTORY mode = Win32SymbolicLinkFlagDirectory
} }
} else if flags&protocol.FlagDirectory != 0 { } else if flags&protocol.FlagDirectory != 0 {
mode = SYMBOLIC_LINK_FLAG_DIRECTORY mode = Win32SymbolicLinkFlagDirectory
} }
r0, _, err := syscall.Syscall(procCreateSymbolicLink.Addr(), 3, uintptr(unsafe.Pointer(srcp)), uintptr(unsafe.Pointer(trgp)), uintptr(mode)) r0, _, err := syscall.Syscall(procCreateSymbolicLink.Addr(), 3, uintptr(unsafe.Pointer(srcp)), uintptr(unsafe.Pointer(trgp)), uintptr(mode))