Merge branch 'dbus-1.10'

4 files changed, 22 insertions, 14 deletions

diff --git a/dbus/dbus-auth-script.c b/dbus/dbus-auth-script.c
index 73872203..aaaed30d 100644
--- a/dbus/dbus-auth-script.c
+++ b/dbus/dbus-auth-script.c
@@ -25,6 +25,9 @@
 #ifdef DBUS_ENABLE_EMBEDDED_TESTS
 
 #include "dbus-auth-script.h"
+
+#include <stdio.h>
+
 #include "dbus-auth.h"
 #include "dbus-string.h"
 #include "dbus-hash.h"
@@ -339,7 +342,7 @@ _dbus_auth_script_run (const DBusString *filename)
                                                "UNIX_ONLY"))
         {
           /* skip this file */
-          _dbus_warn ("skipping unix only auth script\n");
+          fprintf (stderr, "skipping unix only auth script\n");
           retval = TRUE;
           goto out;
         }
@@ -355,7 +358,7 @@ _dbus_auth_script_run (const DBusString *filename)
                                                "WIN_ONLY"))
         {
           /* skip this file */
-          _dbus_warn ("skipping windows only auth script\n");
+          fprintf (stderr, "skipping windows only auth script\n");
           retval = TRUE;
           goto out;
         }
diff --git a/dbus/dbus-spawn-win.c b/dbus/dbus-spawn-win.c
index 7f68f14e..c58bf3cd 100644
--- a/dbus/dbus-spawn-win.c
+++ b/dbus/dbus-spawn-win.c
@@ -582,6 +582,7 @@ spawn_program (char* name, char** argv, char** envp)
 static DWORD __stdcall
 babysitter (void *parameter)
 {
+  int ret = 0;
   DBusBabysitter *sitter = (DBusBabysitter *) parameter;
 
   PING();
@@ -612,17 +613,19 @@ babysitter (void *parameter)
 
   if (sitter->child_handle != NULL)
     {
-      int ret;
       DWORD status;
 
       PING();
+      // wait until process finished
       WaitForSingleObject (sitter->child_handle, INFINITE);
 
       PING();
       ret = GetExitCodeProcess (sitter->child_handle, &status);
-
-      sitter->child_status = status;
-      sitter->have_child_status = TRUE;
+      if (ret)
+        {
+          sitter->child_status = status;
+          sitter->have_child_status = TRUE;
+        }
 
       CloseHandle (sitter->child_handle);
       sitter->child_handle = NULL;
@@ -637,7 +640,7 @@ babysitter (void *parameter)
 
   _dbus_babysitter_unref (sitter);
 
-  return 0;
+  return ret ? 0 : 1;
 }
 
 dbus_bool_t
diff --git a/dbus/dbus-sysdeps-util-win.c b/dbus/dbus-sysdeps-util-win.c
index d38f02b0..1d5edc4f 100644
--- a/dbus/dbus-sysdeps-util-win.c
+++ b/dbus/dbus-sysdeps-util-win.c
@@ -335,7 +335,8 @@ _dbus_system_logv (DBusSystemLogSeverity severity, const char *msg, va_list args
 {
   char *s = "";
   char buf[1024];
-  
+  char format[1024];
+
   switch(severity) 
    {
      case DBUS_SYSTEM_LOG_INFO: s = "info"; break;
@@ -344,8 +345,8 @@ _dbus_system_logv (DBusSystemLogSeverity severity, const char *msg, va_list args
      case DBUS_SYSTEM_LOG_FATAL: s = "fatal"; break;
    }
    
-  sprintf(buf,"%s%s",s,msg);
-  vsprintf(buf,buf,args);
+  snprintf(format, sizeof(format), "%s%s", s ,msg);
+  vsnprintf(buf, sizeof(buf), format, args);
   OutputDebugStringA(buf);
   
   if (severity == DBUS_SYSTEM_LOG_FATAL)
diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index 7ddb7fdc..c7587dbb 100644
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -288,7 +288,7 @@ _dbus_get_peer_pid_from_tcp_handle (int handle)
       return 0;
     }
 
-  _dbus_verbose ("trying to get peers pid");
+  _dbus_verbose ("trying to get peer's pid\n");
 
   result = get_pid_from_extended_tcp_table (peer_port);
   if (result > 0)
@@ -2932,6 +2932,7 @@ _dbus_daemon_publish_session_bus_address (const char* address, const char *scope
   char *shared_addr = NULL;
   DBusString shm_name;
   DBusString mutex_name;
+  dbus_uint64_t len;
 
   _dbus_assert (address);
 
@@ -2966,7 +2967,7 @@ _dbus_daemon_publish_session_bus_address (const char* address, const char *scope
     }
 
   // create shm
-  dbus_uint64_t len = strlen( address ) + 1;
+  len = strlen (address) + 1;
 
   hDBusSharedMem = CreateFileMappingA( INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE,
                                        len >> 32, len & 0xffffffffu,
@@ -3114,8 +3115,8 @@ _dbus_get_autolaunch_address (const char *scope, DBusString *address,
 
   if (_dbus_daemon_already_runs(address,&shm_name,scope))
     {
-        _dbus_verbose( "found running dbus daemon at %s\n",
-                       _dbus_string_get_const_data (&shm_name) );
+        _dbus_verbose( "found running dbus daemon for scope '%s' at %s\n",
+                       scope ? scope : "", _dbus_string_get_const_data (&shm_name) );
         retval = TRUE;
         goto out;
     }