diff options
| -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 000000000..338e19d9a --- /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 d4d7cb372..5329a0504 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.", |