Skip to content

fix(redirection_error): show both fds for duplicating/move redirections#4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
akinomyoga wants to merge 2 commits into
base:devel
Choose a base branch
from
Open

fix(redirection_error): show both fds for duplicating/move redirections #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed046c0
fix: consistent redirection_error for moving redirections
akinomyoga Aug 14, 2026
5414a54
fix: show both for duplicating/move redirections
akinomyoga Aug 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 33 additions & 25 deletions redir.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -150,33 +150,41 @@ redirection_error (REDIRECT *temp, int error, char *fn)
/* This error can never involve NOCLOBBER */
else if (error != NOCLOBBER_REDIRECT && temp->redirector.dest >= 0 && error == EBADF)
{
/* If we're dealing with two file descriptors, we have to guess about
which one is invalid; in the cases of r_{duplicating,move}_input and
r_{duplicating,move}_output we're here because dup2() failed. */
char direction;
int move, word;

/* If we're dealing with two file descriptors, we do not know which one
is invalid so show both; in the cases of r_{duplicating,move}_input
and r_{duplicating,move}_output we're here because dup2() failed. */
direction = '\0';
move = word = 0;
switch (temp->instruction)
{
case r_duplicating_input:
case r_duplicating_output:
case r_move_input:
case r_move_output:
filename = allocname = itos (temp->redirectee.dest);
break;
case r_duplicating_input_word:
if (temp->redirector.dest == 0) /* Guess */
filename = temp->redirectee.filename->word; /* XXX */
else
filename = allocname = itos (temp->redirector.dest);
break;
case r_duplicating_output_word:
if (temp->redirector.dest == 1) /* Guess */
filename = temp->redirectee.filename->word; /* XXX */
{
case r_duplicating_input: direction = '<'; break;
case r_duplicating_output: direction = '>'; break;
case r_move_input: direction = '<'; move = 1; break;
case r_move_output: direction = '>'; move = 1; break;
case r_duplicating_input_word: direction = '<'; word = 1; break;
case r_duplicating_output_word: direction = '>'; word = 1; break;
case r_move_input_word: direction = '<'; move = 1; word = 1; break;
case r_move_output_word: direction = '>'; move = 1; word = 1; break;
}

if (direction)
{
char *fd1, *fd2;
fd1 = itos (temp->redirector.dest);
if (word)
fd2 = redirection_expand (temp->redirectee.filename);
else
filename = allocname = itos (temp->redirector.dest);
break;
default:
filename = allocname = itos (temp->redirector.dest);
break;
}
fd2 = itos (temp->redirectee.dest);
filename = allocname = (char *)xmalloc (strlen (fd1) + strlen (fd2) + 4);
sprintf (filename, "%s%c&%s%c", fd1, direction, fd2, move ? '-' : '\0');
free (fd2);
free (fd1);
}
else
filename = allocname = itos (temp->redirector.dest);
}
#endif
else if (fn)
Expand Down