Nixyri/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2024-11-15 08:33:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

std: define static error set for fs.Dir.copyFile

Browse Source
This commit is contained in:
Meghan 2022-01-29 10:48:36 -08:00 committed by GitHub
parent fedff06079
commit 5e60ee4127
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/std/fs.zig
View File

@ -193,7 +193,9 @@ pub const AtomicFile = struct {
self.* = undefined;
}
pub fn finish(self: *AtomicFile) !void {
pub const FinishError = std.os.RenameError;
pub fn finish(self: *AtomicFile) FinishError!void {
assert(self.file_exists);
if (self.file_open) {
self.file.close();
@ -2112,17 +2114,13 @@ pub const Dir = struct {
return PrevStatus.stale;
}
pub const CopyFileError = File.OpenError || File.StatError || AtomicFile.InitError || CopyFileRawError || AtomicFile.FinishError;
/// Guaranteed to be atomic.
/// On Linux, until https://patchwork.kernel.org/patch/9636735/ is merged and readily available,
/// there is a possibility of power loss or application termination leaving temporary files present
/// in the same directory as dest_path.
pub fn copyFile(
source_dir: Dir,
source_path: []const u8,
dest_dir: Dir,
dest_path: []const u8,
options: CopyFileOptions,
) !void {
pub fn copyFile(source_dir: Dir, source_path: []const u8, dest_dir: Dir, dest_path: []const u8, options: CopyFileOptions) CopyFileError!void {
var in_file = try source_dir.openFile(source_path, .{});
defer in_file.close();
@ -2137,7 +2135,7 @@ pub const Dir = struct {
defer atomic_file.deinit();
try copy_file(in_file.handle, atomic_file.file.handle);
return atomic_file.finish();
try atomic_file.finish();
}
pub const AtomicFileOptions = struct {
@ -2617,12 +2615,12 @@ pub fn realpathAlloc(allocator: Allocator, pathname: []const u8) ![]u8 {
return allocator.dupe(u8, try os.realpath(pathname, &buf));
}
const CopyFileError = error{SystemResources} || os.CopyFileRangeError || os.SendFileError;
const CopyFileRawError = error{SystemResources} || os.CopyFileRangeError || os.SendFileError;
// Transfer all the data between two file descriptors in the most efficient way.
// The copy starts at offset 0, the initial offsets are preserved.
// No metadata is transferred over.
fn copy_file(fd_in: os.fd_t, fd_out: os.fd_t) CopyFileError!void {
fn copy_file(fd_in: os.fd_t, fd_out: os.fd_t) CopyFileRawError!void {
if (comptime builtin.target.isDarwin()) {
const rc = os.system.fcopyfile(fd_in, fd_out, null, os.system.COPYFILE_DATA);
switch (os.errno(rc)) {