mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-05 10:36:11 +02:00
Code

send-email: extract execute_cmd from recipients_cmd 

This refactor is to pave the way for the addition of the new
'--header-cmd' option to the send-email command.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Maxim Cournoyer 2023-05-01 10:38:46 -04:00 committed by Junio C Hamano
parent 48d89b51b3
commit 03056ce796
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
git-send-email.perl
View File

@ -2021,15 +2021,29 @@ sub process_file {
}
}
# Execute a command and return its output lines as an array.
sub execute_cmd {
my ($prefix, $cmd, $file) = @_;
my @lines = ();
open my $fh, "-|", "$cmd \Q$file\E"
or die sprintf(__("(%s) Could not execute '%s'"), $prefix, $cmd);
while (my $line = <$fh>) {
last if $line =~ /^$/;
push @lines, $line;
}
close $fh
or die sprintf(__("(%s) failed to close pipe to '%s'"), $prefix, $cmd);
return @lines;
}
# Execute a command (e.g. $to_cmd) to get a list of email addresses
# and return a results array
sub recipients_cmd {
my ($prefix, $what, $cmd, $file) = @_;
my @lines = ();
my @addresses = ();
open my $fh, "-|", "$cmd \Q$file\E"
or die sprintf(__("(%s) Could not execute '%s'"), $prefix, $cmd);
while (my $address = <$fh>) {
@lines = execute_cmd($prefix, $cmd, $file);
for my $address (@lines) {
$address =~ s/^\s*//g;
$address =~ s/\s*$//g;
$address = sanitize_address($address);
@ -2038,8 +2052,6 @@ sub recipients_cmd {
printf(__("(%s) Adding %s: %s from: '%s'\n"),
$prefix, $what, $address, $cmd) unless $quiet;
}
close $fh
or die sprintf(__("(%s) failed to close pipe to '%s'"), $prefix, $cmd);
return @addresses;
}