Merge pull request #4382 from AlekseyChudov/master

Podman cp does not work when stdin is a pipe

1 files changed, 9 insertions, 2 deletions

diff --git a/cmd/podman/cp.go b/cmd/podman/cp.go
index 75a23afd6..c53a97df3 100644
--- a/cmd/podman/cp.go
+++ b/cmd/podman/cp.go
@@ -257,8 +257,15 @@ func parsePath(runtime *libpod.Runtime, path string) (*libpod.Container, string)
 	return nil, path
 }
 
+func evalSymlinks(path string) (string, error) {
+	if path == os.Stdin.Name() {
+		return path, nil
+	}
+	return filepath.EvalSymlinks(path)
+}
+
 func getPathInfo(path string) (string, os.FileInfo, error) {
-	path, err := filepath.EvalSymlinks(path)
+	path, err := evalSymlinks(path)
 	if err != nil {
 		return "", nil, errors.Wrapf(err, "error evaluating symlinks %q", path)
 	}
@@ -270,7 +277,7 @@ func getPathInfo(path string) (string, os.FileInfo, error) {
 }
 
 func copy(src, destPath, dest string, idMappingOpts storage.IDMappingOptions, chownOpts *idtools.IDPair, extract, isFromHostToCtr bool) error {
-	srcPath, err := filepath.EvalSymlinks(src)
+	srcPath, err := evalSymlinks(src)
 	if err != nil {
 		return errors.Wrapf(err, "error evaluating symlinks %q", srcPath)
 	}