Skip to content

Commit

Permalink
syscall: rename close to closeFD
Browse files Browse the repository at this point in the history
...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 <[email protected]>
TryBot-Result: Gopher Robot <[email protected]>
Run-TryBot: Ian Lance Taylor <[email protected]>
Reviewed-by: Tobias Klauser <[email protected]>
Auto-Submit: Ian Lance Taylor <[email protected]>
Reviewed-by: Brad Fitzpatrick <[email protected]>
Reviewed-by: Ian Lance Taylor <[email protected]>
Auto-Submit: Ian Lance Taylor <[email protected]>
Reviewed-by: Dmitri Shuralyov <[email protected]>
  • Loading branch information
ianlancetaylor authored and gopherbot committed Aug 8, 2022
1 parent 7e5e4a7 commit ced4d6f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/runtime/syscall_aix.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion src/syscall/asm_solaris_amd64.s
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/syscall/exec_libc.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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) {
Expand All @@ -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
Expand Down

0 comments on commit ced4d6f

Please sign in to comment.