d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sh: Write as much into the heredoc pipe as possible, to avoid forking.

Browse Source 
Use non-blocking I/O to write as much as the pipe will accept (often 64K,
but it can be as little as 4K), avoiding the need for the ugly PIPESIZE
constant. If PIPESIZE was set too high, a deadlock would occur.
This commit is contained in:
jilles 2013-04-02 21:34:38 +00:00
parent e2bb503df7
commit 7236eb0dda
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bin/sh/redir.c
View File

@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$");
#define EMPTY -2 /* marks an unused slot in redirtab */
#define CLOSED -1 /* fd was not open before redir */
#define PIPESIZE 4096 /* amount of buffering in a pipe */
MKINIT
@ -253,7 +252,9 @@ openhere(union node *redir)
{
char *p;
int pip[2];
int len = 0;
size_t len = 0;
int flags;
ssize_t written = 0;
if (pipe(pip) < 0)
error("Pipe call failed: %s", strerror(errno));
@ -263,9 +264,16 @@ openhere(union node *redir)
else
p = redir->nhere.doc->narg.text;
len = strlen(p);
if (len <= PIPESIZE) {
xwrite(pip[1], p, len);
if (len == 0)
goto out;
flags = fcntl(pip[1], F_GETFL, 0);
if (flags != -1 && fcntl(pip[1], F_SETFL, flags | O_NONBLOCK) != -1) {
written = write(pip[1], p, len);
if (written < 0)
written = 0;
if ((size_t)written == len)
goto out;
fcntl(pip[1], F_SETFL, flags);
}
if (forkshell((struct job *)NULL, (union node *)NULL, FORK_NOJOB) == 0) {
@ -275,7 +283,7 @@ openhere(union node *redir)
signal(SIGHUP, SIG_IGN);
signal(SIGTSTP, SIG_IGN);
signal(SIGPIPE, SIG_DFL);
xwrite(pip[1], p, len);
xwrite(pip[1], p + written, len - written);
_exit(0);
}
out: