Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

os: don't check non-nil err twice in Symlink on windows

Browse source 
Change-Id: I398d324723025b559fdca783fc334de9be68f2d1
Reviewed-on: https://go-review.googlesource.com/c/go/+/314030
Trust: Tobias Klauser <tobias.klauser@gmail.com>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
This commit is contained in:
Tobias Klauser 2021-04-27 13:51:45 +02:00 • committed by Tobias Klauser
parent 0b9ca4d907
commit 88a8a27056
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/os/file_windows.go
View file

@ -365,18 +365,15 @@ func Symlink(oldname, newname string) error {
flags |= syscall.SYMBOLIC_LINK_FLAG_DIRECTORY flags |= syscall.SYMBOLIC_LINK_FLAG_DIRECTORY
} }
err = syscall.CreateSymbolicLink(n, o, flags) err = syscall.CreateSymbolicLink(n, o, flags)
if err != nil { if err != nil {
// the unprivileged create flag is unsupported // the unprivileged create flag is unsupported
// below Windows 10 (1703, v10.0.14972). retry without it. // below Windows 10 (1703, v10.0.14972). retry without it.
flags &^= windows.SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE flags &^= windows.SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE
err = syscall.CreateSymbolicLink(n, o, flags) err = syscall.CreateSymbolicLink(n, o, flags)
}
if err != nil { if err != nil {
return &LinkError{"symlink", oldname, newname, err} return &LinkError{"symlink", oldname, newname, err}
} }
}
return nil return nil
} }