diff options
| author | Valentin Rothberg <rothberg@redhat.com> | 2021-02-18 17:56:47 +0100 |
|---|---|---|
| committer | Valentin Rothberg <rothberg@redhat.com> | 2021-02-19 12:21:09 +0100 |
| commit | a3c8782998140d4203a71fd0cdded9fde55550eb (patch) | |
| tree | 64b61c1bdbfa84528b3380b75055647bbfa5d461 /cmd | |
| parent | 7e286bc430ea50b72e972e48626298ac2e1f258a (diff) | |
| download | podman-a3c8782998140d4203a71fd0cdded9fde55550eb.tar.gz podman-a3c8782998140d4203a71fd0cdded9fde55550eb.tar.bz2 podman-a3c8782998140d4203a71fd0cdded9fde55550eb.zip | |
cp: treat "." and "/." correctly
Make sure to treat "." and "/." correctly. Both cases imply to copy the
contents of a directory in contrast to the directory. This implies to
unset the KeepDirectoryNames options of the copiah package.
Previously, the code was performing a simple string suffix check which
is not enough since it would match files and directories ending with
".".
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/containers/cp.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/containers/cp.go b/cmd/podman/containers/cp.go index 69b61a06c..5db05719c 100644 --- a/cmd/podman/containers/cp.go +++ b/cmd/podman/containers/cp.go @@ -311,8 +311,8 @@ func copyToContainer(container string, containerPath string, hostPath string) er } getOptions := buildahCopiah.GetOptions{ - // Unless the specified path ends with ".", we want to copy the base directory. - KeepDirectoryNames: !strings.HasSuffix(hostPath, "."), + // Unless the specified points to ".", we want to copy the base directory. + KeepDirectoryNames: hostInfo.IsDir && filepath.Base(hostPath) != ".", } if !hostInfo.IsDir && (!containerInfo.IsDir || containerInfoErr != nil) { // If we're having a file-to-file copy, make sure to |