From 9ea9cd1bddef265fc2ff765449ababb14e449876 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 22 Apr 2009 13:27:44 +0200 Subject: [PATCH] dbus/dbus-sysdeps-win.c: use GetTempPath, not getenv, in _dbus_get_tmpdir (cherry picked from commit c2366c5410149e896cb56c3d17bb995308e18292) --- dbus/dbus-sysdeps-win.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c index 9a29a39f..2aec5541 100644 --- a/dbus/dbus-sysdeps-win.c +++ b/dbus/dbus-sysdeps-win.c @@ -2388,17 +2388,14 @@ const char* _dbus_get_tmpdir(void) { static const char* tmpdir = NULL; + static char buf[1000]; if (tmpdir == NULL) { - if (tmpdir == NULL) - tmpdir = getenv("TMP"); - if (tmpdir == NULL) - tmpdir = getenv("TEMP"); - if (tmpdir == NULL) - tmpdir = getenv("TMPDIR"); - if (tmpdir == NULL) - tmpdir = "C:\\Temp"; + if (!GetTempPath (sizeof (buf), buf)) + strcpy (buf, "\\"); + + tmpdir = buf; } _dbus_assert(tmpdir != NULL);