Re: [PATCH v3] send-email: recognize absolute path on Windows

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 16, 2014, 17:19 UTC
Message-ID: <xmqqbnw1i43p.fsf@gitster.dls.corp.google.com>
In-Reply-To: <xmqqfvldi4ue.fsf@gitster.dls.corp.google.com>

Junio C Hamano <gitster@pobox.com> writes:

Show 23 quoted lines

> Erik Faye-Lund <kusmabite@gmail.com> writes:
>
>> 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?

Ahh, OK, if you did so, you won't have any place to hook the "only on msys do this" trick into.

It somehow feels somewhat confusing that we define a sub with the same name as the system one, while not overriding it entirely but delegate back to the system one. I am debating myself if it is more obvious if it is done this way:

        use File::Spec::Functions qw(file_name_is_absolute);
        if ($^O eq 'msys') {
                sub file_name_is_absolute {
                	return $_[0] =~ /^\// || $_[0] =~ /^[A-Z]:/i;
                }
        }

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.