vendor of containers/common

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

vendor/github.com/containers/common/pkg/util/copy.go

@@ -1,57 +0,0 @@
-package util
-
-import (
-	"errors"
-	"io"
-)
-
-// ErrDetach indicates that an attach session was manually detached by
-// the user.
-var ErrDetach = errors.New("detached from container")
-
-// CopyDetachable is similar to io.Copy but support a detach key sequence to break out.
-func CopyDetachable(dst io.Writer, src io.Reader, keys []byte) (written int64, err error) {
-	buf := make([]byte, 32*1024)
-	for {
-		nr, er := src.Read(buf)
-		if nr > 0 {
-			preservBuf := []byte{}
-			for i, key := range keys {
-				preservBuf = append(preservBuf, buf[0:nr]...)
-				if nr != 1 || buf[0] != key {
-					break
-				}
-				if i == len(keys)-1 {
-					return 0, ErrDetach
-				}
-				nr, er = src.Read(buf)
-			}
-			var nw int
-			var ew error
-			if len(preservBuf) > 0 {
-				nw, ew = dst.Write(preservBuf)
-				nr = len(preservBuf)
-			} else {
-				nw, ew = dst.Write(buf[0:nr])
-			}
-			if nw > 0 {
-				written += int64(nw)
-			}
-			if ew != nil {
-				err = ew
-				break
-			}
-			if nr != nw {
-				err = io.ErrShortWrite
-				break
-			}
-		}
-		if er != nil {
-			if er != io.EOF {
-				err = er
-			}
-			break
-		}
-	}
-	return written, err
-}

vendor/github.com/containers/common/pkg/util/util.go

@@ -1,119 +1,16 @@
 package util
 
 import (
-	"bytes"
-	"errors"
 	"fmt"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"regexp"
-	"strings"
 	"time"
 
-	"github.com/containers/common/libnetwork/types"
 	"github.com/fsnotify/fsnotify"
 	"github.com/sirupsen/logrus"
 )
 
-const (
-	UnknownPackage = "Unknown"
-)
-
-var ErrInterrupt = errors.New("interrupted")
-
-// Note: This function is copied from containers/podman libpod/util.go
-// Please see https://github.com/containers/common/pull/1460
-func queryPackageVersion(cmdArg ...string) string {
-	output := UnknownPackage
-	if 1 < len(cmdArg) {
-		cmd := exec.Command(cmdArg[0], cmdArg[1:]...)
-		if outp, err := cmd.Output(); err == nil {
-			output = string(outp)
-			deb := false
-			if cmdArg[0] == "/usr/bin/dlocate" {
-				// can return multiple matches
-				l := strings.Split(output, "\n")
-				output = l[0]
-				deb = true
-			} else if cmdArg[0] == "/usr/bin/dpkg" {
-				deb = true
-			}
-			if deb {
-				r := strings.Split(output, ": ")
-				queryFormat := `${Package}_${Version}_${Architecture}`
-				cmd = exec.Command("/usr/bin/dpkg-query", "-f", queryFormat, "-W", r[0])
-				if outp, err := cmd.Output(); err == nil {
-					output = string(outp)
-				}
-			}
-		}
-		if cmdArg[0] == "/sbin/apk" {
-			prefix := cmdArg[len(cmdArg)-1] + " is owned by "
-			output = strings.Replace(output, prefix, "", 1)
-		}
-	}
-	return strings.Trim(output, "\n")
-}
-
-// Note: This function is copied from containers/podman libpod/util.go
-// Please see https://github.com/containers/common/pull/1460
-func PackageVersion(program string) string { // program is full path
-	_, err := os.Stat(program)
-	if err != nil {
-		return UnknownPackage
-	}
-	packagers := [][]string{
-		{"/usr/bin/rpm", "-q", "-f"},
-		{"/usr/bin/dlocate", "-F"},             // Debian, Ubuntu (quick)
-		{"/usr/bin/dpkg", "-S"},                // Debian, Ubuntu (slow)
-		{"/usr/bin/pacman", "-Qo"},             // Arch
-		{"/usr/bin/qfile", "-qv"},              // Gentoo (quick)
-		{"/usr/bin/equery", "b"},               // Gentoo (slow)
-		{"/sbin/apk", "info", "-W"},            // Alpine
-		{"/usr/local/sbin/pkg", "which", "-q"}, // FreeBSD
-	}
-
-	for _, cmd := range packagers {
-		cmd = append(cmd, program)
-		if out := queryPackageVersion(cmd...); out != UnknownPackage {
-			return out
-		}
-	}
-	return UnknownPackage
-}
-
-// Note: This function is copied from containers/podman libpod/util.go
-// Please see https://github.com/containers/common/pull/1460
-func ProgramVersion(program string) (string, error) {
-	return programVersion(program, false)
-}
-
-func ProgramVersionDnsname(program string) (string, error) {
-	return programVersion(program, true)
-}
-
-func programVersion(program string, dnsname bool) (string, error) {
-	cmd := exec.Command(program, "--version")
-	var stdout bytes.Buffer
-	var stderr bytes.Buffer
-	cmd.Stdout = &stdout
-	cmd.Stderr = &stderr
-
-	err := cmd.Run()
-	if err != nil {
-		return "", fmt.Errorf("`%v --version` failed: %v %v (%v)", program, stderr.String(), stdout.String(), err)
-	}
-
-	output := strings.TrimSuffix(stdout.String(), "\n")
-	// dnsname --version returns the information to stderr
-	if dnsname {
-		output = strings.TrimSuffix(stderr.String(), "\n")
-	}
-
-	return output, nil
-}
-
 // StringInSlice determines if a string is in a string slice, returns bool
 func StringInSlice(s string, sl []string) bool {
 	for _, i := range sl {
@@ -135,25 +32,6 @@ func StringMatchRegexSlice(s string, re []string) bool {
 	return false
 }
 
-// FilterID is a function used to compare an id against a set of ids, if the
-// input is hex we check if the prefix matches. Otherwise we assume it is a
-// regex and try to match that.
-// see https://github.com/containers/podman/issues/18471 for why we do this
-func FilterID(id string, filters []string) bool {
-	for _, want := range filters {
-		isRegex := types.NotHexRegex.MatchString(want)
-		if isRegex {
-			match, err := regexp.MatchString(want, id)
-			if err == nil && match {
-				return true
-			}
-		} else if strings.HasPrefix(id, strings.ToLower(want)) {
-			return true
-		}
-	}
-	return false
-}
-
 // WaitForFile waits until a file has been created or the given timeout has occurred
 func WaitForFile(path string, chWait chan error, timeout time.Duration) (bool, error) {
 	var inotifyEvents chan fsnotify.Event

vendor/github.com/containers/common/pkg/util/util_supported.go

@@ -7,7 +7,6 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"os/signal"
 	"path/filepath"
 	"sync"
 	"syscall"
@@ -15,7 +14,6 @@ import (
 	"github.com/containers/storage/pkg/homedir"
 	"github.com/containers/storage/pkg/unshare"
 	"github.com/sirupsen/logrus"
-	terminal "golang.org/x/term"
 )
 
 var (
@@ -91,45 +89,3 @@ func GetRuntimeDir() (string, error) {
 	}
 	return rootlessRuntimeDir, nil
 }
-
-// ReadPassword reads a password from the terminal without echo.
-func ReadPassword(fd int) ([]byte, error) {
-	// Store and restore the terminal status on interruptions to
-	// avoid that the terminal remains in the password state
-	// This is necessary as for https://github.com/golang/go/issues/31180
-
-	oldState, err := terminal.GetState(fd)
-	if err != nil {
-		return make([]byte, 0), err
-	}
-
-	type Buffer struct {
-		Buffer []byte
-		Error  error
-	}
-	errorChannel := make(chan Buffer, 1)
-
-	// SIGINT and SIGTERM restore the terminal, otherwise the no-echo mode would remain intact
-	interruptChannel := make(chan os.Signal, 1)
-	signal.Notify(interruptChannel, syscall.SIGINT, syscall.SIGTERM)
-	defer func() {
-		signal.Stop(interruptChannel)
-		close(interruptChannel)
-	}()
-	go func() {
-		for range interruptChannel {
-			if oldState != nil {
-				_ = terminal.Restore(fd, oldState)
-			}
-			errorChannel <- Buffer{Buffer: make([]byte, 0), Error: ErrInterrupt}
-		}
-	}()
-
-	go func() {
-		buf, err := terminal.ReadPassword(fd)
-		errorChannel <- Buffer{Buffer: buf, Error: err}
-	}()
-
-	buf := <-errorChannel
-	return buf.Buffer, buf.Error
-}

vendor/github.com/containers/common/pkg/util/util_windows.go

@@ -5,24 +5,9 @@ package util
 
 import (
 	"errors"
-
-	terminal "golang.org/x/term"
 )
 
 // getRuntimeDir returns the runtime directory
 func GetRuntimeDir() (string, error) {
 	return "", errors.New("this function is not implemented for windows")
 }
-
-// ReadPassword reads a password from the terminal.
-func ReadPassword(fd int) ([]byte, error) {
-	oldState, err := terminal.GetState(fd)
-	if err != nil {
-		return make([]byte, 0), err
-	}
-	buf, err := terminal.ReadPassword(fd)
-	if oldState != nil {
-		_ = terminal.Restore(fd, oldState)
-	}
-	return buf, err
-}