mirror of
https://github.com/swaywm/sway.git
synced 2026-04-21 06:46:22 -04:00
Update for swaywm/wlroots#1126
This commit is contained in:
parent
ebcdce457a
commit
63b4bf5000
85 changed files with 391 additions and 385 deletions
|
|
@ -20,7 +20,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
|
|||
|
||||
char *tmp = NULL;
|
||||
if (strcmp((char*)*argv, "--no-startup-id") == 0) {
|
||||
wlr_log(L_INFO, "exec switch '--no-startup-id' not supported, ignored.");
|
||||
wlr_log(WLR_INFO, "exec switch '--no-startup-id' not supported, ignored.");
|
||||
if ((error = checkarg(argc - 1, "exec_always", EXPECTED_MORE_THAN, 0))) {
|
||||
return error;
|
||||
}
|
||||
|
|
@ -35,11 +35,11 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
|
|||
strncpy(cmd, tmp, sizeof(cmd) - 1);
|
||||
cmd[sizeof(cmd) - 1] = 0;
|
||||
free(tmp);
|
||||
wlr_log(L_DEBUG, "Executing %s", cmd);
|
||||
wlr_log(WLR_DEBUG, "Executing %s", cmd);
|
||||
|
||||
int fd[2];
|
||||
if (pipe(fd) != 0) {
|
||||
wlr_log(L_ERROR, "Unable to create pipe for fork");
|
||||
wlr_log(WLR_ERROR, "Unable to create pipe for fork");
|
||||
}
|
||||
|
||||
pid_t pid, child;
|
||||
|
|
@ -73,7 +73,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
|
|||
// cleanup child process
|
||||
waitpid(pid, NULL, 0);
|
||||
if (child > 0) {
|
||||
wlr_log(L_DEBUG, "Child process created with pid %d", child);
|
||||
wlr_log(WLR_DEBUG, "Child process created with pid %d", child);
|
||||
// TODO: add PID to active workspace
|
||||
} else {
|
||||
return cmd_results_new(CMD_FAILURE, "exec_always",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue