Fix ThreadedFileEventDriver.getSize on Windows.
fstat doesn't work correctly on Windows, possibly due to a bad C header translation on Druntime. Also switches to _lseeki64/lseek64 to avoid 32-bit file length limitations on 32-bit systems.
This commit is contained in:
parent
494a835adc
commit
046fedd934
|
@ -25,7 +25,7 @@ version (Windows) {
|
||||||
int close(int fd) @safe;
|
int close(int fd) @safe;
|
||||||
int read(int fd, void *buffer, uint count);
|
int read(int fd, void *buffer, uint count);
|
||||||
int write(int fd, in void *buffer, uint count);
|
int write(int fd, in void *buffer, uint count);
|
||||||
off_t lseek(int fd, off_t offset, int whence) @safe;
|
long _lseeki64(int fd, long offset, int origin) @safe;
|
||||||
}
|
}
|
||||||
|
|
||||||
enum O_RDONLY = 0;
|
enum O_RDONLY = 0;
|
||||||
|
@ -46,6 +46,11 @@ else
|
||||||
enum O_BINARY = 0;
|
enum O_BINARY = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
version (darwin) {
|
||||||
|
// NOTE: Always building for 64-bit, so these are identical
|
||||||
|
alias lseek64 = lseek;
|
||||||
|
}
|
||||||
|
|
||||||
private {
|
private {
|
||||||
enum SEEK_SET = 0;
|
enum SEEK_SET = 0;
|
||||||
enum SEEK_CUR = 1;
|
enum SEEK_CUR = 1;
|
||||||
|
@ -197,7 +202,9 @@ final class ThreadedFileEventDriver(Events : EventDriverEvents) : EventDriverFil
|
||||||
|
|
||||||
version (linux) {
|
version (linux) {
|
||||||
// stat_t seems to be defined wrong on linux/64
|
// stat_t seems to be defined wrong on linux/64
|
||||||
return .lseek(cast(int)file, 0, SEEK_END);
|
return .lseek64(cast(int)file, 0, SEEK_END);
|
||||||
|
} else version (Windows) {
|
||||||
|
return _lseeki64(cast(int)file, 0, SEEK_END);
|
||||||
} else {
|
} else {
|
||||||
stat_t st;
|
stat_t st;
|
||||||
() @trusted { fstat(cast(int)file, &st); } ();
|
() @trusted { fstat(cast(int)file, &st); } ();
|
||||||
|
@ -361,9 +368,8 @@ log("start processing");
|
||||||
|
|
||||||
auto bytes = buffer;
|
auto bytes = buffer;
|
||||||
version (Windows) {
|
version (Windows) {
|
||||||
assert(offset <= off_t.max);
|
._lseeki64(cast(int)file, offset, SEEK_SET);
|
||||||
.lseek(cast(int)file, cast(off_t)offset, SEEK_SET);
|
} else .lseek64(cast(int)file, offset, SEEK_SET);
|
||||||
} else .lseek(cast(int)file, offset, SEEK_SET);
|
|
||||||
|
|
||||||
scope (exit) {
|
scope (exit) {
|
||||||
log("trigger event");
|
log("trigger event");
|
||||||
|
|
Loading…
Reference in a new issue