From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 28 Mar 2014 03:48:17 +0000 (-0400)
Subject: Better log message when writing a CR in text mode on windows
X-Git-Tag: tor-0.2.5.5-alpha~106^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=234dfb0c65bb4239d5fc497df10d1759c3577af2;p=thirdparty%2Ftor.git

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

Help to diagnose #11233
---

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);