Bladeren bron

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

Help to diagnose #11233
Nick Mathewson 10 jaren geleden
bovenliggende
commit
234dfb0c65
2 gewijzigde bestanden met toevoegingen van 6 en 1 verwijderingen
  1. 4 0
      changes/bug11233
  2. 2 1
      src/common/util.c

+ 4 - 0
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.

+ 2 - 1
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);