commit 5dbaf9dbd545d7c9ecc18224883a74a9dc60ecf4 Author: Sebastian Hahn sebastian@torproject.org Date: Fri Feb 11 16:57:53 2011 +0100

Windows has EACCES, not EACCESS

Once again spotted by mobmix

Also add a changes file for the fix --- changes/bug2504 | 5 +++++ src/common/compat.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/changes/bug2504 b/changes/bug2504 new file mode 100644 index 0000000..791600e --- /dev/null +++ b/changes/bug2504 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Fix a bug with our locking implementation on windows that couldn't + correctly detect when a file was already locked. Fixes bug 2504, + bugfix on 0.2.1.6-alpha. + diff --git a/src/common/compat.c b/src/common/compat.c index 5dfde3d..d29cacf 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -699,7 +699,7 @@ tor_lockfile_lock(const char *filename, int blocking, int *locked_out) #ifdef WIN32 _lseek(fd, 0, SEEK_SET); if (_locking(fd, blocking ? _LK_LOCK : _LK_NBLCK, 1) < 0) { - if (errno != EACCESS && errno != EDEADLOCK) + if (errno != EACCES && errno != EDEADLOCK) log_warn(LD_FS,"Couldn't lock "%s": %s", filename, strerror(errno)); else *locked_out = 1;