diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-03-27 23:48:17 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-03-27 23:48:17 -0400 |
| commit | 234dfb0c65bb4239d5fc497df10d1759c3577af2 (patch) | |
| tree | e534c69ea8888138053026e5a8444186b1700ee8 | |
| parent | 9efd970dd9e04177832312d6d611a855ec4e455f (diff) | |
| download | tor-234dfb0c65bb4239d5fc497df10d1759c3577af2.tar.gz tor-234dfb0c65bb4239d5fc497df10d1759c3577af2.zip | |
Better log message when writing a CR in text mode on windows
Help to diagnose #11233
| -rw-r--r-- | changes/bug11233 | 4 | ||||
| -rw-r--r-- | src/common/util.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug11233 b/changes/bug11233 new file mode 100644 index 0000000000..1161b6dfdf --- /dev/null +++ b/changes/bug11233 @@ -0,0 +1,4 @@ + o Minor features: + - When we encounter an unexpected CR in text that we're trying to + write to a file on Windows, log the name of the file. Should help + diagnosing bug 11233. diff --git a/src/common/util.c b/src/common/util.c index a0adb15ffe..79e28601c9 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2002,7 +2002,8 @@ write_str_to_file(const char *fname, const char *str, int bin) #ifdef _WIN32 if (!bin && strchr(str, '\r')) { log_warn(LD_BUG, - "We're writing a text string that already contains a CR."); + "We're writing a text string that already contains a CR to %s", + escaped(fname)); } #endif return write_bytes_to_file(fname, str, strlen(str), bin); |