From: Sree Harsha Totakura <totakura@in.tum.de>
Date: Thu, 31 May 2012 13:21:13 +0000 (+0000)
Subject: -fixing windows _mktemp_s
X-Git-Tag: initial-import-from-subversion-38251~13343
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=416139335b8a2825676e95856393b377b01aa81d;p=oweals%2Fgnunet.git

-fixing windows _mktemp_s
---

diff --git a/src/testing/test_testing_new_peerstartup.c b/src/testing/test_testing_new_peerstartup.c
index 3793e8436..203df2f1e 100644
--- a/src/testing/test_testing_new_peerstartup.c
+++ b/src/testing/test_testing_new_peerstartup.c
@@ -92,28 +92,33 @@ run (void *cls, char *const *args, const char *cfgfile,
   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);