[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r31182 - gnunet/src/testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r31182 - gnunet/src/testbed |
Date: |
Sun, 8 Dec 2013 22:33:29 +0100 |
Author: LRN
Date: 2013-12-08 22:33:29 +0100 (Sun, 08 Dec 2013)
New Revision: 31182
Modified:
gnunet/src/testbed/gnunet-helper-testbed.c
Log:
Save the prefix value on W32, it does not survive unsetting
Modified: gnunet/src/testbed/gnunet-helper-testbed.c
===================================================================
--- gnunet/src/testbed/gnunet-helper-testbed.c 2013-12-08 21:33:27 UTC (rev
31181)
+++ gnunet/src/testbed/gnunet-helper-testbed.c 2013-12-08 21:33:29 UTC (rev
31182)
@@ -406,9 +406,10 @@
evstr = getenv (GNUNET_TESTING_PREFIX);
if (NULL != evstr)
{
-#if WINDOWS
- static char *evar = GNUNET_TESTING_PREFIX "=";
- GNUNET_break (0 == putenv (evar));
+#ifdef WINDOWS
+ /* unsetting the variable will invalidate the pointer! */
+ evstr = GNUNET_strdup (evstr);
+ GNUNET_break (0 != SetEnvironmentVariable (GNUNET_TESTING_PREFIX, NULL));
#else
GNUNET_break (0 == unsetenv (GNUNET_TESTING_PREFIX));
#endif
@@ -418,11 +419,16 @@
NULL);
if (NULL != evstr)
{
+#ifdef WINDOWS
+ GNUNET_assert (0 != SetEnvironmentVariable (GNUNET_TESTING_PREFIX, evstr));
+ GNUNET_free (evstr);
+#else
static char evar[2* PATH_MAX];
GNUNET_assert (0 < GNUNET_snprintf (evar, sizeof (evar),
GNUNET_TESTING_PREFIX "=%s", evstr));
putenv (evar);
+#endif
/* do not free evstr */
evstr = NULL;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r31182 - gnunet/src/testbed,
gnunet <=