Merge remote-tracking branch 'speedprog/fixedNotFindingData'

[minetest.git] / src / porting.cpp

diff --git a/src/porting.cpp b/src/porting.cpp
index 592636336f14ef215e5636dc5a5b8bf54bb28ea4..39b2c570587d2f083c2c9752935931321b43640d 100644 (file)
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -25,10 +25,68 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "porting.h"
 #include "config.h"
+#include "debug.h"
+#include "filesys.h"
+
+#ifdef __APPLE__
+       #include "CoreFoundation/CoreFoundation.h"
+#endif
 
 namespace porting
 {
 
+/*
+       Signal handler (grabs Ctrl-C on POSIX systems)
+*/
+
+bool g_killed = false;
+
+bool * signal_handler_killstatus(void)
+{
+       return &g_killed;
+}
+
+#if !defined(_WIN32) // POSIX
+       #include <signal.h>
+
+void sigint_handler(int sig)
+{
+       if(g_killed == false)
+       {
+               dstream<<DTIME<<"INFO: sigint_handler(): "
+                               <<"Ctrl-C pressed, shutting down."<<std::endl;
+               
+               dstream<<DTIME<<"INFO: sigint_handler(): "
+                               <<"Printing debug stacks"<<std::endl;
+               debug_stacks_print();
+
+               g_killed = true;
+       }
+       else
+       {
+               (void)signal(SIGINT, SIG_DFL);
+       }
+}
+
+void signal_handler_init(void)
+{
+       dstream<<"signal_handler_init()"<<std::endl;
+       (void)signal(SIGINT, sigint_handler);
+}
+
+#else // _WIN32
+
+void signal_handler_init(void)
+{
+       // No-op
+}
+
+#endif
+
+/*
+       Path mangler
+*/
+
 std::string path_data = "../data";
 std::string path_userdata = "../";
 
@@ -83,7 +141,7 @@ void initializePaths()
        char buf[BUFSIZ];
        memset(buf, 0, BUFSIZ);
        // Get path to executable
-       readlink("/proc/self/exe", buf, BUFSIZ-1);
+       assert(readlink("/proc/self/exe", buf, BUFSIZ-1) != -1);
        
        pathRemoveFile(buf, '/');
 
@@ -96,10 +154,10 @@ void initializePaths()
        /*
                OS X
        */
-       #elif defined(__APPLE__)
+       #elif defined(__APPLE__) || defined(__FreeBSD__)
        
        //TODO: Get path of executable. This assumes working directory is bin/
-       dstream<<"WARNING: Relative path not properly supported on OS X"
+       dstream<<"WARNING: Relative path not properly supported on OS X and FreeBSD"
                        <<std::endl;
        path_data = std::string("../data");
        path_userdata = std::string("../");
@@ -131,12 +189,12 @@ void initializePaths()
        
        // Use "./bin/../data"
        path_data = std::string(buf) + "/../data";
-       //path_data = std::string(buf) + "/../share/" + APPNAME;
+       //path_data = std::string(buf) + "/../share/" + PROJECT_NAME;
                
-       // Use "C:\Documents and Settings\user\Application Data\<APPNAME>"
+       // Use "C:\Documents and Settings\user\Application Data\<PROJECT_NAME>"
        len = GetEnvironmentVariable("APPDATA", buf, buflen);
        assert(len < buflen);
-       path_userdata = std::string(buf) + "/" + APPNAME;
+       path_userdata = std::string(buf) + "/" + PROJECT_NAME;
 
        /*
                Linux
@@ -147,14 +205,19 @@ void initializePaths()
        char buf[BUFSIZ];
        memset(buf, 0, BUFSIZ);
        // Get path to executable
-       readlink("/proc/self/exe", buf, BUFSIZ-1);
+       assert(readlink("/proc/self/exe", buf, BUFSIZ-1) != -1);
        
        pathRemoveFile(buf, '/');
 
-       path_data = std::string(buf) + "/../share/" + APPNAME;
-       //path_data = std::string(INSTALL_PREFIX) + "/share/" + APPNAME;
+       path_data = std::string(buf) + "/../share/" + PROJECT_NAME;
+       //path_data = std::string(INSTALL_PREFIX) + "/share/" + PROJECT_NAME;
+       if (!fs::PathExists(path_data)) {
+               dstream<<"WARNING: data path " << path_data << " not found!";
+               path_data = std::string(buf) + "/../data";
+               dstream<<" Trying " << path_data << std::endl;
+       }
        
-       path_userdata = std::string(getenv("HOME")) + "/." + APPNAME;
+       path_userdata = std::string(getenv("HOME")) + "/." + PROJECT_NAME;
 
        /*
                OS X
@@ -162,9 +225,31 @@ void initializePaths()
        #elif defined(__APPLE__)
                #include <unistd.h>
 
-       path_userdata = std::string(getenv("HOME")) + "/Library/Application Support/" + APPNAME;
-       path_data = std::string("minetest-mac.app/Contents/Resources/data/");
+    // Code based on
+    // http://stackoverflow.com/questions/516200/relative-paths-not-working-in-xcode-c
+    CFBundleRef main_bundle = CFBundleGetMainBundle();
+    CFURLRef resources_url = CFBundleCopyResourcesDirectoryURL(main_bundle);
+    char path[PATH_MAX];
+    if(CFURLGetFileSystemRepresentation(resources_url, TRUE, (UInt8 *)path, PATH_MAX))
+       {
+               dstream<<"Bundle resource path: "<<path<<std::endl;
+               //chdir(path);
+               path_data = std::string(path) + "/data";
+       }
+       else
+    {
+        // error!
+               dstream<<"WARNING: Could not determine bundle resource path"<<std::endl;
+    }
+    CFRelease(resources_url);
+       
+       path_userdata = std::string(getenv("HOME")) + "/Library/Application Support/" + PROJECT_NAME;
+
+       #elif defined(__FreeBSD__)
 
+       path_data = std::string(INSTALL_PREFIX) + "/share/" + PROJECT_NAME;
+       path_userdata = std::string(getenv("HOME")) + "/." + PROJECT_NAME;
+    
        #endif
 
 #endif // RUN_IN_PLACE