fix to the previous commit

[dragonfireclient.git] / src / porting.cpp

diff --git a/src/porting.cpp b/src/porting.cpp
index bff865c53f3bbcdcfde8389ef17f824a295dee6f..e8b1352558bb7737399e79513177182f7361cde2 100644 (file)
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -24,10 +24,64 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "porting.h"
+#include "config.h"
+#include "debug.h"
 
 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 = "../";
 
@@ -80,8 +134,9 @@ void initializePaths()
                #include <unistd.h>
        
        char buf[BUFSIZ];
+       memset(buf, 0, BUFSIZ);
        // Get path to executable
-       readlink("/proc/self/exe", buf, BUFSIZ);
+       readlink("/proc/self/exe", buf, BUFSIZ-1);
        
        pathRemoveFile(buf, '/');
 
@@ -103,7 +158,9 @@ void initializePaths()
        path_userdata = std::string("../");
 
        #endif
-#else
+
+#else // RUN_IN_PLACE
+
        /*
                Use platform-specific paths otherwise
        */
@@ -127,6 +184,7 @@ void initializePaths()
        
        // Use "./bin/../data"
        path_data = std::string(buf) + "/../data";
+       //path_data = std::string(buf) + "/../share/" + APPNAME;
                
        // Use "C:\Documents and Settings\user\Application Data\<APPNAME>"
        len = GetEnvironmentVariable("APPDATA", buf, buflen);
@@ -137,20 +195,32 @@ void initializePaths()
                Linux
        */
        #elif defined(linux)
+               #include <unistd.h>
        
-       path_userdata = std::string("~/.") + APPNAME;
-       path_data = std::string("/usr/share/") + APPNAME;
+       char buf[BUFSIZ];
+       memset(buf, 0, BUFSIZ);
+       // Get path to executable
+       readlink("/proc/self/exe", buf, BUFSIZ-1);
+       
+       pathRemoveFile(buf, '/');
+
+       path_data = std::string(buf) + "/../share/" + APPNAME;
+       //path_data = std::string(INSTALL_PREFIX) + "/share/" + APPNAME;
        
+       path_userdata = std::string(getenv("HOME")) + "/." + APPNAME;
+
        /*
                OS X
        */
        #elif defined(__APPLE__)
+               #include <unistd.h>
 
-       path_userdata = std::string("~/Library/Application Support/") + APPNAME;
+       path_userdata = std::string(getenv("HOME")) + "/Library/Application Support/" + APPNAME;
        path_data = std::string("minetest-mac.app/Contents/Resources/data/");
 
        #endif
-#endif
+
+#endif // RUN_IN_PLACE
 
        dstream<<"path_data = "<<path_data<<std::endl;
        dstream<<"path_userdata = "<<path_userdata<<std::endl;