[or-cvs] Insert a newline between all router descriptors when genera...

[Nick Mathewson]

Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv15083/src/or

Modified Files:
	dirserv.c 
Log Message:
Insert a newline between all router descriptors when generating (old style) signed directories, in case somebody was counting on that.

Index: dirserv.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/dirserv.c,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -d -r1.246 -r1.247
--- dirserv.c	6 Oct 2005 04:33:40 -0000	1.246
+++ dirserv.c	8 Oct 2005 06:02:41 -0000	1.247
@@ -731,6 +731,7 @@
 dirserv_dump_directory_to_string(char **dir_out,
                                  crypto_pk_env_t *private_key)
 {
+  char *cp;
   char *router_status;
   char *identity_pkey; /* Identity key, DER64-encoded. */
   char *recommended_versions;
@@ -765,7 +766,7 @@
   buf_len = 2048+strlen(recommended_versions)+
     strlen(router_status);
   SMARTLIST_FOREACH(descriptor_list, routerinfo_t *, ri,
-                    buf_len += ri->signed_descriptor_len);
+                    buf_len += ri->signed_descriptor_len+1);
   buf = tor_malloc(buf_len);
   /* We'll be comparing against buf_len throughout the rest of the
      function, though strictly speaking we shouldn't be able to exceed
@@ -785,9 +786,17 @@
   tor_free(router_status);
   tor_free(identity_pkey);
 
+  cp = buf + strlen(buf);
   SMARTLIST_FOREACH(descriptor_list, routerinfo_t *, ri,
-    if (strlcat(buf, ri->signed_descriptor, buf_len) >= buf_len)
-      goto truncated);
+    {
+      if (cp+ri->signed_descriptor_len+1 >= buf+buf_len)
+        goto truncated;
+      memcpy(cp, ri->signed_descriptor, ri->signed_descriptor_len);
+      cp += ri->signed_descriptor_len;
+      *cp++ = '\n'; /* add an extra newline in case somebody was depending on
+                     * it. */
+    });
+  *cp = '\0';
 
   /* These multiple strlcat calls are inefficient, but dwarfed by the RSA
      signature.