[GNUnet-SVN] r14091 - branches/gnunet/mantis_0001616/src/util

[gnunet]

Author: durner
Date: 2010-12-27 00:05:22 +0100 (Mon, 27 Dec 2010)
New Revision: 14091

Modified:
   branches/gnunet/mantis_0001616/src/util/disk.c
Log:
add creation of temp. named pipes

Modified: branches/gnunet/mantis_0001616/src/util/disk.c
===================================================================
--- branches/gnunet/mantis_0001616/src/util/disk.c      2010-12-26 18:43:20 UTC 
(rev 14090)
+++ branches/gnunet/mantis_0001616/src/util/disk.c      2010-12-26 23:05:22 UTC 
(rev 14091)
@@ -1889,7 +1889,7 @@
                           enum GNUNET_DISK_OpenFlags flags,
                           enum GNUNET_DISK_AccessPermissions perm)
 {
-#if WINDOWS && !defined(__CYGWIN__)
+#ifdef MINGW
   struct GNUNET_DISK_FileHandle *ret;
   HANDLE h = NULL;
   DWORD openMode;
@@ -1967,11 +1967,20 @@
 
   return ret;
 #else
-  /* FIXME: if fn is NULL generate a fn (something in /usr/share/gnunet/,
-   * with a random number attached
-   */  
-  if (mkfifo(fn, translate_unix_perms(perm)) == -1)
+  if (*fn == NULL)
     {
+      char dir[] = "/tmp/gnunet-pipe-XXXXXX";
+
+      if (mkdtemp(dir) == NULL)
+        {
+          GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "mkdtemp");
+          return NULL;
+        }
+      GNUNET_asprintf(fn, "%s/child-control", dir);
+    }
+
+  if (mkfifo(*fn, translate_unix_perms(perm)) == -1)
+    {
       if ( (errno != EEXIST) ||
           (0 != (flags & GNUNET_DISK_OPEN_FAILIFEXISTS)) )
         return NULL;
@@ -1995,7 +2004,7 @@
                         enum GNUNET_DISK_OpenFlags flags,
                         enum GNUNET_DISK_AccessPermissions perm)
 {
-#if WINDOWS && !defined(__CYGWIN__)
+#ifdef MINGW
   struct GNUNET_DISK_FileHandle *ret;
   HANDLE h;
   DWORD openMode;