diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-09-14 12:40:23 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-09-14 12:40:23 -0400 |
| commit | 523b0ec288ae22d5d6cd448b37cfb5b0f7b71aca (patch) | |
| tree | 4f36b04bfdbc47caa0d047672c6b6416ccb6c930 | |
| parent | f2f720a7efe386cba06973a5927d2d4bc8bc9d60 (diff) | |
| parent | b1447a4312c47f13bf8ddddab09f19ee73640a3e (diff) | |
| download | tor-523b0ec288ae22d5d6cd448b37cfb5b0f7b71aca.tar.gz tor-523b0ec288ae22d5d6cd448b37cfb5b0f7b71aca.zip | |
Merge remote-tracking branch 'origin/maint-0.2.3'
| -rw-r--r-- | changes/bug6844 | 4 | ||||
| -rw-r--r-- | src/common/util.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug6844 b/changes/bug6844 new file mode 100644 index 0000000000..338e19d9a5 --- /dev/null +++ b/changes/bug6844 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Correct file sizes when reading binary files on + Cygwin, to avoid a bug where Tor would fail to read its state file. + Fixes bug 6844; bugfix on 0.1.2.7-alpha. diff --git a/src/common/util.c b/src/common/util.c index d4d7cb3720..5329a0504e 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2328,7 +2328,7 @@ read_file_to_str(const char *filename, int flags, struct stat *stat_out) } string[r] = '\0'; /* NUL-terminate the result. */ -#ifdef _WIN32 +#if defined(_WIN32) || defined(__CYGWIN__) if (!bin && strchr(string, '\r')) { log_debug(LD_FS, "We didn't convert CRLF to LF as well as we hoped " "when reading %s. Coping.", |