pmodules/bash
0
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/bash.git synced 2026-06-28 16:09:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

commit bash-20101217 snapshot

Browse Source
This commit is contained in:
Chet Ramey
2011-12-12 22:11:41 -05:00
parent 643db9d296
commit e88665cc60
26 changed files with 411 additions and 13082 deletions
Download Patch File Download Diff File Expand all files Collapse all files
redir.c
+34 -13
View File
@@ -94,12 +94,16 @@ static REDIRECTEE rd;
Used to print a reasonable error message. */
static int heredoc_errno;
#define REDIRECTION_ERROR(r, e) \
if ((r) != 0) \
#define REDIRECTION_ERROR(r, e, fd) \
do { \
if ((r) < 0) \
{ \
if (fd >= 0) \
close (fd); \
last_command_exit_value = EXECUTION_FAILURE;\
return ((e) == 0 ? EINVAL : (e));\
}
} \
} while (0)
void
redirection_error (temp, error)
@@ -815,7 +819,10 @@ do_redirection_internal (redirect, flags)
if (flags & RX_ACTIVE)
{
if (redirect->rflags & REDIR_VARASSIGN)
redirector = fcntl (fd, F_DUPFD, SHELL_FD_BASE); /* XXX try this for now */
{
redirector = fcntl (fd, F_DUPFD, SHELL_FD_BASE); /* XXX try this for now */
REDIRECTION_ERROR (redirector, errno, fd);
}
if (flags & RX_UNDOABLE)
{
@@ -824,7 +831,9 @@ do_redirection_internal (redirect, flags)
r = add_undo_redirect (redirector, ri, -1);
else
r = add_undo_close_redirect (redirector);
REDIRECTION_ERROR (r, errno);
if (r < 0 && (redirect->rflags & REDIR_VARASSIGN))
close (redirector);
REDIRECTION_ERROR (r, errno, fd);
}
#if defined (BUFFERED_INPUT)
@@ -919,7 +928,10 @@ do_redirection_internal (redirect, flags)
}
if (redirect->rflags & REDIR_VARASSIGN)
redirector = fcntl (fd, F_DUPFD, SHELL_FD_BASE); /* XXX try this for now */
{
redirector = fcntl (fd, F_DUPFD, SHELL_FD_BASE); /* XXX try this for now */
REDIRECTION_ERROR (redirector, errno, fd);
}
if (flags & RX_ACTIVE)
{
@@ -930,7 +942,9 @@ do_redirection_internal (redirect, flags)
r = add_undo_redirect (redirector, ri, -1);
else
r = add_undo_close_redirect (redirector);
REDIRECTION_ERROR(r, errno);
if (r < 0 && (redirect->rflags & REDIR_VARASSIGN))
close (redirector);
REDIRECTION_ERROR (r, errno, fd);
}
#if defined (BUFFERED_INPUT)
@@ -974,7 +988,10 @@ do_redirection_internal (redirect, flags)
case r_move_input:
case r_move_output:
if ((flags & RX_ACTIVE) && (redirect->rflags & REDIR_VARASSIGN))
redirector = fcntl (redir_fd, F_DUPFD, SHELL_FD_BASE); /* XXX try this for now */
{
redirector = fcntl (redir_fd, F_DUPFD, SHELL_FD_BASE); /* XXX try this for now */
REDIRECTION_ERROR (redirector, errno, -1);
}
if ((flags & RX_ACTIVE) && (redir_fd != redirector))
{
@@ -985,7 +1002,9 @@ do_redirection_internal (redirect, flags)
r = add_undo_redirect (redirector, ri, redir_fd);
else
r = add_undo_close_redirect (redirector);
REDIRECTION_ERROR(r, errno);
if (r < 0 && (redirect->rflags & REDIR_VARASSIGN))
close (redirector);
REDIRECTION_ERROR (r, errno, -1);
}
#if defined (BUFFERED_INPUT)
check_bash_input (redirector);
@@ -1059,8 +1078,10 @@ do_redirection_internal (redirect, flags)
r = 0;
if ((flags & RX_UNDOABLE) && (fcntl (redirector, F_GETFD, 0) != -1))
r = add_undo_redirect (redirector, ri, -1);
REDIRECTION_ERROR (r, errno);
{
r = add_undo_redirect (redirector, ri, -1);
REDIRECTION_ERROR (r, errno, redirector);
}
#if defined (COPROCESS_SUPPORT)
coproc_fdchk (redirector);
@@ -1094,7 +1115,7 @@ do_redirection_internal (redirect, flags)
since we're going to use it later (e.g., make sure we don't save fd 0
to fd 10 if we have a redirection like 0<&10). If the value of fdbase
puts the process over its fd limit, causing fcntl to fail, we try
again with SHELL_FD_BASE. */
again with SHELL_FD_BASE. Return 0 on success, -1 on error. */
static int
add_undo_redirect (fd, ri, fdbase)
int fd;
@@ -1176,7 +1197,7 @@ add_undo_redirect (fd, ri, fdbase)
}
/* Set up to close FD when we are finished with the current command
and its redirections. */
and its redirections. Return 0 on success, -1 on error. */
static int
add_undo_close_redirect (fd)
int fd;