GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Commit dcc60294 authored by Nick Mathewson's avatar Nick Mathewson 🐭

Use _lseeki64() on windows.

Fixes bug 31036; bugfix on 0.2.1.8-alpha when we moved the logging
system to use posix fds.
parent 564a9a54
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.
...@@ -43,7 +43,7 @@ off_t ...@@ -43,7 +43,7 @@ off_t
tor_fd_getpos(int fd) tor_fd_getpos(int fd)
{ {
#ifdef _WIN32 #ifdef _WIN32
return (off_t) _lseek(fd, 0, SEEK_CUR); return (off_t) _lseeki64(fd, 0, SEEK_CUR);
#else #else
return (off_t) lseek(fd, 0, SEEK_CUR); return (off_t) lseek(fd, 0, SEEK_CUR);
#endif #endif
...@@ -56,7 +56,7 @@ int ...@@ -56,7 +56,7 @@ int
tor_fd_seekend(int fd) tor_fd_seekend(int fd)
{ {
#ifdef _WIN32 #ifdef _WIN32
return _lseek(fd, 0, SEEK_END) < 0 ? -1 : 0; return _lseeki64(fd, 0, SEEK_END) < 0 ? -1 : 0;
#else #else
off_t rc = lseek(fd, 0, SEEK_END) < 0 ? -1 : 0; off_t rc = lseek(fd, 0, SEEK_END) < 0 ? -1 : 0;
#ifdef ESPIPE #ifdef ESPIPE
...@@ -75,7 +75,7 @@ int ...@@ -75,7 +75,7 @@ int
tor_fd_setpos(int fd, off_t pos) tor_fd_setpos(int fd, off_t pos)
{ {
#ifdef _WIN32 #ifdef _WIN32
return _lseek(fd, pos, SEEK_SET) < 0 ? -1 : 0; return _lseeki64(fd, pos, SEEK_SET) < 0 ? -1 : 0;
#else #else
return lseek(fd, pos, SEEK_SET) < 0 ? -1 : 0; return lseek(fd, pos, SEEK_SET) < 0 ? -1 : 0;
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment