Maxim Cournoyer <maxim.cournoyer@xxxxxxxxx> writes:
> This refactor is to pave the way for the addition of the new
> '--header-cmd' option to the send-email command.
> ---
> git-send-email.perl | 26 ++++++++++++++++++++------
> 1 file changed, 20 insertions(+), 6 deletions(-)
Missing sign-off?
> diff --git a/git-send-email.perl b/git-send-email.perl
> index fd8cd0d46f..d2febbda1f 100755
> --- a/git-send-email.perl
> +++ b/git-send-email.perl
> @@ -2,6 +2,7 @@
> #
> # Copyright 2002,2005 Greg Kroah-Hartman <greg@xxxxxxxxx>
> # Copyright 2005 Ryan Anderson <ryan@xxxxxxxxxxxxxx>
> +# Copyright 2023 Maxim Cournoyer <maxim.cournoyer@xxxxxxxxx>
> #
> # GPL v2 (See COPYING)
> #
> @@ -2006,15 +2007,30 @@ sub process_file {
> }
> }
>
> +# Execute a command (e.g., $x_cmd) 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);
> @@ -2023,8 +2039,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;
> }
