Reverting file paths changes; they make the problem a lot worse (segfaults)

[lugaru.git] / Source / MacCompatibility.cpp

diff --git a/Source/MacCompatibility.cpp b/Source/MacCompatibility.cpp
index e1226b608dc32edd854176e8d7b2bd56888b3257..e82b1b758e276f99e4b18e8c2c56da1623ee5292 100644 (file)
--- a/Source/MacCompatibility.cpp
+++ b/Source/MacCompatibility.cpp
@@ -1,3 +1,24 @@
+/*
+Copyright (C) 2003, 2010 - Wolfire Games
+
+This file is part of Lugaru.
+
+Lugaru is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #if !PLATFORM_MACOSX
 
 /**> HEADER FILES <**/
@@ -16,6 +37,7 @@
 #if PLATFORM_UNIX
 #include <unistd.h>
 #include <sys/time.h>
+#include <sys/stat.h>
 #include <assert.h>
 typedef long long __int64;
 typedef __int64 LARGE_INTEGER;
@@ -157,7 +179,7 @@ static int locateOneElement(char *buf)
     struct dirent *dent;
     while ((dent = readdir(dirp)) != NULL)
     {
-        if (stricmp(dent->d_name, ptr) == 0)
+        if (strcasecmp(dent->d_name, ptr) == 0)
         {
             strcpy(ptr, dent->d_name); /* found a match. Overwrite with this case. */
             closedir(dirp);
@@ -191,7 +213,11 @@ static inline const char *getPrefPath(void)
         if (homedir == NULL)
             homedir = ".";  // oh well.
 
+#if (defined(__APPLE__) && defined(__MACH__))
+        const char *PREFPATHNAME = "Library/Application Support/Lugaru";
+#else
         const char *PREFPATHNAME = ".lugaru";
+#endif
         size_t len = strlen(homedir) + strlen(PREFPATHNAME) + 2;
         prefpath = new char[len];
         snprintf(prefpath, len, "%s/%s", homedir, PREFPATHNAME);