diff options
author | Nick Ing-Simmons <nik@tiuk.ti.com> | 2000-12-09 19:47:30 +0000 |
---|---|---|
committer | Nick Ing-Simmons <nik@tiuk.ti.com> | 2000-12-09 19:47:30 +0000 |
commit | 7d59b7e40bca518078f3e97c802950b76d52efa2 (patch) | |
tree | 53c65c30afe57d62fc8ebfa20197f1c74c0c9fd4 /perlio.c | |
parent | bbc28b27949817e8e7461c0a92c6108632259a4b (diff) | |
download | perl-7d59b7e40bca518078f3e97c802950b76d52efa2.tar.gz |
Make print, syswrite, send, readline, getc honour utf8-ness of PerlIO.
(sysread, recv and write i.e. formats still to do...)
Allow :utf8 or :bytes in PerlIO_apply_layers() so that
open($fh,">:utf8","name")
etc. work. - "applying" those just sets/clears the UTF8 bit of the top layer,
so no extra overhead is involved.
Tweak t/comp/require.t to add a 'use bytes' to permit its dubious writing of BOM
to a non-utf8 stream.
Add initial io/utf8.t
Fix SvPVutf8() - sv_2pv() was not expecting to be called with something
that was already SvPOK() - (we just fossiked with SvUTF8 bit). Fix that
and also just use the SvPV macro in sv_2pvutf8() to avoid the issue/overhead.
p4raw-id: //depot/perlio@8054
Diffstat (limited to 'perlio.c')
-rw-r--r-- | perlio.c | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -572,6 +572,14 @@ PerlIO_apply_layers(pTHX_ PerlIO *f, const char *mode, const char *names) } } } + else if ((e - s) == 4 && strncmp(s,"utf8",4) == 0) + { + PerlIOBase(f)->flags |= PERLIO_F_UTF8; + } + else if ((e - s) == 5 && strncmp(s,"bytes",5) == 0) + { + PerlIOBase(f)->flags &= ~PERLIO_F_UTF8; + } else { SV *layer = PerlIO_find_layer(s,e-s); @@ -606,7 +614,7 @@ PerlIO_binmode(pTHX_ PerlIO *f, int iotype, int mode, const char *names) { PerlIO_debug("PerlIO_binmode f=%p %s %c %x %s\n", f,PerlIOBase(f)->tab->name,iotype,mode, (names) ? names : "(Null)"); - if (!names || (O_TEXT != O_BINARY && mode & O_BINARY)) + if (!names || (O_TEXT != O_BINARY && (mode & O_BINARY))) { PerlIO *top = f; PerlIOl *l; |