qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-09-29 13:14:28 -06:00
Code Releases Activity

syscall: rename close to closeFD

Browse Source 
...to avoid conflicts with the predeclared close function.

Change-Id: If6a19a004c390f4e0795ec207c72caa79a7281f4
Reviewed-on: https://go-review.googlesource.com/c/go/+/421934
Run-TryBot: Ian Lance Taylor <iant@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Tobias Klauser <tobias.klauser@gmail.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Auto-Submit: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
This commit is contained in:
Ian Lance Taylor 2022-08-06 13:28:20 -07:00 committed by Gopher Robot
parent 7e5e4a7cef
commit ced4d6fd2d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/runtime/syscall_aix.go
View File

@ -127,9 +127,9 @@ func syscall_chroot1(path uintptr) (err uintptr) {
// like close, but must not split stack, for fork.
//
//go:linkname syscall_close syscall.close
//go:linkname syscall_closeFD syscall.closeFD
//go:nosplit
func syscall_close(fd int32) int32 {
func syscall_closeFD(fd int32) int32 {
_, err := syscall1(&libc_close, uintptr(fd))
return int32(err)
}

2
src/syscall/asm_solaris_amd64.s
View File

@ -20,7 +20,7 @@ TEXT ·chdir(SB),NOSPLIT,$0
TEXT ·chroot1(SB),NOSPLIT,$0
JMP runtime·syscall_chroot(SB)
TEXT ·close(SB),NOSPLIT,$0
TEXT ·closeFD(SB),NOSPLIT,$0
JMP runtime·syscall_close(SB)
TEXT ·dup2child(SB),NOSPLIT,$0

6
src/syscall/exec_libc.go
View File

@ -43,7 +43,7 @@ func runtime_AfterForkInChild()
func chdir(path uintptr) (err Errno)
func chroot1(path uintptr) (err Errno)
func close(fd uintptr) (err Errno)
func closeFD(fd uintptr) (err Errno)
func dup2child(old uintptr, new uintptr) (val uintptr, err Errno)
func execve(path uintptr, argv uintptr, envp uintptr) (err Errno)
func exit(code uintptr)
@ -240,7 +240,7 @@ func forkAndExecInChild(argv0 *byte, argv, envv []*byte, chroot, dir *byte, attr
// Pass 2: dup fd[i] down onto i.
for i = 0; i < len(fd); i++ {
if fd[i] == -1 {
close(uintptr(i))
closeFD(uintptr(i))
continue
}
if fd[i] == int(i) {
@ -265,7 +265,7 @@ func forkAndExecInChild(argv0 *byte, argv, envv []*byte, chroot, dir *byte, attr
// Programs that know they inherit fds >= 3 will need
// to set them close-on-exec.
for i = len(fd); i < 3; i++ {
close(uintptr(i))
closeFD(uintptr(i))
}
// Detach fd 0 from tty