--- globus_2_4_3_adv2003_fix892_fix956_more/gram/jobmanager/source/scripts/StdioMerger.pm Mon Apr 14 21:06:55 2003 +++ globus_2_4_3_adv2003_fix892_fix956_plus/gram/jobmanager/source/scripts/StdioMerger.pm Sun Jan 4 20:25:50 2004 @@ -167,7 +167,7 @@ foreach(@{$self->{STDOUT_FILES}}, @{$self->{STDERR_FILES}}) { - print TMP sprintf($format, $_->[0], $_->[1], $_->[2]); + printf TMP $format, $_->[0], $_->[1], $_->[2]; } close(TMP); @@ -204,7 +204,7 @@ sub pipe_out_cmd { - my $result; + my @result; local(*READ); my $pid = open( READ, "-|" ); @@ -213,7 +213,7 @@ if ( $pid ) { # parent - chomp($result = scalar ); + chomp(@result = ); close(READ); } else { # child @@ -225,7 +225,7 @@ exit(127); } } - $result; + wantarray ? @result : $result[0]; } sub fork_and_exec_cmd @@ -265,14 +265,7 @@ $result = pipe_out_cmd($cache_pgm, '-query', '-t', $tag, $url); } - if($result eq '') - { - return undef; - } - else - { - return $result; - } + return ($result eq '') ? undef : $result; } 1;