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

commands: print correct command on error for exec and opacity

Browse source
This commit is contained in:
Ian Fan 2018-10-23 10:12:32 +01:00
parent 970501f05e
commit a9fdd5dd2a
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sway/commands/exec_always.c
View file

@ -16,7 +16,7 @@
struct cmd_results *cmd_exec_always(int argc, char **argv) { struct cmd_results *cmd_exec_always(int argc, char **argv) {
struct cmd_results *error = NULL; struct cmd_results *error = NULL;
if (!config->active) return cmd_results_new(CMD_DEFER, NULL, NULL); if (!config->active) return cmd_results_new(CMD_DEFER, NULL, NULL);
if ((error = checkarg(argc, "exec_always", EXPECTED_MORE_THAN, 0))) { if ((error = checkarg(argc, argv[-1], EXPECTED_MORE_THAN, 0))) {
return error; return error;
} }
@ -24,7 +24,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
if (strcmp(argv[0], "--no-startup-id") == 0) { if (strcmp(argv[0], "--no-startup-id") == 0) {
wlr_log(WLR_INFO, "exec switch '--no-startup-id' not supported, ignored."); wlr_log(WLR_INFO, "exec switch '--no-startup-id' not supported, ignored.");
--argc; ++argv; --argc; ++argv;
if ((error = checkarg(argc, "exec_always", EXPECTED_MORE_THAN, 0))) { if ((error = checkarg(argc, argv[-1], EXPECTED_MORE_THAN, 0))) {
return error; return error;
} }
} }
@ -71,7 +71,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
} else if (pid < 0) { } else if (pid < 0) {
close(fd[0]); close(fd[0]);
close(fd[1]); close(fd[1]);
return cmd_results_new(CMD_FAILURE, "exec_always", "fork() failed"); return cmd_results_new(CMD_FAILURE, argv[-1], "fork() failed");
} }
close(fd[1]); // close write close(fd[1]); // close write
ssize_t s = 0; ssize_t s = 0;
@ -85,7 +85,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
wlr_log(WLR_DEBUG, "Child process created with pid %d", child); wlr_log(WLR_DEBUG, "Child process created with pid %d", child);
root_record_workspace_pid(child); root_record_workspace_pid(child);
} else { } else {
return cmd_results_new(CMD_FAILURE, "exec_always", return cmd_results_new(CMD_FAILURE, argv[-1],
"Second fork() failed"); "Second fork() failed");
} }

2
sway/commands/opacity.c
View file

@ -15,7 +15,7 @@ static bool parse_opacity(const char *opacity, float *val) {
struct cmd_results *cmd_opacity(int argc, char **argv) { struct cmd_results *cmd_opacity(int argc, char **argv) {
struct cmd_results *error = NULL; struct cmd_results *error = NULL;
if ((error = checkarg(argc, "layout", EXPECTED_EQUAL_TO, 1))) { if ((error = checkarg(argc, "opacity", EXPECTED_EQUAL_TO, 1))) {
return error; return error;
} }