mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-12 05:24:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2057 from RyanDwyer/swaymsg-fix-exit-code

Browse Source 
swaymsg: Fix exit code
This commit is contained in:
emersion 2018-05-28 09:15:02 +01:00 committed by GitHub
commit cc1fc3b4a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
swaymsg/main.c
View File

@ -19,13 +19,26 @@ void sway_terminate(int exit_code) {
exit(exit_code); exit(exit_code);
} }
// Iterate results array and return false if any of them failed
static bool success(json_object *r, bool fallback) { static bool success(json_object *r, bool fallback) {
json_object *success; if (!json_object_is_type(r, json_type_array)) {
if (!json_object_object_get_ex(r, "success", &success)) {
return fallback; return fallback;
} else {
return json_object_get_boolean(success);
} }
size_t results_len = json_object_array_length(r);
if (!results_len) {
return fallback;
}
for (size_t i = 0; i < results_len; ++i) {
json_object *result = json_object_array_get_idx(r, i);
json_object *success;
if (!json_object_object_get_ex(result, "success", &success)) {
return false;
}
if (!json_object_get_boolean(success)) {
return false;
}
}
return true;
} }
static void pretty_print_cmd(json_object *r) { static void pretty_print_cmd(json_object *r) {