[tor-bugs] #6844 [Tor Client]: Make read_file_to_string() work on cygwin

[Tor Bug Tracker & Wiki]

#6844: Make read_file_to_string() work on cygwin
------------------------+---------------------------------------------------
 Reporter:  nickm       |          Owner:                    
     Type:  defect      |         Status:  new               
 Priority:  normal      |      Milestone:  Tor: 0.2.3.x-final
Component:  Tor Client  |        Version:                    
 Keywords:              |         Parent:                    
   Points:              |   Actualpoints:                    
------------------------+---------------------------------------------------
 On IRC, a user reports that we fail to load the state file at startup on
 cygwin.  That's apparently because the _WIN32-only code in
 read_file_to_string() needs to be enabled for cygwin too.

 Trivial, tested patch:
 {{{
 diff --git a/src/common/util.c b/src/common/util.c
 index d4d7cb3..5329a05 100644
 --- a/src/common/util.c
 +++ b/src/common/util.c
 @@ -2328,7 +2328,7 @@ read_file_to_str(const char *filename, int flags,
 struct stat *stat_out)
    }
    string[r] = '\0'; /* NUL-terminate the result. */

 -#ifdef _WIN32
 +#if defined(_WIN32) || defined(__CYGWIN__)
    if (!bin && strchr(string, '\r')) {
      log_debug(LD_FS, "We didn't convert CRLF to LF as well as we hoped "
                "when reading %s. Coping.",
 }}}

-- 
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/6844>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online