From: Tor Lillqvist <tml@iki.fi>
Date: Thu, 22 Oct 2009 01:14:04 +0000 (+0300)
Subject: Drop terminating slash in _dbus_get_tmpdir
X-Git-Tag: dbus-1.3.1~151
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6ac1cf2ec8bb23a8052a4e0ad3f5abec61f47ebd;p=platform%2Fupstream%2Fdbus.git

Drop terminating slash in _dbus_get_tmpdir

The callers will append strings starting with a slash anyway.
---

diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index 7939008..da8a8ef 100644
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -2465,8 +2465,21 @@ _dbus_get_tmpdir(void)
 
   if (tmpdir == NULL)
     {
+      char *last_slash;
+
       if (!GetTempPath (sizeof (buf), buf))
-        strcpy (buf, "\\");
+        {
+          _dbus_warn ("GetTempPath failed\n");
+          _dbus_abort ();
+        }
+
+      /* Drop terminating backslash or slash */
+      last_slash = _mbsrchr (buf, '\\');
+      if (last_slash > buf && last_slash[1] == '\0')
+        last_slash[0] = '\0';
+      last_slash = _mbsrchr (buf, '/');
+      if (last_slash > buf && last_slash[1] == '\0')
+        last_slash[0] = '\0';
 
       tmpdir = buf;
     }