* dbus/dbus-sysdeps.c (_dbus_setenv): win32 requires 'varname=' to unset a environment variable.

2 files changed, 14 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 786f9c35..b600e16f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 2007-05-19 Ralf.Habacker  <ralf.habacker@freenet.de>
 
-	* bus/policy (bus_policy_create_client_policy): 
+	* dbus/dbus-sysdeps.c (_dbus_setenv): win32 requires 'varname=' 
+	to unset a environment variable. 
+
+2007-05-19 Ralf.Habacker  <ralf.habacker@freenet.de>
+
+	* bus/policy.c (bus_policy_create_client_policy): 
 	win32 temporary fix until the userdb stuff is ported completly.
 
 2007-05-19  Ralf.Habacker  <ralf.habacker@freenet.de>
diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c
index 6074063c..8ccdb3ff 100644
--- a/dbus/dbus-sysdeps.c
+++ b/dbus/dbus-sysdeps.c
@@ -120,11 +120,14 @@ _dbus_setenv (const char *varname,
        * will get upset about.
        */
       
-      putenv_value = malloc (len + 1);
+      putenv_value = malloc (len + 2);
       if (putenv_value == NULL)
         return FALSE;
 
       strcpy (putenv_value, varname);
+#if defined(DBUS_WIN)
+      strcat (putenv_value, "=");
+#endif
       
       return (putenv (putenv_value) == 0);
 #endif
@@ -594,6 +597,10 @@ static double
 ascii_strtod (const char *nptr,
 	      char      **endptr)
 {
+  /* FIXME: The Win32 C library's strtod() doesn't handle hex.
+   * Presumably many Unixes don't either.
+   */
+
   char *fail_pos;
   double val;
   struct lconv *locale_data;