X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fio%2Fcrlf.t;h=4c97a91eaf1eff27d38d7b1ad31cda94945272ab;hb=f1b865f4a815f28f49710cf653f8184935d29d8e;hp=0968b3653d84f9934e1ad2c7a52cba9d945a9047;hpb=6b5da1a3dd326d0fe0f59ec1ea7b9b5d72b2a49e;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/io/crlf.t b/t/io/crlf.t
index 0968b36..4c97a91 100644
--- a/t/io/crlf.t
+++ b/t/io/crlf.t
@@ -9,35 +9,75 @@ use Config;
 
 require "test.pl";
 
-my $file = "crlf$$.dat";
-END {
- unlink($file);
-}
+my $file = tempfile();
 
 if (find PerlIO::Layer 'perlio') {
- plan(tests => 6);
- ok(open(FOO,">:crlf",$file));
- ok(print FOO 'a'.((('a' x 14).qq{\n}) x 2000) || close(FOO));
- ok(open(FOO,"<:crlf",$file));
- my $seen = 0;
- my $cr = "\r";
- while (<FOO>)
-  {
-   $seen += tr/[\015]//;
-  }
- is($seen,0);
- binmode(FOO);
- seek(FOO,0,0);
- $seen = 0;
- while (<FOO>)
-  {
-   $seen += tr/[\015]//;
-  }
- is($seen,2000);
- ok(close(FOO));
+    plan(tests => 16);
+    ok(open(FOO,">:crlf",$file));
+    ok(print FOO 'a'.((('a' x 14).qq{\n}) x 2000) || close(FOO));
+    ok(open(FOO,"<:crlf",$file));
+
+    my $text;
+    { local $/; $text = <FOO> }
+    is(count_chars($text, "\015\012"), 0);
+    is(count_chars($text, "\n"), 2000);
+
+    binmode(FOO);
+    seek(FOO,0,0);
+    { local $/; $text = <FOO> }
+    is(count_chars($text, "\015\012"), 2000);
+
+    SKIP:
+    {
+	skip("miniperl can't rely on loading PerlIO::scalar")
+	if $ENV{PERL_CORE_MINITEST};
+	skip("no PerlIO::scalar") unless $Config{extensions} =~ m!\bPerlIO/scalar\b!;
+	require PerlIO::scalar;
+	my $fcontents = join "", map {"$_\015\012"} "a".."zzz";
+	open my $fh, "<:crlf", \$fcontents;
+	local $/ = "xxx";
+	local $_ = <$fh>;
+	my $pos = tell $fh; # pos must be behind "xxx", before "\nxxy\n"
+	seek $fh, $pos, 0;
+	$/ = "\n";
+	$s = <$fh>.<$fh>;
+	ok($s eq "\nxxy\n");
+    }
+
+    ok(close(FOO));
+
+    # binmode :crlf should not cumulate.
+    # Try it first once and then twice so that even UNIXy boxes
+    # get to exercise this, for DOSish boxes even once is enough.
+    # Try also pushing :utf8 first so that there are other layers
+    # in between (this should not matter: CRLF layers still should
+    # not accumulate).
+    for my $utf8 ('', ':utf8') {
+	for my $binmode (1..2) {
+	    open(FOO, ">$file");
+	    # require PerlIO; print PerlIO::get_layers(FOO), "\n";
+	    binmode(FOO, "$utf8:crlf") for 1..$binmode;
+	    # require PerlIO; print PerlIO::get_layers(FOO), "\n";
+	    print FOO "Hello\n";
+	    close FOO;
+	    open(FOO, "<$file");
+	    binmode(FOO);
+	    my $foo = scalar <FOO>;
+	    close FOO;
+	    print join(" ", "#", map { sprintf("%02x", $_) } unpack("C*", $foo)),
+	    "\n";
+	    ok($foo =~ /\x0d\x0a$/);
+	    ok($foo !~ /\x0d\x0d/);
+	}
+    }
 }
 else {
- skip_all("No perlio, so no :crlf");
+    skip_all("No perlio, so no :crlf");
 }
 
-
+sub count_chars {
+    my($text, $chars) = @_;
+    my $seen = 0;
+    $seen++ while $text =~ /$chars/g;
+    return $seen;
+}