Revert all changes since a36d4918a6f646e085

[platform/upstream/dbus.git] / dbus / dbus-spawn-win.c

diff --git a/dbus/dbus-spawn-win.c b/dbus/dbus-spawn-win.c
index 6b9fdf5..8ac837e 100644 (file)
--- a/dbus/dbus-spawn-win.c
+++ b/dbus/dbus-spawn-win.c
@@ -9,9 +9,6 @@
 #endif
 
 #include <stdio.h>
-#ifdef DBUS_WINCE
-#include <process.h>
-#endif
 
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /* dbus-spawn-win32.c Wrapper around g_spawn
@@ -53,7 +50,9 @@
 
 #include <stdlib.h>
 
+#ifndef DBUS_WINCE
 #include <process.h>
+#endif
 
 /**
  * Babysitter implementation details
@@ -315,9 +314,11 @@ _dbus_babysitter_set_child_exit_error (DBusBabysitter *sitter,
   PING();
   if (sitter->have_spawn_errno)
     {
+      char *emsg = _dbus_win_error_string (sitter->spawn_errno);
       dbus_set_error (error, DBUS_ERROR_SPAWN_EXEC_FAILED,
                       "Failed to execute program %s: %s",
-                      sitter->executable, _dbus_strerror (sitter->spawn_errno));
+                      sitter->executable, emsg);
+      _dbus_win_free_error_string (emsg);
     }
   else if (sitter->have_child_status)
     {
@@ -467,7 +468,93 @@ protect_argv (char  **argv,
   return argc;
 }
 
-static unsigned __stdcall
+
+/* From GPGME, relicensed by g10 Code GmbH.  */
+static char *
+compose_string (char **strings, char separator)
+{
+  int i;
+  int n = 0;
+  char *buf;
+  char *p;
+  const char *ptr;
+  
+  if (!strings || !strings[0])
+    return 0;
+  for (i = 0; strings[i]; i++)
+    n += strlen (strings[i]) + 1;
+  n++;
+
+  buf = p = malloc (n);
+  if (!buf)
+    return NULL;
+  for (i = 0; strings[i]; i++)
+    {
+      strcpy (p, strings[i]);
+      p += strlen (strings[i]);
+      *(p++) = separator;
+    }
+  p--;
+  *(p++) = '\0';
+  *p = '\0';
+
+  return buf;
+}
+
+static char *
+build_commandline (char **argv)
+{
+  return compose_string (argv, ' ');
+}
+
+static char *
+build_env_string (char** envp)
+{
+  return compose_string (envp, '\0');
+}
+
+static HANDLE
+spawn_program (char* name, char** argv, char** envp)
+{
+  PROCESS_INFORMATION pi = { NULL, 0, 0, 0 };
+  STARTUPINFOA si;
+  char *arg_string, *env_string;
+  BOOL result;
+
+#ifdef DBUS_WINCE
+  if (argv && argv[0])
+    arg_string = build_commandline (argv + 1);
+  else
+    arg_string = NULL;
+#else
+  arg_string = build_commandline (argv);
+#endif
+  if (!arg_string)
+    return INVALID_HANDLE_VALUE;
+
+  env_string = build_env_string(envp);
+
+  memset (&si, 0, sizeof (si));
+  si.cb = sizeof (si);
+#ifdef DBUS_WINCE
+  result = CreateProcessA (name, arg_string, NULL, NULL, FALSE, 0,
+#else
+  result = CreateProcessA (NULL, arg_string, NULL, NULL, FALSE, 0,
+#endif
+                          (LPVOID)env_string, NULL, &si, &pi);
+  free (arg_string);
+  if (env_string)
+    free (env_string);
+
+  if (!result)
+    return INVALID_HANDLE_VALUE;
+
+  CloseHandle (pi.hThread);
+  return pi.hProcess;
+}
+
+
+static DWORD __stdcall
 babysitter (void *parameter)
 {
   DBusBabysitter *sitter = (DBusBabysitter *) parameter;
@@ -484,22 +571,17 @@ babysitter (void *parameter)
   _dbus_verbose ("babysitter: spawning %s\n", sitter->executable);
 
   PING();
-  if (sitter->envp != NULL)
-    sitter->child_handle = (HANDLE) spawnve (P_NOWAIT, sitter->executable,
-                           (const char * const *) sitter->argv,
-                           (const char * const *) sitter->envp);
-  else
-    sitter->child_handle = (HANDLE) spawnv (P_NOWAIT, sitter->executable,
-                                            (const char * const *) sitter->argv);
+  sitter->child_handle = spawn_program (sitter->executable,
+                                       sitter->argv, sitter->envp);
 
   PING();
   if (sitter->child_handle == (HANDLE) -1)
     {
       sitter->child_handle = NULL;
       sitter->have_spawn_errno = TRUE;
-      sitter->spawn_errno = errno;
+      sitter->spawn_errno = GetLastError();
     }
-
+  
   PING();
   SetEvent (sitter->start_sync_event);
 
@@ -543,8 +625,8 @@ _dbus_spawn_async_with_babysitter (DBusBabysitter           **sitter_p,
 {
   DBusBabysitter *sitter;
   HANDLE sitter_thread;
-  int sitter_thread_id;
-
+  DWORD sitter_thread_id;
+  
   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
 
   *sitter_p = NULL;
@@ -599,7 +681,7 @@ _dbus_spawn_async_with_babysitter (DBusBabysitter           **sitter_p,
   sitter->envp = envp;
 
   PING();
-  sitter_thread = (HANDLE) _beginthreadex (NULL, 0, babysitter,
+  sitter_thread = (HANDLE) CreateThread (NULL, 0, babysitter,
                   sitter, 0, &sitter_thread_id);
 
   if (sitter_thread == 0)