alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3581 from c-edw/ValidateConfigNoInitialize

Browse source 
If validating the config, do it as early as possible.
This commit is contained in:
Drew DeVault 2019-02-05 16:30:39 +01:00 committed by GitHub
parent fb73f84d0e 886789c197
commit 1fde9a9355
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
sway/main.c
View file

@ -312,6 +312,18 @@ int main(int argc, char **argv) {
wlr_log_init(WLR_ERROR, NULL); 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 < argc) { // Behave as IPC client
if (optind != 1) { if (optind != 1) {
sway_log(SWAY_ERROR, "Don't use options with the IPC client"); sway_log(SWAY_ERROR, "Don't use options with the IPC client");
@ -334,11 +346,6 @@ int main(int argc, char **argv) {
return 1; return 1;
} }
log_kernel();
log_distro();
detect_proprietary(allow_unsupported_gpu);
detect_raspi();
if (!drop_permissions()) { if (!drop_permissions()) {
server_fini(&server); server_fini(&server);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -359,12 +366,6 @@ int main(int argc, char **argv) {
} }
ipc_init(&server); 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); setenv("WAYLAND_DISPLAY", server.socket, true);
if (!load_main_config(config_path, false, false)) { if (!load_main_config(config_path, false, false)) {