Better log message when writing a CR in text mode on windows

Help to diagnose #11233
This commit is contained in:
Nick Mathewson 2014-03-27 23:48:17 -04:00
parent 9efd970dd9
commit 234dfb0c65
2 changed files with 6 additions and 1 deletions

4
changes/bug11233 Normal file
View File

@ -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.

View File

@ -2002,7 +2002,8 @@ write_str_to_file(const char *fname, const char *str, int bin)
#ifdef _WIN32 #ifdef _WIN32
if (!bin && strchr(str, '\r')) { if (!bin && strchr(str, '\r')) {
log_warn(LD_BUG, 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 #endif
return write_bytes_to_file(fname, str, strlen(str), bin); return write_bytes_to_file(fname, str, strlen(str), bin);