sway

commit 1fde9a9355fc398a3a3218b323138707cce1660f
parent fb73f84d0e020d286ecb8d3c437ceac932e30d3a
Author: Drew DeVault <sir@cmpwn.com>
Date:   Tue,  5 Feb 2019 16:30:39 +0100

Merge pull request #3581 from c-edw/ValidateConfigNoInitialize

If validating the config, do it as early as possible.
Diffstat:
M
sway/main.c
 | 
23
++++++++++++-----------

1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/sway/main.c b/sway/main.c
@@ -312,6 +312,18 @@ int main(int argc, char **argv) {
 		wlr_log_init(WLR_ERROR, NULL);
 	}
 
+	log_kernel();
+	log_distro();
+	log_env();
+	detect_proprietary(allow_unsupported_gpu);
+	detect_raspi();
+
+	if (validate) {
+		bool valid = load_main_config(config_path, false, true);
+		free(config_path);
+		return valid ? 0 : 1;
+	}
+
 	if (optind < argc) { // Behave as IPC client
 		if (optind != 1) {
 			sway_log(SWAY_ERROR, "Don't use options with the IPC client");
@@ -334,11 +346,6 @@ int main(int argc, char **argv) {
 		return 1;
 	}
 
-	log_kernel();
-	log_distro();
-	detect_proprietary(allow_unsupported_gpu);
-	detect_raspi();
-
 	if (!drop_permissions()) {
 		server_fini(&server);
 		exit(EXIT_FAILURE);
@@ -359,12 +366,6 @@ int main(int argc, char **argv) {
 	}
 
 	ipc_init(&server);
-	log_env();
-
-	if (validate) {
-		bool valid = load_main_config(config_path, false, true);
-		return valid ? 0 : 1;
-	}
 
 	setenv("WAYLAND_DISPLAY", server.socket, true);
 	if (!load_main_config(config_path, false, false)) {