diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-05-01 12:37:16 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-05-01 12:37:16 -0400 |
| commit | c472ac4fb84a7977b53d2be051e8ddde15bba8f5 (patch) | |
| tree | 10df297f17e903aed7e1e6b66cdfeef8c16369d4 | |
| parent | a2b59dba71687b28546ccc99e98f1a6675ccdc91 (diff) | |
| parent | 234dfb0c65bb4239d5fc497df10d1759c3577af2 (diff) | |
| download | tor-c472ac4fb84a7977b53d2be051e8ddde15bba8f5.tar tor-c472ac4fb84a7977b53d2be051e8ddde15bba8f5.tar.gz | |
Merge remote-tracking branch 'public/bug11233_diagnose'
| -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 000000000..1161b6dfd --- /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 56235aa66..6524be3ed 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2004,7 +2004,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); |