[or-cvs] r8700: Fix extraneous space in CIRC events when path is empty. (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2006-10-13 01:36:00 -0400 (Fri, 13 Oct 2006)
New Revision: 8700

Modified:
   tor/trunk/
   tor/trunk/src/or/control.c
Log:
 r9019 at totoro:  nickm | 2006-10-13 01:32:34 -0400
 Fix extraneous space in CIRC events when path is empty.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r9019] on 96637b51-b116-0410-a10e-9941ebb49b64

Modified: tor/trunk/src/or/control.c
===================================================================
--- tor/trunk/src/or/control.c	2006-10-13 05:27:59 UTC (rev 8699)
+++ tor/trunk/src/or/control.c	2006-10-13 05:36:00 UTC (rev 8700)
@@ -2876,16 +2876,16 @@
 
     if (EVENT_IS_INTERESTING1S(EVENT_CIRCUIT_STATUS)) {
       send_control1_event_extended(EVENT_CIRCUIT_STATUS, SHORT_NAMES,
-                          "650 CIRC %lu %s %s@%s\r\n",
+                          "650 CIRC %lu %s%s%s@%s\r\n",
                           (unsigned long)circ->global_identifier,
-                          status, path, reason);
+                          status, path?" ":"", path, reason);
     }
     if (EVENT_IS_INTERESTING1L(EVENT_CIRCUIT_STATUS)) {
       char *vpath = circuit_list_path_for_controller(circ);
       send_control1_event_extended(EVENT_CIRCUIT_STATUS, LONG_NAMES,
-                          "650 CIRC %lu %s %s@%s\r\n",
+                          "650 CIRC %lu %s%s%s@%s\r\n",
                           (unsigned long)circ->global_identifier,
-                          status, vpath, reason);
+                          status, vpath?" ":"", vpath, reason);
       tor_free(vpath);
     }
   }