mirror of
https://github.com/containers/podman.git
synced 2025-12-01 02:27:13 +08:00
vendor: update buildah to latest main
Includes one breaking change for the flag as BuildOutputs now accept a slice. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
65
vendor/github.com/containers/buildah/internal/pty/pty_posix.go
generated
vendored
Normal file
65
vendor/github.com/containers/buildah/internal/pty/pty_posix.go
generated
vendored
Normal file
@@ -0,0 +1,65 @@
|
||||
//go:build freebsd && cgo
|
||||
|
||||
package pty
|
||||
|
||||
// #include <fcntl.h>
|
||||
// #include <stdlib.h>
|
||||
import "C"
|
||||
|
||||
import (
|
||||
"github.com/sirupsen/logrus"
|
||||
"golang.org/x/sys/unix"
|
||||
)
|
||||
|
||||
func openpt() (int, error) {
|
||||
fd, err := C.posix_openpt(C.O_RDWR)
|
||||
if err != nil {
|
||||
return -1, err
|
||||
}
|
||||
if _, err := C.grantpt(fd); err != nil {
|
||||
return -1, err
|
||||
}
|
||||
return int(fd), nil
|
||||
}
|
||||
|
||||
func ptsname(fd int) (string, error) {
|
||||
path, err := C.ptsname(C.int(fd))
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return C.GoString(path), nil
|
||||
}
|
||||
|
||||
func unlockpt(fd int) error {
|
||||
if _, err := C.unlockpt(C.int(fd)); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// GetPtyDescriptors allocates a new pseudoterminal and returns the control and
|
||||
// pseudoterminal file descriptors.
|
||||
func GetPtyDescriptors() (int, int, error) {
|
||||
// Create a pseudo-terminal and open the control side
|
||||
controlFd, err := openpt()
|
||||
if err != nil {
|
||||
logrus.Errorf("error opening PTY control side using posix_openpt: %v", err)
|
||||
return -1, -1, err
|
||||
}
|
||||
if err = unlockpt(controlFd); err != nil {
|
||||
logrus.Errorf("error unlocking PTY: %v", err)
|
||||
return -1, -1, err
|
||||
}
|
||||
// Get a handle for the other end.
|
||||
ptyName, err := ptsname(controlFd)
|
||||
if err != nil {
|
||||
logrus.Errorf("error getting PTY name: %v", err)
|
||||
return -1, -1, err
|
||||
}
|
||||
ptyFd, err := unix.Open(ptyName, unix.O_RDWR, 0)
|
||||
if err != nil {
|
||||
logrus.Errorf("error opening PTY: %v", err)
|
||||
return -1, -1, err
|
||||
}
|
||||
return controlFd, ptyFd, nil
|
||||
}
|
||||
48
vendor/github.com/containers/buildah/internal/pty/pty_ptmx.go
generated
vendored
Normal file
48
vendor/github.com/containers/buildah/internal/pty/pty_ptmx.go
generated
vendored
Normal file
@@ -0,0 +1,48 @@
|
||||
//go:build linux
|
||||
|
||||
package pty
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"syscall"
|
||||
"unsafe"
|
||||
|
||||
"golang.org/x/sys/unix"
|
||||
)
|
||||
|
||||
// GetPtyDescriptors allocates a new pseudoterminal and returns the control and
|
||||
// pseudoterminal file descriptors. This implementation uses the /dev/ptmx
|
||||
// device. The main advantage of using this instead of posix_openpt is that it
|
||||
// avoids cgo.
|
||||
func GetPtyDescriptors() (int, int, error) {
|
||||
// Create a pseudo-terminal -- open a copy of the master side.
|
||||
controlFd, err := unix.Open("/dev/ptmx", os.O_RDWR, 0o600)
|
||||
if err != nil {
|
||||
return -1, -1, fmt.Errorf("opening PTY master using /dev/ptmx: %v", err)
|
||||
}
|
||||
// Set the kernel's lock to "unlocked".
|
||||
locked := 0
|
||||
if result, _, err := unix.Syscall(unix.SYS_IOCTL, uintptr(controlFd), unix.TIOCSPTLCK, uintptr(unsafe.Pointer(&locked))); int(result) == -1 {
|
||||
return -1, -1, fmt.Errorf("unlocking PTY descriptor: %v", err)
|
||||
}
|
||||
// Get a handle for the other end.
|
||||
ptyFd, _, err := unix.Syscall(unix.SYS_IOCTL, uintptr(controlFd), unix.TIOCGPTPEER, unix.O_RDWR|unix.O_NOCTTY)
|
||||
if int(ptyFd) == -1 {
|
||||
if errno, isErrno := err.(syscall.Errno); !isErrno || (errno != syscall.EINVAL && errno != syscall.ENOTTY) {
|
||||
return -1, -1, fmt.Errorf("getting PTY descriptor: %v", err)
|
||||
}
|
||||
// EINVAL means the kernel's too old to understand TIOCGPTPEER. Try TIOCGPTN.
|
||||
ptyN, err := unix.IoctlGetInt(controlFd, unix.TIOCGPTN)
|
||||
if err != nil {
|
||||
return -1, -1, fmt.Errorf("getting PTY number: %v", err)
|
||||
}
|
||||
ptyName := fmt.Sprintf("/dev/pts/%d", ptyN)
|
||||
fd, err := unix.Open(ptyName, unix.O_RDWR|unix.O_NOCTTY, 0o620)
|
||||
if err != nil {
|
||||
return -1, -1, fmt.Errorf("opening PTY %q: %v", ptyName, err)
|
||||
}
|
||||
ptyFd = uintptr(fd)
|
||||
}
|
||||
return controlFd, int(ptyFd), nil
|
||||
}
|
||||
13
vendor/github.com/containers/buildah/internal/pty/pty_unsupported.go
generated
vendored
Normal file
13
vendor/github.com/containers/buildah/internal/pty/pty_unsupported.go
generated
vendored
Normal file
@@ -0,0 +1,13 @@
|
||||
//go:build !linux && !(freebsd && cgo)
|
||||
|
||||
package pty
|
||||
|
||||
import (
|
||||
"errors"
|
||||
)
|
||||
|
||||
// GetPtyDescriptors would allocate a new pseudoterminal and return the control and
|
||||
// pseudoterminal file descriptors, if only it could.
|
||||
func GetPtyDescriptors() (int, int, error) {
|
||||
return -1, -1, errors.New("GetPtyDescriptors not supported on this platform")
|
||||
}
|
||||
Reference in New Issue
Block a user