tor

commit 8e690ce736b3c61a1f007df4a1cd542e97e602c5
parent 0a38e02fb3b2a4b707b6aaf989974a4c4d6e1adb
Author: Alexander Færøy <ahf@torproject.org>
Date:   Wed, 29 Jul 2020 13:57:47 +0000

Merge remote-tracking branch 'tor-gitlab/mr/85' into maint-0.4.4

Diffstat:
A
changes/bug31036
 | 
3
+++
M
src/lib/fdio/fdio.c
 | 
6
+++---

2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/changes/bug31036 b/changes/bug31036
@@ -0,0 +1,3 @@
+  o Minor bugfixes (windows):
+    - Fix a bug that prevented Tor from starting if its log file
+      grew above 2GB.  Fixes bug 31036; bugfix on 0.2.1.8-alpha.
diff --git a/src/lib/fdio/fdio.c b/src/lib/fdio/fdio.c
@@ -48,7 +48,7 @@ off_t
 tor_fd_getpos(int fd)
 {
 #ifdef _WIN32
-  return (off_t) _lseek(fd, 0, SEEK_CUR);
+  return (off_t) _lseeki64(fd, 0, SEEK_CUR);
 #else
   return (off_t) lseek(fd, 0, SEEK_CUR);
 #endif
@@ -61,7 +61,7 @@ int
 tor_fd_seekend(int fd)
 {
 #ifdef _WIN32
-  return _lseek(fd, 0, SEEK_END) < 0 ? -1 : 0;
+  return _lseeki64(fd, 0, SEEK_END) < 0 ? -1 : 0;
 #else
   off_t rc = lseek(fd, 0, SEEK_END) < 0 ? -1 : 0;
 #ifdef ESPIPE
@@ -80,7 +80,7 @@ int
 tor_fd_setpos(int fd, off_t pos)
 {
 #ifdef _WIN32
-  return _lseek(fd, pos, SEEK_SET) < 0 ? -1 : 0;
+  return _lseeki64(fd, pos, SEEK_SET) < 0 ? -1 : 0;
 #else
   return lseek(fd, pos, SEEK_SET) < 0 ? -1 : 0;
 #endif