utility.h: Change Buffer's interface to be more compatible with SharedBuffer's interf...

[oweals/minetest.git] / src / porting.cpp

diff --git a/src/porting.cpp b/src/porting.cpp
index ff8cb3862276f3c1158b8336839dc7e9643221b7..f3a0ab07443fd726fd0df36a4727cacf04760b02 100644 (file)
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -75,10 +75,45 @@ void signal_handler_init(void)
 }
 
 #else // _WIN32
+       #include <signal.h>
+       #include <windows.h>
+       
+       BOOL WINAPI event_handler(DWORD sig)
+       {
+               switch(sig)
+               {
+               case CTRL_C_EVENT:
+               case CTRL_CLOSE_EVENT:
+               case CTRL_LOGOFF_EVENT:
+               case CTRL_SHUTDOWN_EVENT:
+
+                       if(g_killed == false)
+                       {
+                               dstream<<DTIME<<"INFO: event_handler(): "
+                                               <<"Ctrl+C, Close Event, Logoff Event or Shutdown Event, shutting down."<<std::endl;
+                               dstream<<DTIME<<"INFO: event_handler(): "
+                                               <<"Printing debug stacks"<<std::endl;
+                               debug_stacks_print();
+
+                               g_killed = true;
+                       }
+                       else
+                       {
+                               (void)signal(SIGINT, SIG_DFL);
+                       }
 
+                       break;
+               case CTRL_BREAK_EVENT:
+                       break;
+               }
+               
+               return TRUE;
+       }
+       
 void signal_handler_init(void)
 {
-       // No-op
+       dstream<<"signal_handler_init()"<<std::endl;
+       SetConsoleCtrlHandler( (PHANDLER_ROUTINE)event_handler,TRUE);
 }
 
 #endif
@@ -87,8 +122,8 @@ void signal_handler_init(void)
        Path mangler
 */
 
-std::string path_data = "../data";
-std::string path_userdata = "../";
+std::string path_data = ".." DIR_DELIM "data";
+std::string path_userdata = "..";
 
 void pathRemoveFile(char *path, char delim)
 {
@@ -127,10 +162,10 @@ void initializePaths()
        pathRemoveFile(buf, '\\');
 
        // Use "./bin/../data"
-       path_data = std::string(buf) + "/../data";
+       path_data = std::string(buf) + DIR_DELIM ".." DIR_DELIM "data";
                
-       // Use "./bin/../"
-       path_userdata = std::string(buf) + "/../";
+       // Use "./bin/.."
+       path_userdata = std::string(buf) + DIR_DELIM "..";
 
        /*
                Linux
@@ -149,18 +184,18 @@ void initializePaths()
        path_data = std::string(buf) + "/../data";
                
        // Use "./bin/../"
-       path_userdata = std::string(buf) + "/../";
+       path_userdata = std::string(buf) + "/..";
        
        /*
                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("../");
+       path_userdata = std::string("..");
 
        #endif
 
@@ -188,13 +223,13 @@ void initializePaths()
        pathRemoveFile(buf, '\\');
        
        // Use "./bin/../data"
-       path_data = std::string(buf) + "/../data";
-       //path_data = std::string(buf) + "/../share/" + APPNAME;
+       path_data = std::string(buf) + DIR_DELIM ".." DIR_DELIM "data";
+       //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) + DIR_DELIM + PROJECT_NAME;
 
        /*
                Linux
@@ -209,15 +244,15 @@ void initializePaths()
        
        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
@@ -243,7 +278,12 @@ void initializePaths()
     }
     CFRelease(resources_url);
        
-       path_userdata = std::string(getenv("HOME")) + "/Library/Application Support/" + APPNAME;
+       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