mirror of
https://github.com/tmux/tmux.git
synced 2025-01-22 05:37:07 +00:00
Merge branch 'obsd-master' into master
This commit is contained in:
commit
619d934d7b
@ -130,7 +130,7 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmdq_item *item)
|
|||||||
sigprocmask(SIG_SETMASK, &oldset, NULL);
|
sigprocmask(SIG_SETMASK, &oldset, NULL);
|
||||||
close(pipe_fd[0]);
|
close(pipe_fd[0]);
|
||||||
|
|
||||||
null_fd = open(_PATH_DEVNULL, O_WRONLY, 0);
|
null_fd = open(_PATH_DEVNULL, O_WRONLY);
|
||||||
if (out) {
|
if (out) {
|
||||||
if (dup2(pipe_fd[1], STDIN_FILENO) == -1)
|
if (dup2(pipe_fd[1], STDIN_FILENO) == -1)
|
||||||
_exit(1);
|
_exit(1);
|
||||||
|
2
job.c
2
job.c
@ -140,7 +140,7 @@ job_run(const char *cmd, int argc, char **argv, struct environ *e, struct sessio
|
|||||||
close(out[1]);
|
close(out[1]);
|
||||||
close(out[0]);
|
close(out[0]);
|
||||||
|
|
||||||
nullfd = open(_PATH_DEVNULL, O_RDWR, 0);
|
nullfd = open(_PATH_DEVNULL, O_RDWR);
|
||||||
if (nullfd == -1)
|
if (nullfd == -1)
|
||||||
fatal("open failed");
|
fatal("open failed");
|
||||||
if (dup2(nullfd, STDERR_FILENO) == -1)
|
if (dup2(nullfd, STDERR_FILENO) == -1)
|
||||||
|
Loading…
Reference in New Issue
Block a user