Re: [PATCH v3] send-email: recognize absolute path on Windows
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 16, 2014, 17:03 UTC
- Message-ID
- <xmqqfvldi4ue.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <1397635698-6252-1-git-send-email-kusmabite@gmail.com>
Erik Faye-Lund <kusmabite@gmail.com> writes:
Show 10 quoted lines
> So let's manually check for these in that case, and fall back to
> the File::Spec-helper on other platforms (e.g Win32 with native
> Perl)
> ...
> +sub file_name_is_absolute {
> + my ($path) = @_;
> +
> + # msys does not grok DOS drive-prefixes
> + if ($^O eq 'msys') {
> + return ($path =~ m#^/# || $path =~ m#[a-zA-Z]\:#)Shouldn't the latter also be anchored at the beginning of the string with a leading "^"?
> + } > + > + require File::Spec::Functions; > + return File::Spec::Functions::file_name_is_absolute($path);
We already "use File::Spec qw(something else)" at the beginning, no? Why not throw file_name_is_absolute into that qw() instead?
Show 27 quoted lines
> +}
> +
> # Returns 1 if the message was sent, and 0 otherwise.
> # In actuality, the whole program dies when there
> # is an error sending a message.
> @@ -1197,7 +1209,7 @@ X-Mailer: git-send-email $gitversion
>
> if ($dry_run) {
> # We don't want to send the email.
> - } elsif ($smtp_server =~ m#^/#) {
> + } elsif (file_name_is_absolute($smtp_server)) {
> my $pid = open my $sm, '|-';
> defined $pid or die $!;
> if (!$pid) {
> @@ -1271,7 +1283,7 @@ X-Mailer: git-send-email $gitversion
> printf (($dry_run ? "Dry-" : "")."Sent %s\n", $subject);
> } else {
> print (($dry_run ? "Dry-" : "")."OK. Log says:\n");
> - if ($smtp_server !~ m#^/#) {
> + if (!file_name_is_absolute($smtp_server)) {
> print "Server: $smtp_server\n";
> print "MAIL FROM:<$raw_from>\n";
> foreach my $entry (@recipients) {
> --
> 1.9.0.msysgit.0
>
> -- -- -- *** Please reply-to-all at all times *** *** (do not pretend to know who is subscribed and who is not) *** *** Please avoid top-posting. *** The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free. You received this message because you are subscribed to the Google Groups "msysGit" group. To post to this group, send email to msysgit@googlegroups.com To unsubscribe from this group, send email to msysgit+unsubscribe@googlegroups.com For more options, and view previous threads, visit this group at http://groups.google.com/group/msysgit?hl=en_US?hl=en --- You received this message because you are subscribed to the Google Groups "msysGit" group. To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com. For more options, visit https://groups.google.com/d/optout.