circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Make stdio blocking again before calling shell command with -c.

Browse Source
This commit is contained in:
Nicholas Marriott
2010-10-16 08:42:35 +00:00
parent f56b4ec2ff
commit 31954339d1
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tmux.c
View File

@@ -22,6 +22,7 @@
#include <errno.h> #include <errno.h>
#include <event.h> #include <event.h>
#include <fcntl.h>
#include <paths.h> #include <paths.h>
#include <pwd.h> #include <pwd.h>
#include <signal.h> #include <signal.h>
@@ -211,6 +212,7 @@ shell_exec(const char *shell, const char *shellcmd)
{ {
const char *shellname, *ptr; const char *shellname, *ptr;
char *argv0; char *argv0;
int mode;
ptr = strrchr(shell, '/'); ptr = strrchr(shell, '/');
if (ptr != NULL && *(ptr + 1) != '\0') if (ptr != NULL && *(ptr + 1) != '\0')
@@ -223,6 +225,12 @@ shell_exec(const char *shell, const char *shellcmd)
xasprintf(&argv0, "%s", shellname); xasprintf(&argv0, "%s", shellname);
setenv("SHELL", shell, 1); setenv("SHELL", shell, 1);
if ((mode = fcntl(STDIN_FILENO, F_GETFL)) != -1)
fcntl(STDIN_FILENO, F_SETFL, mode & ~O_NONBLOCK);
if ((mode = fcntl(STDOUT_FILENO, F_GETFL)) != -1)
fcntl(STDOUT_FILENO, F_SETFL, mode & ~O_NONBLOCK);
if ((mode = fcntl(STDERR_FILENO, F_GETFL)) != -1)
fcntl(STDERR_FILENO, F_SETFL, mode & ~O_NONBLOCK);
closefrom(STDERR_FILENO + 1); closefrom(STDERR_FILENO + 1);
execl(shell, argv0, "-c", shellcmd, (char *) NULL); execl(shell, argv0, "-c", shellcmd, (char *) NULL);