From 9db949eec327df4173fde3de934a87bedb0db13c Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Mon, 2 Jun 2008 21:14:31 +0000
Subject: svn merge -r88066:88786
 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge

dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
---
 indra/llcommon/llfile.cpp | 48 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

(limited to 'indra/llcommon/llfile.cpp')

diff --git a/indra/llcommon/llfile.cpp b/indra/llcommon/llfile.cpp
index 4e868eb5a1..6b8f8e68c5 100644
--- a/indra/llcommon/llfile.cpp
+++ b/indra/llcommon/llfile.cpp
@@ -32,6 +32,10 @@
  * $/LicenseInfo$
  */
 
+#if LL_WINDOWS
+#include <windows.h>
+#endif
+
 #include "linden_common.h"
 #include "llfile.h"
 #include "llstring.h"
@@ -128,6 +132,50 @@ int	LLFile::stat(const char* filename, llstat* filestatus)
 #endif
 }
 
+bool LLFile::isdir(const char *filename)
+{
+	llstat st;
+	
+	return stat(filename, &st) == 0 && S_ISDIR(st.st_mode);
+}
+
+bool LLFile::isfile(const char *filename)
+{
+	llstat st;
+	
+	return stat(filename, &st) == 0 && S_ISREG(st.st_mode);
+}
+
+const char *LLFile::tmpdir()
+{
+	static std::string utf8path;
+
+	if (utf8path.empty())
+	{
+		char sep;
+#if LL_WINDOWS
+		sep = '\\';
+
+		DWORD len = GetTempPathW(0, L"");
+		llutf16string utf16path;
+		utf16path.resize(len + 1);
+		len = GetTempPathW(static_cast<DWORD>(utf16path.size()), &utf16path[0]);
+		utf8path = utf16str_to_utf8str(utf16path);
+#else
+		sep = '/';
+
+		char *env = getenv("TMPDIR");
+
+		utf8path = env ? env : "/tmp/";
+#endif
+		if (utf8path[utf8path.size() - 1] != sep)
+		{
+			utf8path += sep;
+		}
+	}
+	return utf8path.c_str();
+}
+
 
 /***************** Modified file stream created to overcome the incorrect behaviour of posix fopen in windows *******************/
 
-- 
cgit v1.2.3