From bb43f234c5d418e064c89b928b81b53987f14e92 Mon Sep 17 00:00:00 2001 From: Alexander Gottwald Date: Mon, 22 Nov 2004 15:00:04 +0000 Subject: [PATCH] Use GetTempPath for finding a place where to store temporary files on Windows --- xkb/ddxLoad.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c index f0b942322..e5ef0bfeb 100644 --- a/xkb/ddxLoad.c +++ b/xkb/ddxLoad.c @@ -77,11 +77,22 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. static const char* Win32TempDir() { - if (getenv("TEMP") != NULL) + static char buffer[MAX_PATH]; + int len; + if (GetTempPath(sizeof(buffer), buffer)) + { + buffer[sizeof(buffer)-1] = 0; + len = strlen(buffer); + if (len > 0) + if (buffer[len-1] == '\\') + buffer[len-1] = 0; + return buffer; + } + if (getenv("TEMP") != NULL) return getenv("TEMP"); - else if (getenv("TMP") != NULL) + else if (getenv("TMP") != NULL) return getenv("TEMP"); - else + else return "/tmp"; }