The script was using bareword filehandles. This is considered a bad
practice so they have been changed to indirect filehandles.
Signed-off-by: Bill Pemberton <wfp5p@xxxxxxxxxxxx>
---
git-send-email.perl | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index 5e7295d..7068041 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -527,7 +527,7 @@ if ($compose) {
$compose_filename = ($repo ?
tempfile(".gitsendemail.msg.XXXXXX", DIR => $repo->repo_path()) :
tempfile(".gitsendemail.msg.XXXXXX", DIR => "."))[1];
- open(C,">",$compose_filename)
+ open my $C,'>',$compose_filename
or die "Failed to open for writing $compose_filename: $!";
@@ -535,7 +535,7 @@ if ($compose) {
my $tpl_subject = $initial_subject || '';
my $tpl_reply_to = $initial_reply_to || '';
- print C <<EOT;
+ print {$C} <<EOT;
From $tpl_sender # This line is ignored.
GIT: Lines beginning in "GIT: " will be removed.
GIT: Consider including an overall diffstat or table of contents
@@ -548,9 +548,9 @@ In-Reply-To: $tpl_reply_to
EOT
for my $f (@files) {
- print C get_patch_subject($f);
+ print {$C} get_patch_subject($f);
}
- close(C);
+ close($C);
my $editor = $ENV{GIT_EDITOR} || Git::config(@repo, "core.editor") || $ENV{VISUAL} || $ENV{EDITOR} || "vi";
@@ -560,23 +560,23 @@ EOT
do_edit($compose_filename);
}
- open(C2,">",$compose_filename . ".final")
+ open my $C2,'>',$compose_filename . ".final"
or die "Failed to open $compose_filename.final : " . $!;
- open(C,"<",$compose_filename)
+ open $C, '<',$compose_filename
or die "Failed to open $compose_filename : " . $!;
my $need_8bit_cte = file_has_nonascii($compose_filename);
my $in_body = 0;
my $summary_empty = 1;
- while(<C>) {
+ while(<$C>) {
next if m/^GIT: /;
if ($in_body) {
$summary_empty = 0 unless (/^\n$/);
} elsif (/^\n$/) {
$in_body = 1;
if ($need_8bit_cte) {
- print C2 "MIME-Version: 1.0\n",
+ print {$C2} "MIME-Version: 1.0\n",
"Content-Type: text/plain; ",
"charset=utf-8\n",
"Content-Transfer-Encoding: 8bit\n";
@@ -601,10 +601,10 @@ EOT
print "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n";
next;
}
- print C2 $_;
+ print {$C2} $_;
}
- close(C);
- close(C2);
+ close($C);
+ close($C2);
if ($summary_empty) {
print "Summary email is empty, skipping it\n";
@@ -984,7 +984,7 @@ $subject = $initial_subject;
$message_num = 0;
foreach my $t (@files) {
- open(F,"<",$t) or die "can't open file $t";
+ open my $F,'<',$t or die "can't open file $t";
my $author = undef;
my $author_encoding;
@@ -997,7 +997,7 @@ foreach my $t (@files) {
$message = "";
$message_num++;
# First unfold multiline header fields
- while(<F>) {
+ while(<$F>) {
last if /^\s*$/;
if (/^\s+\S/ and @header) {
chomp($header[$#header]);
@@ -1073,7 +1073,7 @@ foreach my $t (@files) {
}
}
# Now parse the message body
- while(<F>) {
+ while(<$F>) {
$message .= $_;
if (/^(Signed-off-by|Cc): (.*)$/i) {
chomp;
@@ -1090,12 +1090,12 @@ foreach my $t (@files) {
$c, $_) unless $quiet;
}
}
- close F;
+ close $F;
if (defined $cc_cmd && !$suppress_cc{'cccmd'}) {
- open(F, "$cc_cmd $t |")
+ open my $F, '-|', "$cc_cmd $t"
or die "(cc-cmd) Could not execute '$cc_cmd'";
- while(<F>) {
+ while(<$F>) {
my $c = $_;
$c =~ s/^\s*//g;
$c =~ s/\n$//g;
@@ -1104,7 +1104,7 @@ foreach my $t (@files) {
printf("(cc-cmd) Adding cc: %s from: '%s'\n",
$c, $cc_cmd) unless $quiet;
}
- close F
+ close $F
or die "(cc-cmd) failed to close pipe to '$cc_cmd'";
}
--
1.6.0.6
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html