Merge branch 'obsd-master' into master

pull/2954/head
Thomas Adam 2021-10-25 00:01:11 +01:00
commit 619d934d7b
2 changed files with 2 additions and 2 deletions

View File

@ -130,7 +130,7 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmdq_item *item)
sigprocmask(SIG_SETMASK, &oldset, NULL);
close(pipe_fd[0]);
null_fd = open(_PATH_DEVNULL, O_WRONLY, 0);
null_fd = open(_PATH_DEVNULL, O_WRONLY);
if (out) {
if (dup2(pipe_fd[1], STDIN_FILENO) == -1)
_exit(1);

2
job.c
View File

@ -140,7 +140,7 @@ job_run(const char *cmd, int argc, char **argv, struct environ *e, struct sessio
close(out[1]);
close(out[0]);
nullfd = open(_PATH_DEVNULL, O_RDWR, 0);
nullfd = open(_PATH_DEVNULL, O_RDWR);
if (nullfd == -1)
fatal("open failed");
if (dup2(nullfd, STDERR_FILENO) == -1)