From f9237e61576c9bd1ba6a00276a9a849a4b5354fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Thu, 30 Sep 2010 13:42:56 +0000 Subject: [PATCH] send-email: use lexical filehandles during sending MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ævar Arnfjörð Bjarmason Reviewed-by: Jeff King > Signed-off-by: Junio C Hamano --- git-send-email.perl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index 634835c837..488d8947da 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -1144,7 +1144,7 @@ $subject = $initial_subject; $message_num = 0; foreach my $t (@files) { - open(F,"<",$t) or die "can't open file $t"; + open my $fh, "<", $t or die "can't open file $t"; my $author = undef; my $author_encoding; @@ -1157,7 +1157,7 @@ foreach my $t (@files) { $message = ""; $message_num++; # First unfold multiline header fields - while() { + while(<$fh>) { last if /^\s*$/; if (/^\s+\S/ and @header) { chomp($header[$#header]); @@ -1233,7 +1233,7 @@ foreach my $t (@files) { } } # Now parse the message body - while() { + while(<$fh>) { $message .= $_; if (/^(Signed-off-by|Cc): (.*)$/i) { chomp; @@ -1250,12 +1250,12 @@ foreach my $t (@files) { $c, $_) unless $quiet; } } - close F; + close $fh; if (defined $cc_cmd && !$suppress_cc{'cccmd'}) { - open(F, "$cc_cmd \Q$t\E |") + open my $fh, "$cc_cmd \Q$t\E |" or die "(cc-cmd) Could not execute '$cc_cmd'"; - while() { + while(<$fh>) { my $c = $_; $c =~ s/^\s*//g; $c =~ s/\n$//g; @@ -1264,7 +1264,7 @@ foreach my $t (@files) { printf("(cc-cmd) Adding cc: %s from: '%s'\n", $c, $cc_cmd) unless $quiet; } - close F + close $fh or die "(cc-cmd) failed to close pipe to '$cc_cmd'"; }