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

Fix cp from pipe

Browse Source 
Signed-off-by: Aleksey Chudov <aleksey.chudov@gmail.com>
This commit is contained in:
Aleksey Chudov
2019-10-30 18:52:04 +02:00
parent a35d002b72
commit 43c2c63954
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 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) { func getPathInfo(path string) (string, os.FileInfo, error) {
path, err := filepath.EvalSymlinks(path) path, err := evalSymlinks(path)
if err != nil { if err != nil {
return "", nil, errors.Wrapf(err, "error evaluating symlinks %q", path) 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 { 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 { if err != nil {
return errors.Wrapf(err, "error evaluating symlinks %q", srcPath) return errors.Wrapf(err, "error evaluating symlinks %q", srcPath)
} }