diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-22 12:47:47 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-22 12:47:47 -0500 |
| commit | 933ffd536daf5b00e1ddcb517b2e4e73f2bcb286 (patch) | |
| tree | acdf743e6be8ccef0de63c702864b6a92eca641f | |
| parent | ce4f8791010819309f44eceb8f1ae064c5560e79 (diff) | |
| parent | 613073e449c22ad3583e406e48cf5ada395489f0 (diff) | |
| download | tor-933ffd536daf5b00e1ddcb517b2e4e73f2bcb286.tar.gz tor-933ffd536daf5b00e1ddcb517b2e4e73f2bcb286.zip | |
Merge remote branch 'origin/maint-0.2.2'
| -rw-r--r-- | changes/bug2504 | 5 | ||||
| -rw-r--r-- | 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 0000000000..791600e593 --- /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 1b103e96d3..8e022dcb63 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -728,7 +728,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; |