os: enhance os.cp() to mimic Python's shutil.copy2() (#25893)

quaesitor-scientiam · web-flow · commit ecd00180b056 · 2025-12-05T15:08:11.000+02:00
diff --git a/vlib/os/os.c.v b/vlib/os/os.c.v
@@ -231,29 +231,48 @@ pub fn rename(src string, dst string) ! {
 	}
 }
 
-// cp copies files or folders from `src` to `dst`.
-pub fn cp(src string, dst string) ! {
+@[params]
+pub struct CopyParams {
+pub:
+	fail_if_exists bool
+}
+
+// cp copies the file src to the file or directory dst. If dst specifies a directory, the file will be copied into dst
+// using the base filename from src. If dst specifies a file that already exists, it will be replaced by
+// default. Can be overridden to fail by setting fail_if_exists: true
+pub fn cp(src string, dst string, config CopyParams) ! {
 	$if windows {
 		w_src := src.replace('/', '\\')
-		w_dst := dst.replace('/', '\\')
-		if C.CopyFile(w_src.to_wide(), w_dst.to_wide(), false) == 0 {
+		mut w_dst := dst.replace('/', '\\')
+		if is_dir(w_dst) {
+			w_dst = join_path_single(w_dst, file_name(w_src))
+		}
+		if C.CopyFile(w_src.to_wide(), w_dst.to_wide(), config.fail_if_exists) == 0 {
 			// we must save error immediately, or it will be overwritten by other API function calls.
 			code := int(C.GetLastError())
 			return error_win32(
-				msg:  'failed to copy ${src} to ${dst}'
+				msg:  'cp: failed to copy ${src} to ${dst}'
 				code: code
 			)
 		}
 	} $else {
+		mut w_dst := dst
+		if is_dir(dst) {
+			w_dst = join_path_single(w_dst, file_name(src))
+		}
 		fp_from := C.open(&char(src.str), C.O_RDONLY, 0)
 		if fp_from < 0 { // Check if file opened
-			return error_with_code('cp: failed to open ${src}', int(fp_from))
+			return error_with_code('cp: failed to open ${src} for reading', int(fp_from))
+		}
+		mode_flags := C.S_IWUSR | C.S_IRUSR
+		mut open_flags := C.O_WRONLY | C.O_CREAT | C.O_TRUNC
+		if config.fail_if_exists {
+			open_flags |= C.O_EXCL
 		}
-		fp_to := C.open(&char(dst.str), C.O_WRONLY | C.O_CREAT | C.O_TRUNC, C.S_IWUSR | C.S_IRUSR)
+		fp_to := C.open(&char(w_dst.str), open_flags, mode_flags)
 		if fp_to < 0 { // Check if file opened (permissions problems ...)
 			C.close(fp_from)
-			return error_with_code('cp (permission): failed to write to ${dst} (fp_to: ${fp_to})',
-				int(fp_to))
+			return error_with_code('cp: failed to open ${w_dst} for writing', int(fp_to))
 		}
 		// TODO: use defer{} to close files in case of error or return.
 		// Currently there is a C-Error when building.
@@ -267,14 +286,14 @@ pub fn cp(src string, dst string) ! {
 			if C.write(fp_to, &buf[0], count) < 0 {
 				C.close(fp_to)
 				C.close(fp_from)
-				return error_with_code('cp: failed to write to ${dst}', int(-1))
+				return error_with_code('cp: failed to write to ${w_dst}', int(-1))
 			}
 		}
 		from_attr := stat(src)!
-		if C.chmod(&char(dst.str), from_attr.mode) < 0 {
+		if C.chmod(&char(w_dst.str), from_attr.mode) < 0 {
 			C.close(fp_to)
 			C.close(fp_from)
-			return error_with_code('failed to set permissions for ${dst}', int(-1))
+			return error_with_code('failed to set permissions for ${w_dst}', int(-1))
 		}
 		C.close(fp_to)
 		C.close(fp_from)
diff --git a/vlib/os/os_js.js.v b/vlib/os/os_js.js.v
@@ -109,7 +109,12 @@ pub fn rm(path string) ! {
 	}
 }
 
-pub fn cp(src string, dst string) ! {
+@[params]
+pub struct CopyParams {
+	fail_if_exists bool
+}
+
+pub fn cp(src string, dst string, config CopyParams) ! {
 	$if js_node {
 		err := ''
 		#try {
diff --git a/vlib/os/os_test.c.v b/vlib/os/os_test.c.v
@@ -328,13 +328,45 @@ fn test_walk() {
 fn test_cp() {
 	old_file_name := 'cp_example.txt'
 	new_file_name := 'cp_new_example.txt'
-	os.write_file(old_file_name, 'Test data 1 2 3, V is awesome #$%^[]!~⭐') or { panic(err) }
-	os.cp(old_file_name, new_file_name) or { panic(err) }
-	old_file := os.read_file(old_file_name) or { panic(err) }
-	new_file := os.read_file(new_file_name) or { panic(err) }
+	os.write_file(old_file_name, 'Test data 1 2 3, V is awesome #$%^[]!~⭐')!
+	os.cp(old_file_name, new_file_name)!
+	old_file := os.read_file(old_file_name)!
+	new_file := os.read_file(new_file_name)!
 	assert old_file == new_file
-	os.rm(old_file_name) or { panic(err) }
-	os.rm(new_file_name) or { panic(err) }
+	os.rm(old_file_name)!
+	os.rm(new_file_name)!
+}
+
+fn test_cp_to_folder() {
+	file_name := 'cp_to_folder_example.txt'
+	folder := 'test_cp_to_folder'
+	os.mkdir(folder)!
+	os.write_file(file_name, 'Test data 1 2 3, V is awesome #$%^[]!~⭐')!
+	os.cp(file_name, folder)!
+	new_file_path := os.join_path_single(folder, file_name)
+	old_file := os.read_file(file_name)!
+	new_file := os.read_file(new_file_path)!
+	assert old_file == new_file
+	os.rm(file_name)!
+	os.rm(new_file_path)!
+	os.rmdir(folder)!
+}
+
+fn test_cp_fail_if_exists() {
+	file_name := 'cp_fail_if_exists_example.txt'
+	folder := 'test_cp_fail_if_exists'
+	os.mkdir(folder)!
+	os.write_file(file_name, 'Test data 1 2 3, V is awesome #$%^[]!~⭐')!
+	os.cp(file_name, folder)!
+	new_file_path := os.join_path_single(folder, file_name)
+	if _ := os.cp(file_name, folder, fail_if_exists: true) {
+		assert false
+	} else {
+		assert err.str().starts_with('cp: failed to '), 'cp err: ${err}'
+	}
+	os.rm(file_name)!
+	os.rm(new_file_path)!
+	os.rmdir(folder)!
 }
 
 fn test_mv() {

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,12 @@ pub fn rm(path string) ! {`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`
`112`		`-pub fn cp(src string, dst string) ! {`
	`112`	`+@[params]`
	`113`	`+pub struct CopyParams {`
	`114`	`+ fail_if_exists bool`
	`115`	`+}`
	`116`	`+`
	`117`	`+pub fn cp(src string, dst string, config CopyParams) ! {`
`113`	`118`	`$if js_node {`
`114`	`119`	`err := ''`
`115`	`120`	`#try {`