X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fporting.cpp;h=de15de9ce2309b200a59cb8e80c3e364a093cae1;hb=8e5b33d3590719ff2cf1138f563e928d05754d7a;hp=b327985d4c800ee2e561245a4b69b082b5c2a25e;hpb=037b2591971d752e67fa7d47095b996b3f56da5a;p=oweals%2Fminetest.git

diff --git a/src/porting.cpp b/src/porting.cpp
index b327985d4..de15de9ce 100644
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -23,12 +23,24 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	See comments in porting.h
 */
 
+#if defined(linux)
+	#include <unistd.h>
+#elif defined(__APPLE__)
+	#include <unistd.h>
+	#include <mach-o/dyld.h>
+#elif defined(__FreeBSD__)
+	#include <unistd.h>
+	#include <sys/types.h>
+	#include <sys/sysctl.h>
+#endif
+
 #include "porting.h"
 #include "config.h"
 #include "debug.h"
 #include "filesys.h"
 #include "log.h"
-#include "utility_string.h"
+#include "util/string.h"
+#include <list>
 
 #ifdef __APPLE__
 	#include "CoreFoundation/CoreFoundation.h"
@@ -57,7 +69,7 @@ void sigint_handler(int sig)
 	{
 		dstream<<DTIME<<"INFO: sigint_handler(): "
 				<<"Ctrl-C pressed, shutting down."<<std::endl;
-		
+
 		// Comment out for less clutter when testing scripts
 		/*dstream<<DTIME<<"INFO: sigint_handler(): "
 				<<"Printing debug stacks"<<std::endl;
@@ -78,8 +90,7 @@ void signal_handler_init(void)
 
 #else // _WIN32
 	#include <signal.h>
-	#include <windows.h>
-	
+
 	BOOL WINAPI event_handler(DWORD sig)
 	{
 		switch(sig)
@@ -109,10 +120,10 @@ void signal_handler_init(void)
 		case CTRL_BREAK_EVENT:
 			break;
 		}
-		
+
 		return TRUE;
 	}
-	
+
 void signal_handler_init(void)
 {
 	SetConsoleCtrlHandler( (PHANDLER_ROUTINE)event_handler,TRUE);
@@ -154,7 +165,7 @@ bool detectMSVCBuildDir(char *c_path)
 
 void initializePaths()
 {
-#ifdef RUN_IN_PLACE
+#if RUN_IN_PLACE
 	/*
 		Use relative paths if RUN_IN_PLACE
 	*/
@@ -165,17 +176,16 @@ void initializePaths()
 		Windows
 	*/
 	#if defined(_WIN32)
-		#include <windows.h>
 
 	const DWORD buflen = 1000;
 	char buf[buflen];
 	DWORD len;
-	
+
 	// Find path of executable and set path_share relative to it
 	len = GetModuleFileName(GetModuleHandle(NULL), buf, buflen);
 	assert(len < buflen);
 	pathRemoveFile(buf, '\\');
-	
+
 	if(detectMSVCBuildDir(buf)){
 		infostream<<"MSVC build directory detected"<<std::endl;
 		path_share = std::string(buf) + "\\..\\..";
@@ -190,25 +200,57 @@ void initializePaths()
 		Linux
 	*/
 	#elif defined(linux)
-		#include <unistd.h>
-	
+
 	char buf[BUFSIZ];
 	memset(buf, 0, BUFSIZ);
 	// Get path to executable
 	assert(readlink("/proc/self/exe", buf, BUFSIZ-1) != -1);
-	
+
 	pathRemoveFile(buf, '/');
 
 	path_share = std::string(buf) + "/..";
 	path_user = std::string(buf) + "/..";
-	
+
 	/*
 		OS X
 	*/
-	#elif defined(__APPLE__) || defined(__FreeBSD__)
-	
+	#elif defined(__APPLE__)
+
+	//https://developer.apple.com/library/mac/#documentation/Darwin/Reference/ManPages/man3/dyld.3.html
+	//TODO: Test this code
+	char buf[BUFSIZ];
+	uint32_t len = sizeof(buf);
+	assert(_NSGetExecutablePath(buf, &len) != 0);
+
+	pathRemoveFile(buf, '/');
+
+	path_share = std::string(buf) + "/..";
+	path_user = std::string(buf) + "/..";
+
+	/*
+		FreeBSD
+	*/
+	#elif defined(__FreeBSD__)
+
+	int mib[4];
+	char buf[BUFSIZ];
+	size_t len = sizeof(buf);
+
+	mib[0] = CTL_KERN;
+	mib[1] = KERN_PROC;
+	mib[2] = KERN_PROC_PATHNAME;
+	mib[3] = -1;
+	assert(sysctl(mib, 4, buf, &len, NULL, 0) != -1);
+
+	pathRemoveFile(buf, '/');
+
+	path_share = std::string(buf) + "/..";
+	path_user = std::string(buf) + "/..";
+
+	#else
+
 	//TODO: Get path of executable. This assumes working directory is bin/
-	dstream<<"WARNING: Relative path not properly supported on OS X and FreeBSD"
+	dstream<<"WARNING: Relative path not properly supported on this platform"
 			<<std::endl;
 	path_share = std::string("..");
 	path_user = std::string("..");
@@ -227,20 +269,19 @@ void initializePaths()
 		Windows
 	*/
 	#if defined(_WIN32)
-		#include <windows.h>
 
 	const DWORD buflen = 1000;
 	char buf[buflen];
 	DWORD len;
-	
+
 	// Find path of executable and set path_share relative to it
 	len = GetModuleFileName(GetModuleHandle(NULL), buf, buflen);
 	assert(len < buflen);
 	pathRemoveFile(buf, '\\');
-	
+
 	// Use ".\bin\.."
 	path_share = std::string(buf) + "\\..";
-		
+
 	// Use "C:\Documents and Settings\user\Application Data\<PROJECT_NAME>"
 	len = GetEnvironmentVariable("APPDATA", buf, buflen);
 	assert(len < buflen);
@@ -250,30 +291,50 @@ void initializePaths()
 		Linux
 	*/
 	#elif defined(linux)
-		#include <unistd.h>
-	
-	char buf[BUFSIZ];
-	memset(buf, 0, BUFSIZ);
+
 	// Get path to executable
-	assert(readlink("/proc/self/exe", buf, BUFSIZ-1) != -1);
-	
-	pathRemoveFile(buf, '/');
+	std::string bindir = "";
+	{
+		char buf[BUFSIZ];
+		memset(buf, 0, BUFSIZ);
+		assert(readlink("/proc/self/exe", buf, BUFSIZ-1) != -1);
+		pathRemoveFile(buf, '/');
+		bindir = buf;
+	}
 
-	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) + "/..";
-		dstream<<"WARNING: Using \""<<path_share<<"\" instead."<<std::endl;
+	// Find share directory from these.
+	// It is identified by containing the subdirectory "builtin".
+	std::list<std::string> trylist;
+	std::string static_sharedir = STATIC_SHAREDIR;
+	if(static_sharedir != "" && static_sharedir != ".")
+		trylist.push_back(static_sharedir);
+	trylist.push_back(bindir + "/../share/" + PROJECT_NAME);
+	trylist.push_back(bindir + "/..");
+
+	for(std::list<std::string>::const_iterator i = trylist.begin();
+			i != trylist.end(); i++)
+	{
+		const std::string &trypath = *i;
+		if(!fs::PathExists(trypath) || !fs::PathExists(trypath + "/builtin")){
+			dstream<<"WARNING: system-wide share not found at \""
+					<<trypath<<"\""<<std::endl;
+			continue;
+		}
+		// Warn if was not the first alternative
+		if(i != trylist.begin()){
+			dstream<<"WARNING: system-wide share found at \""
+					<<trypath<<"\""<<std::endl;
+		}
+		path_share = trypath;
+		break;
 	}
-	
+
 	path_user = std::string(getenv("HOME")) + "/." + PROJECT_NAME;
 
 	/*
 		OS X
 	*/
 	#elif defined(__APPLE__)
-		#include <unistd.h>
 
     // Code based on
     // http://stackoverflow.com/questions/516200/relative-paths-not-working-in-xcode-c
@@ -292,14 +353,14 @@ void initializePaths()
 		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_share = STATIC_SHAREDIR;
 	path_user = std::string(getenv("HOME")) + "/." + PROJECT_NAME;
-    
+
 	#endif
 
 #endif // RUN_IN_PLACE