Skip to content

Commit 1db73db

Browse files
sbc100sbc100
committed
Fix utime/stat for time_t > 2^32
See: #17393
1 parent a41b1a3 commit 1db73db

File tree

5 files changed

+32
-23
lines changed

5 files changed

+32
-23
lines changed

‎src/library_syscall.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ var SyscallsLibrary = {
6464
{{{ makeSetValue('buf', C_STRUCTS.stat.st_size, 'stat.size', 'i64') }}};
6565
{{{ makeSetValue('buf', C_STRUCTS.stat.st_blksize, '4096', 'i32') }}};
6666
{{{ makeSetValue('buf', C_STRUCTS.stat.st_blocks, 'stat.blocks', 'i32') }}};
67-
{{{ makeSetValue('buf', C_STRUCTS.stat.st_atim.tv_sec, '(stat.atime.getTime() / 1000)|0', 'i32') }}};
67+
{{{ makeSetValue('buf', C_STRUCTS.stat.st_atim.tv_sec, 'Math.floor(stat.atime.getTime() / 1000)', 'i64') }}};
6868
{{{ makeSetValue('buf', C_STRUCTS.stat.st_atim.tv_nsec, '0', 'i32') }}};
69-
{{{ makeSetValue('buf', C_STRUCTS.stat.st_mtim.tv_sec, '(stat.mtime.getTime() / 1000)|0', 'i32') }}};
69+
{{{ makeSetValue('buf', C_STRUCTS.stat.st_mtim.tv_sec, 'Math.floor(stat.mtime.getTime() / 1000)', 'i64') }}};
7070
{{{ makeSetValue('buf', C_STRUCTS.stat.st_mtim.tv_nsec, '0', 'i32') }}};
71-
{{{ makeSetValue('buf', C_STRUCTS.stat.st_ctim.tv_sec, '(stat.ctime.getTime() / 1000)|0', 'i32') }}};
72-
{{{ makeSetValue('buf', C_STRUCTS.stat.st_ctim.tv_nsec, '0', 'i32') }}};
71+
{{{ makeSetValue('buf', C_STRUCTS.stat.st_ctim.tv_sec, 'Math.floor(stat.ctime.getTime() / 1000)', 'i64') }}};
72+
{{{ makeSetValue('buf', C_STRUCTS.stat.st_ctim.tv_nsec, '0', 'i64') }}};
7373
{{{ makeSetValue('buf', C_STRUCTS.stat.st_ino, 'stat.ino', 'i64') }}};
7474
return 0;
7575
},
@@ -955,6 +955,7 @@ var SyscallsLibrary = {
955955
return 0;
956956
},
957957
__syscall_utimensat__sig: 'iippi',
958+
__syscall_utimensat__deps: ['$readI53FromU64'],
958959
__syscall_utimensat: function(dirfd, path, times, flags) {
959960
path = SYSCALLS.getStr(path);
960961
#if ASSERTIONS
@@ -965,11 +966,11 @@ var SyscallsLibrary = {
965966
var atime = Date.now();
966967
var mtime = atime;
967968
} else {
968-
var seconds = {{{ makeGetValue('times', C_STRUCTS.timespec.tv_sec, 'i32') }}};
969+
var seconds = {{{ makeGetValue('times', C_STRUCTS.timespec.tv_sec, 'i53') }}};
969970
var nanoseconds = {{{ makeGetValue('times', C_STRUCTS.timespec.tv_nsec, 'i32') }}};
970971
atime = (seconds*1000) + (nanoseconds/(1000*1000));
971972
times += {{{ C_STRUCTS.timespec.__size__ }}};
972-
seconds = {{{ makeGetValue('times', C_STRUCTS.timespec.tv_sec, 'i32') }}};
973+
seconds = {{{ makeGetValue('times', C_STRUCTS.timespec.tv_sec, 'i53') }}};
973974
nanoseconds = {{{ makeGetValue('times', C_STRUCTS.timespec.tv_nsec, 'i32') }}};
974975
mtime = (seconds*1000) + (nanoseconds/(1000*1000));
975976
}

‎src/parseTools.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,11 @@ function makeGetValue(ptr, pos, type, noNeedFirst, unsigned, ignore, align) {
407407
}
408408
}
409409

410+
410411
const offset = calcFastOffset(ptr, pos, noNeedFirst);
412+
if (type == 'i53') {
413+
return 'readI53FromU64(' + offset + ')';
414+
}
411415

412416
const slab = getHeapForType(type);
413417
let ret = slab + '[' + getHeapOffset(offset, type) + ']';

‎system/lib/libc/musl/arch/emscripten/bits/alltypes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ struct timeval { time_t tv_sec; suseconds_t tv_usec; };
309309
#endif
310310

311311
#if defined(__NEED_struct_timespec) && !defined(__DEFINED_struct_timespec)
312-
struct timespec { time_t tv_sec; long tv_nsec; };
312+
struct timespec { time_t tv_sec; int tv_nsec; };
313313
#define __DEFINED_struct_timespec
314314
#endif
315315

‎tests/core/test_posixtime.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ int main() {
1919
if (rv)
2020
printf("clock_getres failed\n");
2121
else if (ts.tv_sec || ts.tv_nsec > 50000000)
22-
printf("clock_getres resolution not enough (%ld.%09ld)\n",
23-
(long)ts.tv_sec, ts.tv_nsec);
22+
printf("clock_getres resolution not enough (%lld.%09d)\n",
23+
ts.tv_sec, ts.tv_nsec);
2424
else
2525
printf("clock_getres resolution OK\n");
2626
rv = clock_gettime(clocks[i], &ts);

‎tests/stat/test_stat.c

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@ void create_file(const char *path, const char *buffer, int mode) {
3030
close(fd);
3131
}
3232

33+
#define TEST_TIME (1ll << 34)
3334
void setup() {
34-
struct utimbuf t = {1200000000, 1200000000};
35+
struct utimbuf t = {TEST_TIME, TEST_TIME};
3536

3637
mkdir("folder", 0777);
3738
create_file("folder/file", "abcdef", 0777);
@@ -51,7 +52,7 @@ void cleanup() {
5152
void test() {
5253
int err;
5354
struct stat s;
54-
struct utimbuf t = {1200000000, 1200000000};
55+
struct utimbuf t = {TEST_TIME, TEST_TIME};
5556

5657
// non-existent
5758
err = stat("does_not_exist", &s);
@@ -70,8 +71,11 @@ void test() {
7071
assert(s.st_rdev == 0);
7172
#endif
7273
assert(s.st_size);
73-
assert(s.st_atime == 1200000000);
74-
assert(s.st_mtime == 1200000000);
74+
printf("TEST_TIME: %llx\n", TEST_TIME);
75+
printf("s.st_atime: %llx\n", s.st_atime);
76+
printf("s.st_mtime: %llx\n", s.st_mtime);
77+
assert(s.st_atime == TEST_TIME);
78+
assert(s.st_mtime == TEST_TIME);
7579
assert(s.st_ctime);
7680
#ifdef __EMSCRIPTEN__
7781
assert(s.st_blksize == 4096);
@@ -92,8 +96,8 @@ void test() {
9296
assert(s.st_nlink);
9397
assert(s.st_rdev == 0);
9498
assert(s.st_size == 6);
95-
assert(s.st_atime == 1200000000);
96-
assert(s.st_mtime == 1200000000);
99+
assert(s.st_atime == TEST_TIME);
100+
assert(s.st_mtime == TEST_TIME);
97101
assert(s.st_ctime);
98102
#ifdef __EMSCRIPTEN__
99103
assert(s.st_blksize == 4096);
@@ -110,8 +114,8 @@ void test() {
110114
assert(s.st_nlink);
111115
assert(s.st_rdev == 0);
112116
assert(s.st_size == 6);
113-
assert(s.st_atime == 1200000000);
114-
assert(s.st_mtime == 1200000000);
117+
assert(s.st_atime == TEST_TIME);
118+
assert(s.st_mtime == TEST_TIME);
115119
assert(s.st_ctime);
116120
#ifdef __EMSCRIPTEN__
117121
assert(s.st_blksize == 4096);
@@ -152,8 +156,8 @@ void test() {
152156
assert(s.st_nlink);
153157
assert(s.st_rdev == 0);
154158
assert(s.st_size == 6);
155-
assert(s.st_atime == 1200000000);
156-
assert(s.st_mtime == 1200000000);
159+
assert(s.st_atime == TEST_TIME);
160+
assert(s.st_mtime == TEST_TIME);
157161
assert(s.st_ctime);
158162
#ifdef __EMSCRIPTEN__
159163
assert(s.st_blksize == 4096);
@@ -170,8 +174,8 @@ void test() {
170174
assert(s.st_nlink);
171175
assert(s.st_rdev == 0);
172176
assert(s.st_size == 4); // strlen("file")
173-
assert(s.st_atime != 1200000000); // should NOT match the utime call we did for dir/file
174-
assert(s.st_mtime != 1200000000);
177+
assert(s.st_atime != TEST_TIME); // should NOT match the utime call we did for dir/file
178+
assert(s.st_mtime != TEST_TIME);
175179
assert(s.st_ctime);
176180
#ifdef __EMSCRIPTEN__
177181
assert(s.st_blksize == 4096);
@@ -183,11 +187,11 @@ void test() {
183187
utime("folder/subdir", &t);
184188
create_file("folder/subdir/file", "abcdef", 0777);
185189
err = stat("folder/subdir", &s);
186-
assert(s.st_mtime != 1200000000);
190+
assert(s.st_mtime != TEST_TIME);
187191
utime("folder/subdir", &t);
188192
unlink("folder/subdir/file");
189193
err = stat("folder/subdir", &s);
190-
assert(s.st_mtime != 1200000000);
194+
assert(s.st_mtime != TEST_TIME);
191195

192196
puts("success");
193197
}

0 commit comments

Comments
 (0)