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

Fix compilation of updateTimes on 32bit platforms

Browse Source 
Add a test to avoid regressions.

Fixes #3412
This commit is contained in:
LemonBoy 2019-10-12 12:21:20 +02:00 committed by Andrew Kelley
parent 5181970807
commit 6a549a7f0c
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/std/fs/file.zig
View File

@ -279,12 +279,12 @@ pub const File = struct {
}
const times = [2]os.timespec{
os.timespec{
.tv_sec = @divFloor(atime, std.time.ns_per_s),
.tv_nsec = @mod(atime, std.time.ns_per_s),
.tv_sec = math.cast(isize, @divFloor(atime, std.time.ns_per_s)) catch maxInt(isize),
.tv_nsec = math.cast(isize, @mod(atime, std.time.ns_per_s)) catch maxInt(isize),
},
os.timespec{
.tv_sec = @divFloor(mtime, std.time.ns_per_s),
.tv_nsec = @mod(mtime, std.time.ns_per_s),
.tv_sec = math.cast(isize, @divFloor(mtime, std.time.ns_per_s)) catch maxInt(isize),
.tv_nsec = math.cast(isize, @mod(mtime, std.time.ns_per_s)) catch maxInt(isize),
},
};
try os.futimens(self.handle, &times);

18
lib/std/io/test.zig
View File

@ -629,3 +629,21 @@ test "File seek ops" {
try file.seekTo(1234);
std.testing.expect((try file.getPos()) == 1234);
}
test "updateTimes" {
const tmp_file_name = "just_a_temporary_file.txt";
var file = try File.openWrite(tmp_file_name);
defer {
file.close();
std.fs.deleteFile(tmp_file_name) catch {};
}
var stat_old = try file.stat();
// Set atime and mtime to 5s before
try file.updateTimes(
stat_old.atime - 5 * std.time.ns_per_s,
stat_old.mtime - 5 * std.time.ns_per_s,
);
var stat_new = try file.stat();
std.testing.expect(stat_new.atime < stat_old.atime);
std.testing.expect(stat_new.mtime < stat_old.mtime);
}