[GNUnet-SVN] r10987 - gnunet/src/testing

[gnunet]

Author: grothoff
Date: 2010-04-19 17:28:10 +0200 (Mon, 19 Apr 2010)
New Revision: 10987

Modified:
   gnunet/src/testing/test_testing_topology.c
Log:
making parser more robust

Modified: gnunet/src/testing/test_testing_topology.c
===================================================================
--- gnunet/src/testing/test_testing_topology.c  2010-04-19 15:26:37 UTC (rev 
10986)
+++ gnunet/src/testing/test_testing_topology.c  2010-04-19 15:28:10 UTC (rev 
10987)
@@ -601,14 +601,16 @@
   int ret;
   char *binary_start_pos;
   char *our_binary_name;
+
   binary_start_pos = rindex(argv[0], '/');
-  if (strstr(binary_start_pos, "test_testing_topology_") == NULL)
-    {
-      return GNUNET_SYSERR;
-    }
+  topology_string = strstr (binary_start_pos,
+                           "_topology");
+  GNUNET_assert (topology_string != NULL);
+  topology_string++;
+  topology_string = strstr (topology_string, "_");
+  GNUNET_assert (topology_string != NULL);
+  topology_string++;
 
-  topology_string = &binary_start_pos[23];
-
   GNUNET_asprintf(&our_binary_name, "test-testing-topology_%s", 
topology_string);
   GNUNET_log_setup (our_binary_name,
 #if VERBOSE