[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r36664 - gnunet/src/testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r36664 - gnunet/src/testbed |
Date: |
Mon, 16 Nov 2015 08:43:22 +0100 |
Author: grothoff
Date: 2015-11-16 08:43:22 +0100 (Mon, 16 Nov 2015)
New Revision: 36664
Modified:
gnunet/src/testbed/gnunet-daemon-testbed-blacklist.c
gnunet/src/testbed/gnunet-helper-testbed.c
Log:
fix #4054
Modified: gnunet/src/testbed/gnunet-daemon-testbed-blacklist.c
===================================================================
--- gnunet/src/testbed/gnunet-daemon-testbed-blacklist.c 2015-11-16
07:36:35 UTC (rev 36663)
+++ gnunet/src/testbed/gnunet-daemon-testbed-blacklist.c 2015-11-16
07:43:22 UTC (rev 36664)
@@ -212,7 +212,7 @@
const struct GNUNET_CONFIGURATION_Handle *c)
{
char *shome;
- char fname[PATH_MAX];
+ char *fname;
if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (c, "PATHS",
"GNUNET_HOME",
@@ -221,15 +221,21 @@
GNUNET_break (0);
return;
}
- GNUNET_assert (0 < GNUNET_snprintf (fname, PATH_MAX, "%s/whitelist", shome));
+ GNUNET_asprintf (&fname,
+ "%s/whitelist",
+ shome);
if (GNUNET_YES == GNUNET_DISK_file_test (fname))
{
mode = ACCESS_ALLOW;
setup_ac (fname, c);
GNUNET_free (shome);
+ GNUNET_free (fname);
return;
}
- GNUNET_assert (0 < GNUNET_snprintf (fname, PATH_MAX, "%s/blacklist", shome));
+ GNUNET_asprintf (&fname,
+ "%s/blacklist",
+ shome);
+ GNUNET_free (fname);
if (GNUNET_YES == GNUNET_DISK_file_test (fname))
{
mode = ACCESS_DENY;
Modified: gnunet/src/testbed/gnunet-helper-testbed.c
===================================================================
--- gnunet/src/testbed/gnunet-helper-testbed.c 2015-11-16 07:36:35 UTC (rev
36663)
+++ gnunet/src/testbed/gnunet-helper-testbed.c 2015-11-16 07:43:22 UTC (rev
36664)
@@ -420,13 +420,16 @@
if (NULL != evstr)
{
#ifdef WINDOWS
- GNUNET_assert (0 != SetEnvironmentVariable (GNUNET_TESTING_PREFIX, evstr));
+ GNUNET_assert (0 != SetEnvironmentVariable (GNUNET_TESTING_PREFIX,
+ evstr));
#else
- static char evar[2* PATH_MAX];
+ char *evar;
- GNUNET_assert (0 < GNUNET_snprintf (evar, sizeof (evar),
- GNUNET_TESTING_PREFIX "=%s", evstr));
- putenv (evar);
+ GNUNET_asprintf (&evar,
+ GNUNET_TESTING_PREFIX "=%s",
+ evstr);
+ putenv (evar); /* consumes 'evar',
+ see putenv(): becomes part of envrionment! */
#endif
GNUNET_free (evstr);
evstr = NULL;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r36664 - gnunet/src/testbed,
gnunet <=