podman cp: test /dev/stdin correctly

/dev/stdin should not be treated as "-" to remain compatible with Docker and to have a more consistent and idiomatic interface. Signed-off-by: Valentin Rothberg <[email protected]>
vrothberg · Mar 10, 2021 · 08eba6f · 08eba6f
1 parent 20f2160
commit 08eba6f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/cmd/podman/containers/cp.go b/cmd/podman/containers/cp.go
@@ -231,8 +231,6 @@ func copyToContainer(container string, containerPath string, hostPath string) er
 	if hostPath == "-" {
 		hostPath = os.Stdin.Name()
 		isStdin = true
-	} else if hostPath == os.Stdin.Name() {
-		isStdin = true
 	}
 
 	// Make sure that host path exists.

diff --git a/test/system/065-cp.bats b/test/system/065-cp.bats
@@ -475,9 +475,9 @@ load helpers
     run_podman exec cpcontainer rm -rf /tmp/$srcdir
 
     # Now for "/dev/stdin".
+    # Note: while this works, the content ends up in Nirvana.
+    #       Same for Docker.
     run_podman cp /dev/stdin cpcontainer:/tmp < $tar_file
-    run_podman exec cpcontainer cat /tmp/$srcdir/$rand_filename
-    is "$output" "$rand_content"
 
     # Error checks below ...
 
@@ -487,11 +487,11 @@ load helpers
 
     # Destination must be a directory (on an existing file).
     run_podman exec cpcontainer touch /tmp/file.txt
-    run_podman 125 cp /dev/stdin cpcontainer:/tmp/file.txt < $tar_file
+    run_podman 125 cp - cpcontainer:/tmp/file.txt < $tar_file
     is "$output" 'Error: destination must be a directory when copying from stdin'
 
     # Destination must be a directory (on an absent path).
-    run_podman 125 cp /dev/stdin cpcontainer:/tmp/IdoNotExist < $tar_file
+    run_podman 125 cp - cpcontainer:/tmp/IdoNotExist < $tar_file
     is "$output" 'Error: destination must be a directory when copying from stdin'
 
     run_podman rm -f cpcontainer