mirror of
https://codeberg.org/ziglang/zig.git
synced 2026-03-08 02:44:43 +01:00
std.Io.Dir.CopyFileOptions: rename override_permissions
to more simply `permissions`. In master branch this was `override_mode`.
This commit is contained in:
parent
d8b1cc953e
commit
3466056478
2 changed files with 4 additions and 4 deletions
|
|
@ -564,7 +564,7 @@ pub fn updateFile(
|
|||
defer src_file.close(io);
|
||||
|
||||
const src_stat = try src_file.stat(io);
|
||||
const actual_permissions = options.override_permissions orelse src_stat.permissions;
|
||||
const actual_permissions = options.permissions orelse src_stat.permissions;
|
||||
check_dest_stat: {
|
||||
const dest_stat = blk: {
|
||||
var dest_file = dest_dir.openFile(io, dest_path, .{}) catch |err| switch (err) {
|
||||
|
|
@ -1645,7 +1645,7 @@ fn deleteTreeOpenInitialSubpath(dir: Dir, io: Io, sub_path: []const u8, kind_hin
|
|||
|
||||
pub const CopyFileOptions = struct {
|
||||
/// When this is `null` the permissions are copied from the source file.
|
||||
override_permissions: ?File.Permissions = null,
|
||||
permissions: ?File.Permissions = null,
|
||||
};
|
||||
|
||||
pub const CopyFileError = File.OpenError || File.StatError ||
|
||||
|
|
@ -1677,7 +1677,7 @@ pub fn copyFile(
|
|||
var file_reader: File.Reader = .init(.{ .handle = file.handle }, io, &.{});
|
||||
defer file_reader.file.close(io);
|
||||
|
||||
const permissions = options.override_permissions orelse blk: {
|
||||
const permissions = options.permissions orelse blk: {
|
||||
const st = try file_reader.file.stat(io);
|
||||
file_reader.size = st.size;
|
||||
break :blk st.permissions;
|
||||
|
|
|
|||
|
|
@ -1593,7 +1593,7 @@ test "copyFile" {
|
|||
try ctx.dir.copyFile(src_file, ctx.dir, dest_file, io, .{});
|
||||
defer ctx.dir.deleteFile(io, dest_file) catch {};
|
||||
|
||||
try ctx.dir.copyFile(src_file, ctx.dir, dest_file2, io, .{ .override_mode = File.default_mode });
|
||||
try ctx.dir.copyFile(src_file, ctx.dir, dest_file2, io, .{ .permissions = File.default_mode });
|
||||
defer ctx.dir.deleteFile(io, dest_file2) catch {};
|
||||
|
||||
try expectFileContents(io, ctx.dir, dest_file, data);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue