@matheusbsbs / matheus-bagliano / commits / e415907d6c
Fork 0

send-email: avoid open "-|" list form for Perl 5.6

Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Feb 20, 2006 at 14:23 UTC e415907d6c746616f399cf2a4679372dd0cbce83
1 file changed +21 -16
git-send-email.perl
+21 -16
@@ -59,24 +59,29 @@ my $rc = GetOptions("from=s" => \$from,
59
60 # Now, let's fill any that aren't set in with defaults:
61
62 -open(GITVAR,"-|","git-var","-l")
63 - or die "Failed to open pipe from git-var: $!";
64 -
65 -my ($author,$committer);
66 -while(<GITVAR>) {
67 - chomp;
68 - my ($var,$data) = split /=/,$_,2;
69 - my @fields = split /\s+/, $data;
70 -
71 - my $ident = join(" ", @fields[0...(@fields-3)]);
62 +sub gitvar {
63 + my ($var) = @_;
64 + my $fh;
65 + my $pid = open($fh, '-|');
66 + die "$!" unless defined $pid;
67 + if (!$pid) {
68 + exec('git-var', $var) or die "$!";
69 + }
70 + my ($val) = <$fh>;
71 + close $fh or die "$!";
72 + chomp($val);
73 + return $val;
74 +}
75
73 - if ($var eq 'GIT_AUTHOR_IDENT') {
74 - $author = $ident;
75 - } elsif ($var eq 'GIT_COMMITTER_IDENT') {
76 - $committer = $ident;
77 - }
76 +sub gitvar_ident {
77 + my ($name) = @_;
78 + my $val = gitvar($name);
79 + my @field = split(/\s+/, $val);
80 + return join(' ', @field[0...(@field-3)]);
81 }
79 -close(GITVAR);
82 +
83 +my ($author) = gitvar_ident('GIT_AUTHOR_IDENT');
84 +my ($committer) = gitvar_ident('GIT_COMMITTER_IDENT');
85
86 my $prompting = 0;
87 if (!defined $from) {