Merge lp:~widelands-dev/widelands/bug-1703833-catch-missing-datadir into lp:widelands

[GunChleoc]

Exit gracefully if user specifies a datadir that doesn't exist

[Notabilis (notabilis27)]

Diff is mostly looking good. Passing a non-existing directory to the fixed code (see diff) worked fine.

review: Needs Fixing (diff, testing)

[Notabilis (notabilis27)]

Looking good now, thanks.

review: Approve (diff, testing)

[GunChleoc (gunchleoc)]

Thanks!

@bunnybot merge

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3677. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/405393952.
Appveyor build 3476. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1703833_catch_missing_datadir-3476.

[bunnybot (widelandsofficial)]

Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways.

Travis build 3677. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/405393952.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3690. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/405785266.
Appveyor build 3489. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1703833_catch_missing_datadir-3489.

[GunChleoc (gunchleoc)]

@bunnybot merge

=== modified file 'src/wlapplication.cc'
--- src/wlapplication.cc	2018-07-07 19:20:22 +0000
+++ src/wlapplication.cc	2018-07-19 11:13:32 +0000
@@ -157,7 +157,9 @@
 	// http://pubs.opengroup.org/onlinepubs/009695399/functions/realpath.html
 	char* rp = realpath(path.c_str(), buffer);
 	log("Realpath: %s\n", rp);
-	assert(rp);
+	if (!rp) {
+		throw wexception("Unable to get absolute path for %s", path.c_str());
+	}
 	return std::string(rp);
 #else
 	return path;
@@ -936,8 +938,13 @@
 		              get_executable_directory() + FileSystem::file_separator() + INSTALL_DATADIR;
 	}
 	if (!is_absolute_path(datadir_)) {
-		datadir_ = absolute_path_if_not_windows(FileSystem::get_working_directory() +
-		                                        FileSystem::file_separator() + datadir_);
+		try {
+			datadir_ = absolute_path_if_not_windows(FileSystem::get_working_directory() +
+													FileSystem::file_separator() + datadir_);
+		} catch (const WException& e) {
+			log("Error parsing datadir: %s\n", e.what());
+			exit(1);
+		}
 	}
 	if (commandline_.count("datadir_for_testing")) {
 		datadir_for_testing_ = commandline_["datadir_for_testing"];