tange/parallel
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/parallel.git synced 2024-11-22 22:17:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

parallel: EOF wrapper for --pipe gives correct exit value.

Browse source
This commit is contained in:
Ole Tange 2012-12-28 21:27:43 +01:00
parent a70b9dffaf
commit 382cea7c09
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/parallel
View file

@ -3875,9 +3875,21 @@ sub start {
. $job->seq() . "): $command\n"); . $job->seq() . "): $command\n");
if($opt::pipe) { if($opt::pipe) {
my ($in); my ($in);
# Wrap command with end-of-file detector,
# so we do not spawn a program if there is no input.
# Exit value:
# empty input = true
# some input = exit val from command
# Bug:
# If the command does not read the first char, the temp file
# is not deleted.
$command = q{ $command = q{
eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv _FIRST_CHAR_FILE /tmp/$$.first_char_file || echo export _FIRST_CHAR_FILE=/tmp/$$.first_char_file`; eval `echo $SHELL | grep -E "/(t)?csh" > /dev/null && echo setenv _FIRST_CHAR_FILE /tmp/$$.first_char_file || echo export _FIRST_CHAR_FILE=/tmp/$$.first_char_file`;
dd bs=1 count=1 of=$_FIRST_CHAR_FILE >&/dev/null; test -s "$_FIRST_CHAR_FILE" && ( cat $_FIRST_CHAR_FILE; rm $_FIRST_CHAR_FILE; cat - ) | }. "($command)"; dd bs=1 count=1 of=$_FIRST_CHAR_FILE >&/dev/null;
test -s "$_FIRST_CHAR_FILE" || rm "$_FIRST_CHAR_FILE";
test -s "$_FIRST_CHAR_FILE" || exit 0;
(cat $_FIRST_CHAR_FILE; rm $_FIRST_CHAR_FILE; cat - ) | } .
"($command)";
# The eval is needed to catch exception from open3 # The eval is needed to catch exception from open3
eval { eval {
$pid = ::open3($in, ">&OUT", ">&ERR", $ENV{SHELL}, "-c", $command) || $pid = ::open3($in, ">&OUT", ">&ERR", $ENV{SHELL}, "-c", $command) ||