In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/85957ede76e8e7f96253174e1f955606bfca2d80?hp=cc289c9e6344a3d6386f2ed69849186df75de054>

- Log -----------------------------------------------------------------
commit 85957ede76e8e7f96253174e1f955606bfca2d80
Author: Craig A. Berry <craigbe...@mac.com>
Date:   Sat Aug 12 08:11:47 2017 -0500

    Use temp files with extensions in rt131211.t on VMS.
    
    On VMS, a file without an extension is really a file with an
    explicitly specified "." indicating zero-length extension. This
    was causing tests to fail with, for example, "abbbbbbbbbbbbc" not
    matching "abbbbbbbbbbbbc." as returned by glob.
    
    So add a ".tmp" extension to all the temp files on VMS only.

M       ext/File-Glob/t/rt131211.t

commit 774e46341e1837e52ab0da20f9a8d251f2e27065
Author: Craig A. Berry <craigbe...@mac.com>
Date:   Sat Aug 12 08:01:16 2017 -0500

    Fix missing break in tovmsspec.
    
    When encountering a question mark in a filespec being converted
    from Unix to VMS format, we were inadvertently adding an escaped
    space because of a missing break in a switch.

M       ext/VMS-Filespec/t/filespec.t
M       vms/vms.c
-----------------------------------------------------------------------

Summary of changes:
 ext/File-Glob/t/rt131211.t    | 3 +++
 ext/VMS-Filespec/t/filespec.t | 1 +
 vms/vms.c                     | 1 +
 3 files changed, 5 insertions(+)

diff --git a/ext/File-Glob/t/rt131211.t b/ext/File-Glob/t/rt131211.t
index 9886cb4758..ed1b321f1d 100644
--- a/ext/File-Glob/t/rt131211.t
+++ b/ext/File-Glob/t/rt131211.t
@@ -28,6 +28,9 @@ my @files= (
 );
 
 
+# VMS needs a real extension.
+map { $_ .= '.tmp' } @files if $^O eq 'VMS';
+
 foreach (@files) {
     open(my $f, ">", catfile $path, $_);
 }
diff --git a/ext/VMS-Filespec/t/filespec.t b/ext/VMS-Filespec/t/filespec.t
index 6d421e1ad9..cfb0aaa795 100644
--- a/ext/VMS-Filespec/t/filespec.t
+++ b/ext/VMS-Filespec/t/filespec.t
@@ -137,6 +137,7 @@ foo-bar-0^.01/      vmsify [.foo-bar-0_01] [.foo-bar-0^.01]
 +foo.tmp       vmsify ^+foo.tmp ^
 ../foo\ \ bar/ vmsify [-.foo^_^_bar] ^
 ./foo.tmp      vmsify []foo.tmp ^
+x/r*???????    vmsify [.x]r*??????? ^
 
 # Fileifying directory specs
 __down_:[__the_.__garden_.__path_]     fileify 
__down_:[__the_.__garden_]__path_.dir;1 ^
diff --git a/vms/vms.c b/vms/vms.c
index 2945791ded..5ca4d7c0e3 100644
--- a/vms/vms.c
+++ b/vms/vms.c
@@ -8731,6 +8731,7 @@ int_tovmsspec(const char *path, char *rslt, int dir_flag, 
int * utf8_flag)
        else
          *(cp1++) = '?';
        cp2++;
+       break;
     case ' ':
        if (cp2 >= path && (cp2 == path || *(cp2-1) != '^')) /* not previously 
escaped */
            *(cp1)++ = '^';

--
Perl5 Master Repository

Reply via email to