Use passed-by-fd pipe to control chilren

Removes npipe_*() functions.
Uses normal GNUnet pipe for child control (the pipe is
anonymous on *nix, named-with-unique-name on W32).

Also tighten W32 code (close pipes correctly on errors).
Remove some FIXME NILS comments.
Convert #if MINGW -> #if defined (WINDOWS) in some places.

Better start_process() debug logging on W32

2 files changed, 149 insertions, 303 deletions

diff --git a/src/util/disk.c b/src/util/disk.c
index 53e8867e2..f06311f88 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -1866,7 +1866,7 @@ GNUNET_DISK_file_close (struct GNUNET_DISK_FileHandle *h)
   return ret;
 }
 
-#ifndef WINDOWS
+#ifdef WINDOWS
 /**
  * Get a GNUnet file handle from a W32 handle.
  *
diff --git a/src/util/os_priority.c b/src/util/os_priority.c
index 6074a1f24..2d5dba4a3 100644
--- a/src/util/os_priority.c
+++ b/src/util/os_priority.c
@@ -57,14 +57,10 @@ struct GNUNET_OS_Process
 #endif
 
   /**
-   * Pipe we use to signal the process (if used).
+   * Pipe we use to signal the process.
+   * NULL if unused, or if process was deemed uncontrollable.
    */
   struct GNUNET_DISK_FileHandle *control_pipe;
-
-  /**
-   * Name of the pipe, NULL for none.
-   */
-  char *childpipename;
 };
 
 
@@ -74,244 +70,6 @@ struct GNUNET_OS_Process
 static struct GNUNET_OS_Process current_process;
 
 
-/* MinGW version of named pipe API */
-#ifdef MINGW
-/**
- * Creates a named pipe/FIFO and opens it
- *
- * @param fn pointer to the name of the named pipe or to NULL,
- *           possibly updated to the new name (or free'd)
- * @param flags open flags
- * @param perm access permissions
- * @return pipe handle on success, NULL on error
- */
-static struct GNUNET_DISK_FileHandle *
-npipe_create (char **fn, enum GNUNET_DISK_OpenFlags flags,
-              enum GNUNET_DISK_AccessPermissions perm)
-{
-  struct GNUNET_DISK_FileHandle *ret;
-  HANDLE h = NULL;
-  DWORD openMode;
-  char *name;
-
-  openMode = 0;
-  if (flags & GNUNET_DISK_OPEN_READWRITE)
-    openMode = PIPE_ACCESS_DUPLEX;
-  else if (flags & GNUNET_DISK_OPEN_READ)
-    openMode = PIPE_ACCESS_INBOUND;
-  else if (flags & GNUNET_DISK_OPEN_WRITE)
-    openMode = PIPE_ACCESS_OUTBOUND;
-  if (flags & GNUNET_DISK_OPEN_FAILIFEXISTS)
-    openMode |= FILE_FLAG_FIRST_PIPE_INSTANCE;
-
-  while (NULL == h)
-  {
-    DWORD error_code;
-
-    name = NULL;
-    if (NULL != *fn)
-    {
-      GNUNET_asprintf (&name, "\\\\.\\pipe\\%.246s", fn);
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Trying to create an instance of named pipe `%s'\n", name);
-      /* 1) This might work just fine with UTF-8 strings as it is.
-       * 2) This is only used by GNUnet itself, and only with latin names.
-       */
-      h = CreateNamedPipe (name, openMode | FILE_FLAG_OVERLAPPED,
-                           PIPE_TYPE_BYTE | PIPE_READMODE_BYTE, 2, 1, 1, 0,
-                           NULL);
-    }
-    else
-    {
-      GNUNET_asprintf (fn, "\\\\.\\pipe\\gnunet-%llu",
-                       GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
-                                                 UINT64_MAX));
-      LOG (GNUNET_ERROR_TYPE_DEBUG, "Trying to create unique named pipe `%s'\n",
-           *fn);
-      h = CreateNamedPipe (*fn,
-                           openMode | FILE_FLAG_OVERLAPPED |
-                           FILE_FLAG_FIRST_PIPE_INSTANCE,
-                           PIPE_TYPE_BYTE | PIPE_READMODE_BYTE, 2, 1, 1, 0,
-                           NULL);
-    }
-    error_code = GetLastError ();
-    GNUNET_free_non_null (name);
-    /* don't re-set name to NULL yet */
-    if (INVALID_HANDLE_VALUE == h)
-    {
-      SetErrnoFromWinError (error_code);
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Pipe creation have failed because of %d, errno is %d\n", error_code,
-           errno);
-      if (NULL != *fn)
-      {
-        LOG (GNUNET_ERROR_TYPE_DEBUG,
-             "Pipe was to be unique, considering re-creation\n");
-        GNUNET_free (*fn);
-        *fn = NULL;
-        if ( (ERROR_ACCESS_DENIED != error_code) && (ERROR_PIPE_BUSY != error_code) )        
-          return NULL;        
-        LOG (GNUNET_ERROR_TYPE_DEBUG,
-             "Pipe name was not unique, trying again\n");
-        h = NULL;
-      }
-      else
-        return NULL;
-    }
-  }
-  ret = GNUNET_malloc (sizeof (struct GNUNET_DISK_FileHandle));
-  ret->h = h;
-  ret->type = GNUNET_DISK_HANLDE_TYPE_PIPE;
-  ret->oOverlapRead = GNUNET_malloc (sizeof (OVERLAPPED));
-  ret->oOverlapWrite = GNUNET_malloc (sizeof (OVERLAPPED));
-  ret->oOverlapRead->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL);
-  ret->oOverlapWrite->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL);
-  return ret;
-}
-
-
-/**
- * Opens already existing named pipe/FIFO
- *
- * @param fn name of an existing named pipe
- * @param flags open flags
- * @return pipe handle on success, NULL on error
- */
-static struct GNUNET_DISK_FileHandle *
-npipe_open (const char *fn, enum GNUNET_DISK_OpenFlags flags)
-{
-  struct GNUNET_DISK_FileHandle *ret;
-  HANDLE h;
-  DWORD openMode;
-
-  openMode = 0;
-  if (flags & GNUNET_DISK_OPEN_READWRITE)
-    openMode = GENERIC_WRITE | GENERIC_READ;
-  else if (flags & GNUNET_DISK_OPEN_READ)
-    openMode = GENERIC_READ;
-  else if (flags & GNUNET_DISK_OPEN_WRITE)
-    openMode = GENERIC_WRITE;
-
-  h = CreateFile (fn, openMode, 0, NULL, OPEN_EXISTING,
-                  FILE_FLAG_OVERLAPPED | FILE_READ_ATTRIBUTES, NULL);
-  if (INVALID_HANDLE_VALUE == h)
-  {
-    SetErrnoFromWinError (GetLastError ());
-    return NULL;
-  }
-
-  ret = GNUNET_malloc (sizeof (struct GNUNET_DISK_FileHandle));
-  ret->h = h;
-  ret->type = GNUNET_DISK_HANLDE_TYPE_PIPE;
-  ret->oOverlapRead = GNUNET_malloc (sizeof (OVERLAPPED));
-  ret->oOverlapWrite = GNUNET_malloc (sizeof (OVERLAPPED));
-  ret->oOverlapRead->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL);
-  ret->oOverlapWrite->hEvent = CreateEvent (NULL, FALSE, FALSE, NULL);
-
-  return ret;
-}
-
-#else
-/* UNIX version of named-pipe API */
-
-/**
- * Clean up a named pipe and the directory it was placed in.
- *
- * @param fn name of the pipe
- */
-static void
-cleanup_npipe (const char *fn)
-{
-  char *dn;
-  char *dp;
-
-  if (0 != unlink (fn))
-    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", fn);
-  dn = GNUNET_strdup (fn);
-  dp = dirname (dn);
-  if (0 != rmdir (dp))
-    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "rmdir", dp);
-  GNUNET_free (dn);  
-}
-
-
-/**
- * Setup a named pipe.
- *
- * @param fn where to store the name of the new pipe,
- *           if *fn is non-null, the name of the pipe to setup
- * @return GNUNET_OK on success
- */
-static int
-npipe_setup (char **fn)
-{
-  if (NULL == *fn)
-  {
-    /* FIXME: hardwired '/tmp' path... is bad */
-    char dir[] = "/tmp/gnunet-pipe-XXXXXX"; 
-
-    if (NULL == mkdtemp (dir))
-    {
-      LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "mkdtemp");
-      return GNUNET_SYSERR;
-    }
-    GNUNET_asprintf (fn, "%s/child-control", dir);
-  }
-  if (-1 == mkfifo (*fn, S_IRUSR | S_IWUSR))
-    return GNUNET_SYSERR;  
-  return GNUNET_OK;
-}
-
-
-/**
- * Open an existing named pipe.
- *
- * @param fn name of the file
- * @param flags flags to use
- * @return NULL on error
- */
-static struct GNUNET_DISK_FileHandle *
-npipe_open (const char *fn,
-            enum GNUNET_DISK_OpenFlags flags)
-{
-  struct GNUNET_DISK_FileHandle *ret;
-  int fd;
-  struct timespec req;
-  int i;
-
-  /* 200 * 5ms = 1s at most */
-  for (i=0;i<200;i++) 
-  {
-    fd = open (fn, O_NONBLOCK | ((flags == GNUNET_DISK_OPEN_READ) ? O_RDONLY : O_WRONLY));
-    if ( (-1 != fd) || (9 == i) || (flags == GNUNET_DISK_OPEN_READ)) 
-      break;
-    /* as this is for killing a child process via pipe and it is conceivable that
-       the child process simply didn't finish starting yet, we do some sleeping
-       (which is obviously usually not allowed).  We can't select on the FD as
-       'open' fails, and we probably shouldn't just "ignore" the error, so wait
-       and retry a few times is likely the best method; our process API doesn't 
-       support continuations, so we need to sleep directly... */
-    req.tv_sec = 0;
-    req.tv_nsec = 5000000; /* 5ms */
-    (void) nanosleep (&req, NULL);
-  } 
-  if (-1 == fd)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                (flags == GNUNET_DISK_OPEN_READ) 
-                ? _("Failed to open named pipe `%s' for reading: %s\n")
-                : _("Failed to open named pipe `%s' for writing: %s\n"),
-                fn,
-                STRERROR (errno));
-    return NULL;
-  }
-  ret = GNUNET_malloc (sizeof (struct GNUNET_DISK_FileHandle));
-  ret->fd = fd;
-  return ret;
-}
-#endif
-
-
 /**
  * This handler is called when there are control data to be read on the pipe
  *
@@ -323,8 +81,8 @@ parent_control_handler (void *cls,
                         const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GNUNET_DISK_FileHandle *control_pipe = cls;
-  char *pipe_name;
   char sig;
+  char *pipe_fd;
   ssize_t ret;
   
   LOG (GNUNET_ERROR_TYPE_DEBUG, "`%s' invoked because of %d\n", __FUNCTION__,
@@ -346,10 +104,10 @@ parent_control_handler (void *cls,
     control_pipe = NULL;
     return;
   }
-  pipe_name = getenv (GNUNET_OS_CONTROL_PIPE);
-  GNUNET_assert ( (NULL == pipe_name) || (strlen (pipe_name) <= 0) );
+  pipe_fd = getenv (GNUNET_OS_CONTROL_PIPE);
+  GNUNET_assert ( (NULL == pipe_fd) || (strlen (pipe_fd) <= 0) );
   LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Got control code %d from parent via pipe %s\n", sig, pipe_name);
+       "Got control code %d from parent via pipe %s\n", sig, pipe_fd);
   GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
                                   control_pipe, &parent_control_handler,
                                   control_pipe);
@@ -372,7 +130,9 @@ GNUNET_OS_install_parent_control_handler (void *cls,
                                           GNUNET_SCHEDULER_TaskContext *tc)
 {
   const char *env_buf;
+  char *env_buf_end;
   struct GNUNET_DISK_FileHandle *control_pipe;
+  uint64_t pipe_fd;
 
   env_buf = getenv (GNUNET_OS_CONTROL_PIPE);
   if ( (NULL == env_buf) || (strlen (env_buf) <= 0) )
@@ -380,22 +140,34 @@ GNUNET_OS_install_parent_control_handler (void *cls,
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Not installing a handler because $%s is empty\n",
          GNUNET_OS_CONTROL_PIPE);
-    putenv ("GNUNET_OS_CONTROL_PIPE=");
+    putenv (GNUNET_OS_CONTROL_PIPE "=");
+    return;
+  }
+  errno = 0;
+  pipe_fd = strtoull (env_buf, &env_buf_end, 16);
+  if ((0 != errno) || (env_buf == env_buf_end))
+  {
+    LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "strtoull", env_buf);
+    putenv (GNUNET_OS_CONTROL_PIPE "=");
     return;
   }
-  control_pipe =
-    npipe_open (env_buf, GNUNET_DISK_OPEN_READ);
+  /* Gcc will issue a warning here. What to do with it? */
+#if WINDOWS
+  control_pipe = GNUNET_DISK_get_handle_from_w32_handle ((HANDLE) pipe_fd);
+#else
+  control_pipe = GNUNET_DISK_get_handle_from_crt_fd ((int) pipe_fd);
+#endif
   if (NULL == control_pipe)
   {
     LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "open", env_buf);
-    putenv ("GNUNET_OS_CONTROL_PIPE=");
+    putenv (GNUNET_OS_CONTROL_PIPE "=");
     return;
   }
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Adding parent control handler pipe `%s' to the scheduler\n", env_buf);
   GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, control_pipe,
                                   &parent_control_handler, control_pipe);
-  putenv ("GNUNET_OS_CONTROL_PIPE=");
+  putenv (GNUNET_OS_CONTROL_PIPE "=");
 }
 
 
@@ -434,12 +206,6 @@ GNUNET_OS_process_kill (struct GNUNET_OS_Process *proc, int sig)
   char csig;
 
   csig = (char) sig;
-#if !WINDOWS
-  if ( (NULL == proc->control_pipe) &&
-       (NULL != proc->childpipename) )
-    proc->control_pipe = npipe_open (proc->childpipename,
-                                     GNUNET_DISK_OPEN_WRITE);
-#endif
   if (NULL != proc->control_pipe)
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG, "Sending signal %d to pid: %u via pipe\n", sig, proc->pid);
@@ -450,13 +216,13 @@ GNUNET_OS_process_kill (struct GNUNET_OS_Process *proc, int sig)
   /* pipe failed or non-existent, try other methods */
   switch (sig)
   {
-#if !WINDOWS
+#if !defined (WINDOWS)
   case SIGHUP:
 #endif
   case SIGINT:
   case SIGKILL:
   case SIGTERM:
-#if WINDOWS && !defined(__CYGWIN__)
+#if defined(WINDOWS) && !defined(__CYGWIN__)
     {
       DWORD exitcode;
       int must_kill = GNUNET_YES;
@@ -496,7 +262,7 @@ GNUNET_OS_process_kill (struct GNUNET_OS_Process *proc, int sig)
     return PLIBC_KILL (proc->pid, sig);
 #endif
   default:
-#if WINDOWS
+#if defined (WINDOWS)
     errno = EINVAL;
     return -1;
 #else
@@ -530,22 +296,13 @@ GNUNET_OS_process_destroy (struct GNUNET_OS_Process *proc)
 {
   if (NULL != proc->control_pipe)
     GNUNET_DISK_file_close (proc->control_pipe);
-// FIXME NILS
-#ifdef WINDOWS
+#if defined (WINDOWS)
   if (proc->handle != NULL)
     CloseHandle (proc->handle);
 #endif
-  if (NULL != proc->childpipename)
-  {
-#if !WINDOWS
-    cleanup_npipe (proc->childpipename);
-#endif
-    GNUNET_free (proc->childpipename);
-  }
   GNUNET_free (proc);
 }
 
-// FIXME NILS
 #if WINDOWS
 #include "gnunet_signal_lib.h"
 
@@ -851,7 +608,9 @@ start_process (int pipe_control,
   char lpid[16];
   char fds[16];
   struct GNUNET_OS_Process *gnunet_proc;
-  char *childpipename = NULL;
+  struct GNUNET_DISK_FileHandle *childpipe_read;
+  struct GNUNET_DISK_FileHandle *childpipe_write;
+  int childpipe_read_fd;
   int i;
   int j;
   int k;
@@ -866,11 +625,36 @@ start_process (int pipe_control,
 
   if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary (filename))
     return NULL; /* not executable */
-  if ( (GNUNET_YES == pipe_control) &&
-       (GNUNET_OK != npipe_setup (&childpipename)) )
+  if (GNUNET_YES == pipe_control)
   {
-    GNUNET_free (childpipename);
-    return NULL;
+    struct GNUNET_DISK_PipeHandle *childpipe;
+    int dup_childpipe_read_fd = -1;
+    childpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, GNUNET_YES, GNUNET_NO);
+    if (NULL == childpipe)
+      return NULL;
+    childpipe_read = GNUNET_DISK_pipe_detach_end (childpipe, GNUNET_DISK_PIPE_END_READ);
+    childpipe_write = GNUNET_DISK_pipe_detach_end (childpipe, GNUNET_DISK_PIPE_END_WRITE);
+    GNUNET_DISK_pipe_close (childpipe);
+    if ((NULL == childpipe_read) || (NULL == childpipe_write) ||
+        (GNUNET_OK != GNUNET_DISK_internal_file_handle_ (childpipe_read,
+        &childpipe_read_fd, sizeof (int))) ||
+        (-1 == (dup_childpipe_read_fd = dup (childpipe_read_fd))))
+    {
+      if (childpipe_read)
+        GNUNET_DISK_file_close (childpipe_read);
+      if (childpipe_write)
+        GNUNET_DISK_file_close (childpipe_write);
+      if (0 <= dup_childpipe_read_fd)
+        close (dup_childpipe_read_fd);
+      return NULL;
+    }
+    childpipe_read_fd = dup_childpipe_read_fd;
+    GNUNET_DISK_file_close (childpipe_read);
+  }
+  else
+  {
+    childpipe_read = NULL;
+    childpipe_write = NULL;
   }
   if (NULL != pipe_stdout)
   {
@@ -913,10 +697,14 @@ start_process (int pipe_control,
   if (-1 == ret)
   {
     int eno = errno;
-
     LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "fork");
-    GNUNET_free_non_null (childpipename);
     GNUNET_array_grow (lscp, ls, 0);
+    if (childpipe_read)
+      GNUNET_DISK_file_close (childpipe_read);
+    if (childpipe_write)
+      GNUNET_DISK_file_close (childpipe_write);
+    if (0 <= childpipe_read_fd)
+      close (childpipe_read_fd);
     errno = eno;
     return NULL;
   }
@@ -924,17 +712,23 @@ start_process (int pipe_control,
   {
     gnunet_proc = GNUNET_malloc (sizeof (struct GNUNET_OS_Process));
     gnunet_proc->pid = ret;
-    gnunet_proc->childpipename = childpipename;  
+    gnunet_proc->control_pipe = childpipe_write;
+    if (GNUNET_YES == pipe_control)
+    {
+      close (childpipe_read_fd);
+    }
     GNUNET_array_grow (lscp, ls, 0);
     return gnunet_proc;
   }
-  if (NULL != childpipename)
+  if (0 <= childpipe_read_fd)
   {
-    setenv (GNUNET_OS_CONTROL_PIPE, childpipename, 1);
+    char fdbuf[100];
 #ifndef DARWIN
     /* due to vfork, we must NOT free memory on DARWIN! */
-    GNUNET_free (childpipename);
+    GNUNET_DISK_file_close (childpipe_write);
 #endif
+    snprintf (fdbuf, 100, "%x", childpipe_read_fd);
+    setenv (GNUNET_OS_CONTROL_PIPE, fdbuf, 1);
   }
   if (NULL != pipe_stdin)
   {
@@ -1015,8 +809,9 @@ start_process (int pipe_control,
   LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_ERROR, "execvp", filename);
   _exit (1);
 #else
-  struct GNUNET_DISK_FileHandle *control_pipe;
-  char *childpipename = NULL;
+  struct GNUNET_DISK_FileHandle *childpipe_read;
+  struct GNUNET_DISK_FileHandle *childpipe_write;
+  HANDLE childpipe_read_handle;
   char **arg;
   char **non_const_argv;
   unsigned int cmdlen;
@@ -1027,7 +822,7 @@ start_process (int pipe_control,
   int argcount = 0;
   struct GNUNET_OS_Process *gnunet_proc;
   char path[MAX_PATH + 1];
-  char *our_env[5] = { NULL, NULL, NULL, NULL, NULL };
+  char *our_env[7] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL };
   char *env_block = NULL;
   char *pathbuf;
   DWORD pathbuf_len;
@@ -1111,7 +906,11 @@ start_process (int pipe_control,
    * Remember: arguments to _start_process() are technically in UTF-8...
    */
   if (non_const_filename[1] == ':')
+  {
     snprintf (path, sizeof (path) / sizeof (char), "%s", non_const_filename);
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+        "Using path `%s' as-is. PATH is %s\n", path, ptr);
+  }
   else if (!SearchPathA
            (pathbuf, non_const_filename, NULL, sizeof (path) / sizeof (char),
             path, NULL))
@@ -1123,6 +922,9 @@ start_process (int pipe_control,
     GNUNET_free (pathbuf);
     return NULL;
   }
+  else
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+        "Found `%s' in PATH `%s'\n", path, pathbuf);
   GNUNET_free (pathbuf);
   GNUNET_free (non_const_filename);
 
@@ -1239,19 +1041,36 @@ start_process (int pipe_control,
 
   if (GNUNET_YES == pipe_control)
   {
-    control_pipe =
-      npipe_create (&childpipename, GNUNET_DISK_OPEN_WRITE,
-                    GNUNET_DISK_PERM_USER_READ |
-                    GNUNET_DISK_PERM_USER_WRITE);
-    if (control_pipe == NULL)
+    struct GNUNET_DISK_PipeHandle *childpipe;
+    childpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, GNUNET_YES, GNUNET_NO);
+    if (NULL == childpipe)
+      return NULL;
+    childpipe_read = GNUNET_DISK_pipe_detach_end (childpipe, GNUNET_DISK_PIPE_END_READ);
+    childpipe_write = GNUNET_DISK_pipe_detach_end (childpipe, GNUNET_DISK_PIPE_END_WRITE);
+    GNUNET_DISK_pipe_close (childpipe);
+    if ((NULL == childpipe_read) || (NULL == childpipe_write) ||
+        (GNUNET_OK != GNUNET_DISK_internal_file_handle_ (childpipe_read,
+        &childpipe_read_handle, sizeof (HANDLE))))
     {
+      if (childpipe_read)
+        GNUNET_DISK_file_close (childpipe_read);
+      if (childpipe_write)
+        GNUNET_DISK_file_close (childpipe_write);
       GNUNET_free (cmd);
       GNUNET_free (path);
       return NULL;
     }
+    /* Unlike *nix variant, we don't dup the handle, so can't close
+     * filehandle right now.
+     */
+    SetHandleInformation (childpipe_read_handle, HANDLE_FLAG_INHERIT, 1);
   }
   else
-    control_pipe = NULL;
+  {
+    childpipe_read = NULL;
+    childpipe_write = NULL;
+  }
+
   if (lsocks != NULL && lsocks[0] != INVALID_SOCKET)
   {
     lsocks_pipe = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_YES, GNUNET_NO);
@@ -1261,6 +1080,11 @@ start_process (int pipe_control,
       GNUNET_free (cmd);
       GNUNET_free (path);
       GNUNET_DISK_pipe_close (lsocks_pipe);
+      if (GNUNET_YES == pipe_control)
+      {
+        GNUNET_DISK_file_close (childpipe_write);
+        GNUNET_DISK_file_close (childpipe_read);
+      }
       return NULL;
     }
     lsocks_write_fd = GNUNET_DISK_pipe_handle (lsocks_pipe,
@@ -1271,15 +1095,14 @@ start_process (int pipe_control,
                                        (lsocks_pipe, GNUNET_DISK_PIPE_END_READ),
                                        &lsocks_read, sizeof (HANDLE));
   }
+  else
+    lsocks_pipe = NULL;
 
   env_off = 0;
-  if (NULL != childpipename)
+  if (GNUNET_YES == pipe_control)
   {
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "Opened the parent end of the pipe `%s'\n",
-         childpipename);
     GNUNET_asprintf (&our_env[env_off++], "%s=", GNUNET_OS_CONTROL_PIPE);
-    GNUNET_asprintf (&our_env[env_off++], "%s", childpipename);
-    GNUNET_free (childpipename);
+    GNUNET_asprintf (&our_env[env_off++], "%p", childpipe_read_handle);
   }
   if ( (lsocks != NULL) && (lsocks[0] != INVALID_SOCKET))
   {
@@ -1299,6 +1122,13 @@ start_process (int pipe_control,
         "Failed to convert `%s' from UTF-8 to UTF-16: %d\n", path, errno);
     GNUNET_free (env_block);
     GNUNET_free (cmd);
+    if (lsocks_pipe)
+      GNUNET_DISK_pipe_close (lsocks_pipe);
+    if (GNUNET_YES == pipe_control)
+    {
+      GNUNET_DISK_file_close (childpipe_write);
+      GNUNET_DISK_file_close (childpipe_read);
+    }
     return NULL;
   }
 
@@ -1310,6 +1140,13 @@ start_process (int pipe_control,
     GNUNET_free (env_block);
     GNUNET_free (cmd);
     free (wpath);
+    if (lsocks_pipe)
+      GNUNET_DISK_pipe_close (lsocks_pipe);
+    if (GNUNET_YES == pipe_control)
+    {
+      GNUNET_DISK_file_close (childpipe_write);
+      GNUNET_DISK_file_close (childpipe_read);
+    }
     return NULL;
   }
 
@@ -1327,26 +1164,35 @@ start_process (int pipe_control,
   if (stdeh)
     SetHandleInformation (stdeh, HANDLE_FLAG_INHERIT, stdef);
 
+  if (!bresult)
+    LOG (GNUNET_ERROR_TYPE_ERROR, "CreateProcess(%s, %s) failed: %lu\n", path, cmd, error_code);
+
   GNUNET_free (env_block);
   GNUNET_free (cmd);
+  GNUNET_free (path);
   free (wpath);
   free (wcmd);
+  if (GNUNET_YES == pipe_control)
+  {
+    GNUNET_DISK_file_close (childpipe_read);
+  }
 
   if (!bresult)
   {
-    SetErrnoFromWinError (error_code);
-    LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "CreateProcess");
-    if (NULL != control_pipe)
-      GNUNET_DISK_file_close (control_pipe);
+    if (GNUNET_YES == pipe_control)
+    {
+      GNUNET_DISK_file_close (childpipe_write);
+    }
     if (NULL != lsocks)
       GNUNET_DISK_pipe_close (lsocks_pipe);
+    SetErrnoFromWinError (error_code);
     return NULL;
   }
 
   gnunet_proc = GNUNET_malloc (sizeof (struct GNUNET_OS_Process));
   gnunet_proc->pid = proc.dwProcessId;
   gnunet_proc->handle = proc.hProcess;
-  gnunet_proc->control_pipe = control_pipe;
+  gnunet_proc->control_pipe = childpipe_write;
 
   CreateThread (NULL, 64000, &child_wait_thread, (void *) gnunet_proc, 0, NULL);