circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-04 19:58:48 +00:00
Code Issues Projects Releases Wiki Activity

show stderr from run-shell commands, not just stdout

Browse Source 
when commands fail, they often print error messages to stderr.
previously, failures were quite hard to debug because tmux would hide stderr.

before:
```
; tmux run-shell 'echo oops >&2; exit 1'
'echo oops >&2; exit 1' returned 1
```

after:
```
; tmux run-shell 'echo oops >&2; exit 1'
oops
'echo oops >&2; exit 1' returned 1
```
This commit is contained in:
jyn 2024-11-16 21:51:21 -05:00
parent dd9722184b
commit 3eadb60bea
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
job.c
View File

@ -77,7 +77,7 @@ job_run(const char *cmd, int argc, char **argv, struct environ *e,
struct job *job;
struct environ *env;
pid_t pid;
int nullfd, out[2], master;
int out[2], master;
const char *home, *shell;
sigset_t set, oldset;
struct winsize ws;
@ -152,17 +152,11 @@ job_run(const char *cmd, int argc, char **argv, struct environ *e,
fatal("dup2 failed");
if (dup2(out[1], STDOUT_FILENO) == -1)
fatal("dup2 failed");
if (out[1] != STDIN_FILENO && out[1] != STDOUT_FILENO)
if (dup2(out[1], STDERR_FILENO) == -1)
fatal("dup2 failed");
if (out[1] != STDIN_FILENO && out[1] != STDOUT_FILENO && out[1] != STDERR_FILENO)
close(out[1]);
close(out[0]);
nullfd = open(_PATH_DEVNULL, O_RDWR);
if (nullfd == -1)
fatal("open failed");
if (dup2(nullfd, STDERR_FILENO) == -1)
fatal("dup2 failed");
if (nullfd != STDERR_FILENO)
close(nullfd);
}
closefrom(STDERR_FILENO + 1);