opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-19 00:06:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4382 from AlekseyChudov/master

Browse Source 
Podman cp does not work when stdin is a pipe
This commit is contained in:
OpenShift Merge Robot
2019-10-31 18:03:59 +01:00
committed by GitHub
parent 1b3e79dfef 43c2c63954
commit 5af166ff51
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/podman/cp.go
View File

@ -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)
}