diff options
| author | Ian Lance Taylor <iant@golang.org> | 2022-08-06 13:28:20 -0700 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2022-08-08 20:38:29 +0000 |
| commit | ced4d6fd2d415d43c0f26e01fe332e4afa80114a (patch) | |
| tree | f913a2a99820bf4b6c096c613b1f0106363463d4 /src/syscall/exec_libc.go | |
| parent | 7e5e4a7cef34727c8de2da218e76da23f826d608 (diff) | |
| download | go-ced4d6fd2d415d43c0f26e01fe332e4afa80114a.tar.xz | |
syscall: rename close to closeFD
...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>
Diffstat (limited to 'src/syscall/exec_libc.go')
| -rw-r--r-- | src/syscall/exec_libc.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/syscall/exec_libc.go b/src/syscall/exec_libc.go index aee1b8c98a..72f73a268a 100644 --- a/src/syscall/exec_libc.go +++ b/src/syscall/exec_libc.go @@ -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 |