[or-cvs] Fix windows build for VC6; centralize newline-fiasco-damage...

[Nick Mathewson]

Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/tmp/cvs-serv25868/src/or

Modified Files:
	router.c routerlist.c 
Log Message:
Fix windows build for VC6; centralize newline-fiasco-damage-control logic

Index: router.c
===================================================================
RCS file: /home/or/cvsroot/src/or/router.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- router.c	9 Nov 2004 18:22:17 -0000	1.116
+++ router.c	9 Nov 2004 19:13:08 -0000	1.117
@@ -354,7 +354,6 @@
   if(!cp) {
     log_fn(LOG_INFO,"Cached directory %s not present. Ok.",keydir);
   } else {
-    tor_strstrip(cp,"\r"); /* XXXX Workaround for win32 read_file_to_str bug. */ 
     if(dirserv_load_from_directory_string(cp) < 0){
       log_fn(LOG_ERR, "Cached directory %s is corrupt", keydir);
       tor_free(cp);

Index: routerlist.c
===================================================================
RCS file: /home/or/cvsroot/src/or/routerlist.c,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -d -r1.181 -r1.182
--- routerlist.c	9 Nov 2004 17:14:15 -0000	1.181
+++ routerlist.c	9 Nov 2004 19:13:08 -0000	1.182
@@ -60,7 +60,6 @@
   }
   s = read_file_to_str(filename,0);
   if (s) {
-    tor_strstrip(s,"\r"); /* XXXX This is a bug workaround for win32. */
     log_fn(LOG_INFO, "Loading cached directory from %s", filename);
     is_recent = st.st_mtime > time(NULL) - 60*15;
     if (router_load_routerlist_from_directory(s, NULL, is_recent) < 0) {