#include "porting.h"
#include "config.h"
#include "debug.h"
+#include "filesys.h"
+#include "log.h"
+
+#ifdef __APPLE__
+ #include "CoreFoundation/CoreFoundation.h"
+#endif
namespace porting
{
dstream<<DTIME<<"INFO: sigint_handler(): "
<<"Ctrl-C pressed, shutting down."<<std::endl;
- dstream<<DTIME<<"INFO: sigint_handler(): "
+ // Comment out for less clutter when testing scripts
+ /*dstream<<DTIME<<"INFO: sigint_handler(): "
<<"Printing debug stacks"<<std::endl;
- debug_stacks_print();
+ debug_stacks_print();*/
g_killed = true;
}
void signal_handler_init(void)
{
- dstream<<"signal_handler_init()"<<std::endl;
(void)signal(SIGINT, sigint_handler);
}
#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;
+ // Comment out for less clutter when testing scripts
+ /*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
+ SetConsoleCtrlHandler( (PHANDLER_ROUTINE)event_handler,TRUE);
}
#endif
Path mangler
*/
-std::string path_data = "../data";
-std::string path_userdata = "../";
+std::string path_share = ".." DIR_DELIM "share";
+std::string path_user = ".." DIR_DELIM "user";
+
+std::string getDataPath(const char *subpath)
+{
+ return path_share + DIR_DELIM + subpath;
+}
void pathRemoveFile(char *path, char delim)
{
Use relative paths if RUN_IN_PLACE
*/
- dstream<<"Using relative paths (RUN_IN_PLACE)"<<std::endl;
+ infostream<<"Using relative paths (RUN_IN_PLACE)"<<std::endl;
/*
Windows
char buf[buflen];
DWORD len;
- // Find path of executable and set path_data relative to it
+ // Find path of executable and set path_share relative to it
len = GetModuleFileName(GetModuleHandle(NULL), buf, buflen);
assert(len < buflen);
pathRemoveFile(buf, '\\');
- // Use "./bin/../data"
- path_data = std::string(buf) + "/../data";
-
- // Use "./bin/../"
- path_userdata = std::string(buf) + "/../";
+ path_share = std::string(buf) + "\\..\\share";
+ path_user = std::string(buf) + "\\..\\user";
/*
Linux
pathRemoveFile(buf, '/');
- // Use "./bin/../data"
- path_data = std::string(buf) + "/../data";
-
- // Use "./bin/../"
- path_userdata = std::string(buf) + "/../";
+ path_share = std::string(buf) + "/../share";
+ path_user = std::string(buf) + "/../user";
/*
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_share = std::string("../share");
+ path_user = std::string("../user");
#endif
Use platform-specific paths otherwise
*/
- dstream<<"Using system-wide paths (NOT RUN_IN_PLACE)"<<std::endl;
+ infostream<<"Using system-wide paths (NOT RUN_IN_PLACE)"<<std::endl;
/*
Windows
char buf[buflen];
DWORD len;
- // Find path of executable and set path_data relative to it
+ // Find path of executable and set path_share relative to it
len = GetModuleFileName(GetModuleHandle(NULL), buf, buflen);
assert(len < buflen);
pathRemoveFile(buf, '\\');
- // Use "./bin/../data"
- path_data = std::string(buf) + "/../data";
- //path_data = std::string(buf) + "/../share/" + APPNAME;
+ // Use ".\bin\..\share"
+ path_share = std::string(buf) + "\\..\\share";
- // 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_user = std::string(buf) + DIR_DELIM + PROJECT_NAME;
/*
Linux
pathRemoveFile(buf, '/');
- path_data = std::string(buf) + "/../share/" + APPNAME;
- //path_data = std::string(INSTALL_PREFIX) + "/share/" + APPNAME;
+ path_share = std::string(buf) + "/../share/" + PROJECT_NAME;
+ //path_share = std::string(INSTALL_PREFIX) + "/share/" + PROJECT_NAME;
+ if (!fs::PathExists(path_share)) {
+ dstream<<"WARNING: system-wide share not found at \""<<path_share<<"\"";
+ path_share = std::string(buf) + "/../share";
+ dstream<<"WARNING: Using \""<<path_share<<"\" instead."<<std::endl;
+ }
- path_userdata = std::string(getenv("HOME")) + "/." + APPNAME;
+ path_user = std::string(getenv("HOME")) + "/." + PROJECT_NAME;
/*
OS X
#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_share = std::string(path) + "/share";
+ }
+ else
+ {
+ // error!
+ dstream<<"WARNING: Could not determine bundle resource path"<<std::endl;
+ }
+ CFRelease(resources_url);
+
+ path_user = std::string(getenv("HOME")) + "/Library/Application Support/" + PROJECT_NAME;
+
+ #elif defined(__FreeBSD__)
+ path_share = std::string(INSTALL_PREFIX) + "/share/" + PROJECT_NAME;
+ path_user = std::string(getenv("HOME")) + "/." + PROJECT_NAME;
+
#endif
#endif // RUN_IN_PLACE
-
- dstream<<"path_data = "<<path_data<<std::endl;
- dstream<<"path_userdata = "<<path_userdata<<std::endl;
}
} //namespace porting
projects / oweals / minetest.git / blobdiff