[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21655 - gnunet/src/testing
From: |
gnunet |
Subject: |
[GNUnet-SVN] r21655 - gnunet/src/testing |
Date: |
Thu, 31 May 2012 15:21:13 +0200 |
Author: harsha
Date: 2012-05-31 15:21:13 +0200 (Thu, 31 May 2012)
New Revision: 21655
Modified:
gnunet/src/testing/test_testing_new_peerstartup.c
Log:
-fixing windows _mktemp_s
Modified: gnunet/src/testing/test_testing_new_peerstartup.c
===================================================================
--- gnunet/src/testing/test_testing_new_peerstartup.c 2012-05-31 13:09:18 UTC
(rev 21654)
+++ gnunet/src/testing/test_testing_new_peerstartup.c 2012-05-31 13:21:13 UTC
(rev 21655)
@@ -92,28 +92,33 @@
char *data_dir;
char *hostkeys_file;
char *emsg;
- char *tmpdir_;
+ char *_tmpdir;
char *tmpdir;
#ifdef MINGW
char *tmpdir_w;
#endif
struct GNUNET_PeerIdentity id;
-
- tmpdir_ = getenv ("TMPDIR");
- tmpdir_ = tmpdir_ ? tmpdir_ : "/tmp";
- GNUNET_asprintf (&tmpdir, "%s/%s", tmpdir_,
"test-gnunet-testing_new-XXXXXX");
+
+ _tmpdir = getenv ("TMP");
+ if (NULL == _tmpdir)
+ _tmpdir = getenv ("TEMP");
+ if (NULL == _tmpdir)
+ _tmpdir = getenv ("TMPDIR");
+ if (NULL == _tmpdir)
+ _tmpdir = "/tmp";
+ GNUNET_asprintf (&tmpdir, "%s/%s", _tmpdir,
"test-gnunet-testing_new-XXXXXX");
#ifdef MINGW
tmpdir_w = GNUNET_malloc (MAX_PATH + 1);
GNUNET_assert (ERROR_SUCCESS == plibc_conv_to_win_path (tmpdir, tmpdir_w));
GNUNET_free (tmpdir);
tmpdir = tmpdir_w;
- GNUNET_assert (0 == _mktemp_s (tmpdir, strlen (tmpdir) + 1));
+ //GNUNET_assert (0 == _mktemp_s (tmpdir, strlen (tmpdir) + 1));
#else
GNUNET_assert (mkdtemp (tmpdir) == tmpdir);
#endif
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "Temporary directory: %s\n", tmpdir);
+ /* LOG (GNUNET_ERROR_TYPE_ERROR, */
+ /* "Temporary directory: %s\n", tmpdir); */
system = GNUNET_TESTING_system_create (tmpdir,
"localhost");
GNUNET_assert (NULL != system);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r21655 - gnunet/src/testing,
gnunet <=