[GNUnet-SVN] r36665 - in gnunet/src: arm testbed

[gnunet]

Author: grothoff
Date: 2015-11-16 08:47:10 +0100 (Mon, 16 Nov 2015)
New Revision: 36665

Modified:
   gnunet/src/arm/test_exponential_backoff.c
   gnunet/src/testbed/gnunet-helper-testbed.c
   gnunet/src/testbed/test_testbed_api_barriers.c
   gnunet/src/testbed/test_testbed_underlay.c
Log:
more PATH_MAX issues (#4054)

Modified: gnunet/src/arm/test_exponential_backoff.c
===================================================================
--- gnunet/src/arm/test_exponential_backoff.c   2015-11-16 07:43:22 UTC (rev 
36664)
+++ gnunet/src/arm/test_exponential_backoff.c   2015-11-16 07:47:10 UTC (rev 
36665)
@@ -402,6 +402,14 @@
 }
 
 
+#ifndef PATH_MAX
+/**
+ * Assumed maximum path length (for the log file name).
+ */
+#define PATH_MAX 4096
+#endif
+
+
 static int
 init ()
 {

Modified: gnunet/src/testbed/gnunet-helper-testbed.c
===================================================================
--- gnunet/src/testbed/gnunet-helper-testbed.c  2015-11-16 07:43:22 UTC (rev 
36664)
+++ gnunet/src/testbed/gnunet-helper-testbed.c  2015-11-16 07:47:10 UTC (rev 
36665)
@@ -428,8 +428,8 @@
     GNUNET_asprintf (&evar,
                      GNUNET_TESTING_PREFIX "=%s",
                      evstr);
-    putenv (evar); /* consumes 'evar',
-                      see putenv(): becomes part of envrionment! */
+    GNUNET_assert (0 == putenv (evar)); /* consumes 'evar',
+                                           see putenv(): becomes part of 
envrionment! */
 #endif
     GNUNET_free (evstr);
     evstr = NULL;
@@ -454,12 +454,15 @@
   LOG_DEBUG ("Staring testbed with config: %s\n", config);
   binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-testbed");
   {
-    static char evar[2 * PATH_MAX];
+    char *evar;
 
     /* expose testbed configuration through env variable */
-    GNUNET_assert (0 < GNUNET_snprintf (evar, sizeof (evar),
-                                        "%s=%s", ENV_TESTBED_CONFIG, config));
-    GNUNET_assert (0 == putenv (evar));
+    GNUNET_asprintf (&evar,
+                     "%s=%s",
+                     ENV_TESTBED_CONFIG,
+                     config));
+    GNUNET_assert (0 == putenv (evar));  /* consumes 'evar',
+                                            see putenv(): becomes part of 
envrionment! */
     evstr = NULL;
   }
   testbed =

Modified: gnunet/src/testbed/test_testbed_api_barriers.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_barriers.c      2015-11-16 07:43:22 UTC 
(rev 36664)
+++ gnunet/src/testbed/test_testbed_api_barriers.c      2015-11-16 07:47:10 UTC 
(rev 36665)
@@ -167,7 +167,15 @@
 }
 
 
+#ifndef PATH_MAX
 /**
+ * Assumed maximum path length (for the log file name).
+ */
+#define PATH_MAX 4096
+#endif
+
+
+/**
  * Main function
  */
 int

Modified: gnunet/src/testbed/test_testbed_underlay.c
===================================================================
--- gnunet/src/testbed/test_testbed_underlay.c  2015-11-16 07:43:22 UTC (rev 
36664)
+++ gnunet/src/testbed/test_testbed_underlay.c  2015-11-16 07:47:10 UTC (rev 
36665)
@@ -124,7 +124,15 @@
 }
 
 
+#ifndef PATH_MAX
 /**
+ * Assumed maximum path length (for the log file name).
+ */
+#define PATH_MAX 4096
+#endif
+
+
+/**
  * Main function
  */
 int