cpp/openttd-patchpack/source Changeset - r14568:64647c10b607

Changeset - r14568:64647c10b607

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium - 14 years ago 2010-02-17 16:45:55
rubidium@openttd.org

(svn r19151) -Codechange [FS#3625]: Move home directory to a better place in Haiku (jrepan)

3 files changed with 11 insertions and 2 deletions:

config.lib

src/ai/api/ai_changelog.hpp

src/fileio.cpp

0 comments (0 inline, 0 general)

config.lib

➞

Show inline comments

@@ @@ -1018,7 +1018,7 @@ check_params() { @@
 	fi
 	if [ "$personal_dir" = "1" ]; then
 		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ] || [ "$os" = "DOS" ]; then
+		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ] || [ "$os" = "DOS" ] || [ "$os" == "HAIKU" ]; then
 			personal_dir="OpenTTD"
 		elif [ "$os" = "OSX" ]; then
 			personal_dir="Documents/OpenTTD"

src/ai/api/ai_changelog.hpp

➞

Show inline comments

@@ @@ -16,7 +16,7 @@ @@
+ *
  * \b 1.1.0
+ *
- * 1.0.0 is not yet released. The following changes are not set in stone yet.
+ * 1.1.0 is not yet released. The following changes are not set in stone yet.
+ *
  * \b 1.0.0
+ *

src/fileio.cpp

➞

Show inline comments

@@ @@ -18,6 +18,9 @@ @@
 #include "tar_type.h"
 #ifdef WIN32
 #include <windows.h>
 #elif defined(__HAIKU__)
 #include <Path.h>
 #include <storage/FindDirectory.h>
 #else
 #ifdef OPENBSD
 #include <unistd.h>
@@ @@ -849,12 +852,18 @@ void DetermineBasePaths(const char *exe) @@
 #if defined(__MORPHOS__) || defined(__AMIGA__) || defined(DOS) || defined(OS2) || !defined(WITH_PERSONAL_DIR)
 	_searchpaths[SP_PERSONAL_DIR] = NULL;
 #else
 #ifdef __HAIKU__
 	BPath path;
 	find_directory(B_USER_SETTINGS_DIRECTORY, &path);
 	const char *homedir = path.Path();
 #else
 	const char *homedir = getenv("HOME");
 	if (homedir == NULL) {
 		const struct passwd *pw = getpwuid(getuid());
 		homedir = (pw == NULL) ? "" : pw->pw_dir;
+	}
 #endif
 	snprintf(tmp, MAX_PATH, "%s" PATHSEP "%s", homedir, PERSONAL_DIR);
 	AppendPathSeparator(tmp, MAX_PATH);

0 comments (0 inline, 0 general)