Re: Re* [PATCH] send-email: recognize absolute path on Windows
Erik Faye-Lund writes: > ... But, ugh. > Modifying File::Spec into thinking msys is Win32 doesn't seems to > work, OK, I'll drop the tentative version and wait for a proper reroll. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Re* [PATCH] send-email: recognize absolute path on Windows
On Tue, Apr 15, 2014 at 10:37 PM, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> Thanks, both. I'd expect another round then?
>>
>> -- >8 --
>> From: Erik Faye-Lund
>>
>> On Windows, absolute paths might start with a DOS drive prefix,
>> which these checks fail to recognize.
>>
>> Use file_name_is_absolute from File::Spec::Functions for
>> portability. The Perl module msysgit has been shipping needs to be
>> updated for this patch to work, though.
>>
>> Signed-off-by: Erik Faye-Lund
>> Helepd-by: Johannes Sixt
>> ---
>>
>> git-send-email.perl | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/git-send-email.perl b/git-send-email.perl
>> index fdb0029..eda3917 100755
>> --- a/git-send-email.perl
>> +++ b/git-send-email.perl
>> @@ -25,7 +25,7 @@
>> use Data::Dumper;
>> use Term::ANSIColor;
>> use File::Temp qw/ tempdir tempfile /;
>> -use File::Spec::Functions qw(catfile);
>> +use File::Spec::Functions qw(catfile file_name_is_absolute);
>> use Error qw(:try);
>> use Git;
>>
>> @@ -1197,7 +1197,7 @@ sub send_message {
>>
>> 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 +1271,7 @@ sub send_message {
>> 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)) {
>
> Obviously this has to be "!file_name_is_absolute($smtp_server)" ;-)
>
Heh, yeah. Apart from that, your patch is identical to mine. But, ugh.
Modifying File::Spec into thinking msys is Win32 doesn't seems to
work, as I get other random path-errors in that case:
"Error in tempdir() using \tmp\XX: Parent directory (\tmp) is
not a directory at /libexec/git-core/git-send-email line 554"
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Re* [PATCH] send-email: recognize absolute path on Windows
Junio C Hamano writes:
> Thanks, both. I'd expect another round then?
>
> -- >8 --
> From: Erik Faye-Lund
>
> On Windows, absolute paths might start with a DOS drive prefix,
> which these checks fail to recognize.
>
> Use file_name_is_absolute from File::Spec::Functions for
> portability. The Perl module msysgit has been shipping needs to be
> updated for this patch to work, though.
>
> Signed-off-by: Erik Faye-Lund
> Helepd-by: Johannes Sixt
> ---
>
> git-send-email.perl | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/git-send-email.perl b/git-send-email.perl
> index fdb0029..eda3917 100755
> --- a/git-send-email.perl
> +++ b/git-send-email.perl
> @@ -25,7 +25,7 @@
> use Data::Dumper;
> use Term::ANSIColor;
> use File::Temp qw/ tempdir tempfile /;
> -use File::Spec::Functions qw(catfile);
> +use File::Spec::Functions qw(catfile file_name_is_absolute);
> use Error qw(:try);
> use Git;
>
> @@ -1197,7 +1197,7 @@ sub send_message {
>
> 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 +1271,7 @@ sub send_message {
> 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)) {
Obviously this has to be "!file_name_is_absolute($smtp_server)" ;-)
> print "Server: $smtp_server\n";
> print "MAIL FROM:<$raw_from>\n";
> foreach my $entry (@recipients) {
>
> --
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] send-email: recognize absolute path on Windows
On Tue, Apr 15, 2014 at 12:42 PM, Erik Faye-Lund wrote: > On Tue, Apr 15, 2014 at 12:32 PM, Johannes Sixt wrote: >> Am 4/15/2014 10:44, schrieb Erik Faye-Lund: >>> From: Erik Faye-Lund >>> >>> On Windows, absolute paths might start with a DOS drive prefix, >>> which this check fails to recognize. >>> >>> Unfortunately, we cannot simply use the file_name_is_absolute >>> helper in File::Spec::Functions, because Git for Windows has an >>> MSYS-based Perl, where this helper doesn't grok DOS >>> drive-prefixes. >>> >>> 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) >>> >>> Signed-off-by: Erik Faye-Lund >>> --- >>> >>> Here's a patch that we've been running with a variation of in >>> Git for Windows for a while. That version wasn't quite palatable, >>> as it recognized DOS drive-prefixes on all platforms. >> >> Did you consider patching msysgit's lib/perl5/5.8.8/File/Spec.pm by >> inserting a line "msys => 'Win32'," near the top of the file; it is the >> hash table that decides which path "style" is selected depending on $^O. >> Then File::Spec->file_name_is_absolute($path) could be used without a >> wrapper. > > I did not, but that works, and is IMO much nicer. Thanks for the idea! Actually, after having tried that, other stuff starts to break... So back to the drawing-board. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re* [PATCH] send-email: recognize absolute path on Windows
Erik Faye-Lund writes:
>>> Here's a patch that we've been running with a variation of in
>>> Git for Windows for a while. That version wasn't quite palatable,
>>> as it recognized DOS drive-prefixes on all platforms.
>>
>> Did you consider patching msysgit's lib/perl5/5.8.8/File/Spec.pm by
>> inserting a line "msys => 'Win32'," near the top of the file; it is the
>> hash table that decides which path "style" is selected depending on $^O.
>> Then File::Spec->file_name_is_absolute($path) could be used without a
>> wrapper.
>
> I did not, but that works, and is IMO much nicer. Thanks for the idea!
> ...
>> There's another instance in the non-$quiet code path around line 1275 that
>> needs the same treatment.
>
> Good catch, thanks!
Thanks, both. I'd expect another round then?
-- >8 --
From: Erik Faye-Lund
On Windows, absolute paths might start with a DOS drive prefix,
which these checks fail to recognize.
Use file_name_is_absolute from File::Spec::Functions for
portability. The Perl module msysgit has been shipping needs to be
updated for this patch to work, though.
Signed-off-by: Erik Faye-Lund
Helepd-by: Johannes Sixt
---
git-send-email.perl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index fdb0029..eda3917 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -25,7 +25,7 @@
use Data::Dumper;
use Term::ANSIColor;
use File::Temp qw/ tempdir tempfile /;
-use File::Spec::Functions qw(catfile);
+use File::Spec::Functions qw(catfile file_name_is_absolute);
use Error qw(:try);
use Git;
@@ -1197,7 +1197,7 @@ sub send_message {
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 +1271,7 @@ sub send_message {
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) {
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] send-email: recognize absolute path on Windows
On Tue, Apr 15, 2014 at 12:32 PM, Johannes Sixt wrote:
> Am 4/15/2014 10:44, schrieb Erik Faye-Lund:
>> From: Erik Faye-Lund
>>
>> On Windows, absolute paths might start with a DOS drive prefix,
>> which this check fails to recognize.
>>
>> Unfortunately, we cannot simply use the file_name_is_absolute
>> helper in File::Spec::Functions, because Git for Windows has an
>> MSYS-based Perl, where this helper doesn't grok DOS
>> drive-prefixes.
>>
>> 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)
>>
>> Signed-off-by: Erik Faye-Lund
>> ---
>>
>> Here's a patch that we've been running with a variation of in
>> Git for Windows for a while. That version wasn't quite palatable,
>> as it recognized DOS drive-prefixes on all platforms.
>
> Did you consider patching msysgit's lib/perl5/5.8.8/File/Spec.pm by
> inserting a line "msys => 'Win32'," near the top of the file; it is the
> hash table that decides which path "style" is selected depending on $^O.
> Then File::Spec->file_name_is_absolute($path) could be used without a wrapper.
I did not, but that works, and is IMO much nicer. Thanks for the idea!
>>
>> git-send-email.perl | 14 +-
>> 1 file changed, 13 insertions(+), 1 deletion(-)
>>
>> diff --git a/git-send-email.perl b/git-send-email.perl
>> index fdb0029..c4d85a7 100755
>> --- a/git-send-email.perl
>> +++ b/git-send-email.perl
>> @@ -1113,6 +1113,18 @@ sub ssl_verify_params {
>> }
>> }
>>
>> +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]\:#)
>> + }
>> +
>> + require File::Spec::Functions;
>> + return File::Spec::Functions::file_name_is_absolute($path);
>> +}
>> +
>> # 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) {
>>
>
> There's another instance in the non-$quiet code path around line 1275 that
> needs the same treatment.
Good catch, thanks!
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] send-email: recognize absolute path on Windows
Am 4/15/2014 10:44, schrieb Erik Faye-Lund:
> From: Erik Faye-Lund
>
> On Windows, absolute paths might start with a DOS drive prefix,
> which this check fails to recognize.
>
> Unfortunately, we cannot simply use the file_name_is_absolute
> helper in File::Spec::Functions, because Git for Windows has an
> MSYS-based Perl, where this helper doesn't grok DOS
> drive-prefixes.
>
> 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)
>
> Signed-off-by: Erik Faye-Lund
> ---
>
> Here's a patch that we've been running with a variation of in
> Git for Windows for a while. That version wasn't quite palatable,
> as it recognized DOS drive-prefixes on all platforms.
Did you consider patching msysgit's lib/perl5/5.8.8/File/Spec.pm by
inserting a line "msys => 'Win32'," near the top of the file; it is the
hash table that decides which path "style" is selected depending on $^O.
Then File::Spec->file_name_is_absolute($path) could be used without a wrapper.
>
> git-send-email.perl | 14 +-
> 1 file changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/git-send-email.perl b/git-send-email.perl
> index fdb0029..c4d85a7 100755
> --- a/git-send-email.perl
> +++ b/git-send-email.perl
> @@ -1113,6 +1113,18 @@ sub ssl_verify_params {
> }
> }
>
> +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]\:#)
> + }
> +
> + require File::Spec::Functions;
> + return File::Spec::Functions::file_name_is_absolute($path);
> +}
> +
> # 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) {
>
There's another instance in the non-$quiet code path around line 1275 that
needs the same treatment.
-- Hannes
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
