Skip to content

Commit f9237e6

Browse files
avargitster
authored andcommitted
send-email: use lexical filehandles during sending
Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]: Avery Pennarun <[email protected]> Reviewed-by: Jeff King <[email protected]> > Signed-off-by: Junio C Hamano <[email protected]>
1 parent fe0f944 commit f9237e6

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

git-send-email.perl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1144,7 +1144,7 @@ sub send_message {
11441144
$message_num = 0;
11451145

11461146
foreach my $t (@files) {
1147-
open(F,"<",$t) or die "can't open file $t";
1147+
open my $fh, "<", $t or die "can't open file $t";
11481148

11491149
my $author = undef;
11501150
my $author_encoding;
@@ -1157,7 +1157,7 @@ sub send_message {
11571157
$message = "";
11581158
$message_num++;
11591159
# First unfold multiline header fields
1160-
while(<F>) {
1160+
while(<$fh>) {
11611161
last if /^\s*$/;
11621162
if (/^\s+\S/ and @header) {
11631163
chomp($header[$#header]);
@@ -1233,7 +1233,7 @@ sub send_message {
12331233
}
12341234
}
12351235
# Now parse the message body
1236-
while(<F>) {
1236+
while(<$fh>) {
12371237
$message .= $_;
12381238
if (/^(Signed-off-by|Cc): (.*)$/i) {
12391239
chomp;
@@ -1250,12 +1250,12 @@ sub send_message {
12501250
$c, $_) unless $quiet;
12511251
}
12521252
}
1253-
close F;
1253+
close $fh;
12541254

12551255
if (defined $cc_cmd && !$suppress_cc{'cccmd'}) {
1256-
open(F, "$cc_cmd \Q$t\E |")
1256+
open my $fh, "$cc_cmd \Q$t\E |"
12571257
or die "(cc-cmd) Could not execute '$cc_cmd'";
1258-
while(<F>) {
1258+
while(<$fh>) {
12591259
my $c = $_;
12601260
$c =~ s/^\s*//g;
12611261
$c =~ s/\n$//g;
@@ -1264,7 +1264,7 @@ sub send_message {
12641264
printf("(cc-cmd) Adding cc: %s from: '%s'\n",
12651265
$c, $cc_cmd) unless $quiet;
12661266
}
1267-
close F
1267+
close $fh
12681268
or die "(cc-cmd) failed to close pipe to '$cc_cmd'";
12691269
}
12701270

0 commit comments

Comments
 (0)