X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perlio.c;h=005e7f81e1e30e722a509cc20abc5904d6c9ae03;hb=19d75edaf35287dfc8bc9b6f13bb73a2ca28b226;hp=8af1cf3b3b9c7686b839917256625efdb6c477f9;hpb=de6cd452fde5aaf57e339f71b33b6a0852f0f96d;p=p5sagit%2Fp5-mst-13.2.git diff --git a/perlio.c b/perlio.c index 8af1cf3..005e7f8 100644 --- a/perlio.c +++ b/perlio.c @@ -1,12 +1,23 @@ /* perlio.c * - * Copyright (c) 1996-2000, Nick Ing-Simmons + * Copyright (c) 1996-2001, Nick Ing-Simmons * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. * */ +/* If we have ActivePerl-like PERL_IMPLICIT_SYS then we need + a dTHX to get at the dispatch tables, even when we do not + need it for other reasons. + Invent a dSYS macro to abstract this out +*/ +#ifdef PERL_IMPLICIT_SYS +#define dSYS dTHX +#else +#define dSYS dNOOP +#endif + #define VOIDUSED 1 #ifdef PERL_MICRO # include "uconfig.h" @@ -28,26 +39,18 @@ #define PERL_IN_PERLIO_C #include "perl.h" -#ifndef PERLIO_LAYERS -int -PerlIO_apply_layers(pTHX_ PerlIO *f, const char *mode, const char *names) -{ - if (!names || !*names || strEQ(names,":crlf") || strEQ(names,":raw")) - { - return 0; - } - Perl_croak(aTHX_ "Cannot apply \"%s\" in non-PerlIO perl",names); - /* NOTREACHED */ - return -1; -} +#undef PerlMemShared_calloc +#define PerlMemShared_calloc(x,y) calloc(x,y) +#undef PerlMemShared_free +#define PerlMemShared_free(x) free(x) int -PerlIO_binmode(pTHX_ PerlIO *fp, int iotype, int mode, const char *names) +perlsio_binmode(FILE *fp, int iotype, int mode) { /* This used to be contents of do_binmode in doio.c */ #ifdef DOSISH # if defined(atarist) || defined(__MINT__) - if (!PerlIO_flush(fp)) { + if (!fflush(fp)) { if (mode & O_BINARY) ((FILE*)fp)->_flag |= _IOBIN; else @@ -56,7 +59,8 @@ PerlIO_binmode(pTHX_ PerlIO *fp, int iotype, int mode, const char *names) } return 0; # else - if (PerlLIO_setmode(PerlIO_fileno(fp), mode) != -1) { + dTHX; + if (PerlLIO_setmode(fileno(fp), mode) != -1) { # if defined(WIN32) && defined(__BORLANDC__) /* The translation mode of the stream is maintained independent * of the translation mode of the fd in the Borland RTL (heavy @@ -64,11 +68,11 @@ PerlIO_binmode(pTHX_ PerlIO *fp, int iotype, int mode, const char *names) * set the mode explicitly for the stream (though they don't * document this anywhere). GSAR 97-5-24 */ - PerlIO_seek(fp,0L,0); + fseek(fp,0L,0); if (mode & O_BINARY) - ((FILE*)fp)->flags |= _F_BIN; + fp->flags |= _F_BIN; else - ((FILE*)fp)->flags &= ~ _F_BIN; + fp->flags &= ~ _F_BIN; # endif return 1; } @@ -87,12 +91,71 @@ PerlIO_binmode(pTHX_ PerlIO *fp, int iotype, int mode, const char *names) #endif } +#ifndef PERLIO_LAYERS +int +PerlIO_apply_layers(pTHX_ PerlIO *f, const char *mode, const char *names) +{ + if (!names || !*names || strEQ(names,":crlf") || strEQ(names,":raw")) + { + return 0; + } + Perl_croak(aTHX_ "Cannot apply \"%s\" in non-PerlIO perl",names); + /* NOTREACHED */ + return -1; +} + +void +PerlIO_destruct(pTHX) +{ +} + +int +PerlIO_binmode(pTHX_ PerlIO *fp, int iotype, int mode, const char *names) +{ +#ifdef USE_SFIO + return 1; +#else + return perlsio_binmode(fp,iotype,mode); +#endif +} +/* De-mux PerlIO_openn() into fdopen, freopen and fopen type entries */ +PerlIO * +PerlIO_openn(pTHX_ const char *layers, const char *mode, int fd, int imode, int perm, PerlIO *old, int narg, SV **args) +{ + if (narg == 1) + { + if (*args == &PL_sv_undef) + return PerlIO_tmpfile(); + else + { + char *name = SvPV_nolen(*args); + if (*mode == '#') + { + fd = PerlLIO_open3(name,imode,perm); + if (fd >= 0) + return PerlIO_fdopen(fd,(char *)mode+1); + } + else if (old) + { + return PerlIO_reopen(name,mode,old); + } + else + { + return PerlIO_open(name,mode); + } + } + } + else + { + return PerlIO_fdopen(fd,(char *)mode); + } + return NULL; +} #endif -#if !defined(PERL_IMPLICIT_SYS) #ifdef PERLIO_IS_STDIO @@ -147,6 +210,28 @@ PerlIO_init(void) sfset(sfstdout,SF_SHARE,0); } +PerlIO * +PerlIO_importFILE(FILE *stdio, int fl) +{ + int fd = fileno(stdio); + PerlIO *r = PerlIO_fdopen(fd,"r+"); + return r; +} + +FILE * +PerlIO_findFILE(PerlIO *pio) +{ + int fd = PerlIO_fileno(pio); + FILE *f = fdopen(fd,"r+"); + PerlIO_flush(pio); + if (!f && errno == EINVAL) + f = fdopen(fd,"w"); + if (!f && errno == EINVAL) + f = fdopen(fd,"r"); + return f; +} + + #else /* USE_SFIO */ /*======================================================================================*/ /* Implement all the PerlIO interface ourselves. @@ -171,6 +256,7 @@ PerlIO_debug(const char *fmt,...) { static int dbg = 0; va_list ap; + dSYS; va_start(ap,fmt); if (!dbg) { @@ -207,12 +293,15 @@ PerlIO_debug(const char *fmt,...) PerlIO *_perlio = NULL; #define PERLIO_TABLE_SIZE 64 + + PerlIO * -PerlIO_allocate(void) +PerlIO_allocate(pTHX) { /* Find a free slot in the table, allocating new table as necessary */ - PerlIO **last = &_perlio; + PerlIO **last; PerlIO *f; + last = &_perlio; while ((f = *last)) { int i; @@ -225,21 +314,23 @@ PerlIO_allocate(void) } } } - Newz('I',f,PERLIO_TABLE_SIZE,PerlIO); + f = PerlMemShared_calloc(PERLIO_TABLE_SIZE,sizeof(PerlIO)); if (!f) - return NULL; + { + return NULL; + } *last = f; return f+1; } void -PerlIO_cleantable(PerlIO **tablep) +PerlIO_cleantable(pTHX_ PerlIO **tablep) { PerlIO *table = *tablep; if (table) { int i; - PerlIO_cleantable((PerlIO **) &(table[0])); + PerlIO_cleantable(aTHX_ (PerlIO **) &(table[0])); for (i=PERLIO_TABLE_SIZE-1; i > 0; i--) { PerlIO *f = table+i; @@ -248,7 +339,7 @@ PerlIO_cleantable(PerlIO **tablep) PerlIO_close(f); } } - Safefree(table); + PerlMemShared_free(table); *tablep = NULL; } } @@ -257,60 +348,95 @@ HV *PerlIO_layer_hv; AV *PerlIO_layer_av; void -PerlIO_cleanup(void) +PerlIO_cleanup_layers(pTHXo_ void *data) +{ + PerlIO_layer_hv = Nullhv; + PerlIO_layer_av = Nullav; +} + +void +PerlIO_cleanup() +{ + dTHX; + PerlIO_cleantable(aTHX_ &_perlio); +} + +void +PerlIO_destruct(pTHX) { - PerlIO_cleantable(&_perlio); + PerlIO **table = &_perlio; + PerlIO *f; + while ((f = *table)) + { + int i; + table = (PerlIO **)(f++); + for (i=1; i < PERLIO_TABLE_SIZE; i++) + { + PerlIO *x = f; + PerlIOl *l; + while ((l = *x)) + { + if (l->tab->kind & PERLIO_K_DESTRUCT) + { + PerlIO_debug("Destruct popping %s\n",l->tab->name); + PerlIO_flush(x); + PerlIO_pop(aTHX_ x); + } + else + { + x = PerlIONext(x); + } + } + f++; + } + } } void -PerlIO_pop(PerlIO *f) +PerlIO_pop(pTHX_ PerlIO *f) { PerlIOl *l = *f; if (l) { - (*l->tab->Popped)(f); + PerlIO_debug("PerlIO_pop f=%p %s\n",f,l->tab->name); + if (l->tab->Popped) + (*l->tab->Popped)(f); *f = l->next; - Safefree(l); + PerlMemShared_free(l); } } /*--------------------------------------------------------------------------------------*/ /* XS Interface for perl code */ -XS(XS_perlio_import) -{ - dXSARGS; - GV *gv = CvGV(cv); - char *s = GvNAME(gv); - STRLEN l = GvNAMELEN(gv); - PerlIO_debug("%.*s\n",(int) l,s); - XSRETURN_EMPTY; -} - -XS(XS_perlio_unimport) -{ - dXSARGS; - GV *gv = CvGV(cv); - char *s = GvNAME(gv); - STRLEN l = GvNAMELEN(gv); - PerlIO_debug("%.*s\n",(int) l,s); - XSRETURN_EMPTY; -} - SV * -PerlIO_find_layer(const char *name, STRLEN len) +PerlIO_find_layer(pTHX_ const char *name, STRLEN len, int load) { - dTHX; SV **svp; SV *sv; - if (len <= 0) + if ((SSize_t) len <= 0) len = strlen(name); svp = hv_fetch(PerlIO_layer_hv,name,len,0); - if (svp && (sv = *svp) && SvROK(sv)) - return *svp; - return NULL; + if (!svp && load && PL_subname && PerlIO_layer_av && av_len(PerlIO_layer_av)+1 >= 2) + { + SV *pkgsv = newSVpvn("PerlIO",6); + SV *layer = newSVpvn(name,len); + ENTER; + /* The two SVs are magically freed by load_module */ + Perl_load_module(aTHX_ 0, pkgsv, Nullsv, layer, Nullsv); + LEAVE; + /* Say this is lvalue so we get an 'undef' if still not there */ + svp = hv_fetch(PerlIO_layer_hv,name,len,1); + } + if (svp && (sv = *svp)) + { + if (SvROK(sv)) + return *svp; + } + return Nullsv; } +#ifdef USE_ATTRIBUTES_FOR_PERLIO static int perlio_mg_set(pTHX_ SV *sv, MAGIC *mg) @@ -320,8 +446,7 @@ perlio_mg_set(pTHX_ SV *sv, MAGIC *mg) IO *io = GvIOn((GV *)SvRV(sv)); PerlIO *ifp = IoIFP(io); PerlIO *ofp = IoOFP(io); - AV *av = (AV *) mg->mg_obj; - Perl_warn(aTHX_ "set %_ %p %p %p",sv,io,ifp,ofp); + Perl_warn(aTHX_ "set %"SVf" %p %p %p",sv,io,ifp,ofp); } return 0; } @@ -334,8 +459,7 @@ perlio_mg_get(pTHX_ SV *sv, MAGIC *mg) IO *io = GvIOn((GV *)SvRV(sv)); PerlIO *ifp = IoIFP(io); PerlIO *ofp = IoOFP(io); - AV *av = (AV *) mg->mg_obj; - Perl_warn(aTHX_ "get %_ %p %p %p",sv,io,ifp,ofp); + Perl_warn(aTHX_ "get %"SVf" %p %p %p",sv,io,ifp,ofp); } return 0; } @@ -343,14 +467,14 @@ perlio_mg_get(pTHX_ SV *sv, MAGIC *mg) static int perlio_mg_clear(pTHX_ SV *sv, MAGIC *mg) { - Perl_warn(aTHX_ "clear %_",sv); + Perl_warn(aTHX_ "clear %"SVf,sv); return 0; } static int perlio_mg_free(pTHX_ SV *sv, MAGIC *mg) { - Perl_warn(aTHX_ "free %_",sv); + Perl_warn(aTHX_ "free %"SVf,sv); return 0; } @@ -358,7 +482,7 @@ MGVTBL perlio_vtab = { perlio_mg_get, perlio_mg_set, NULL, /* len */ - NULL, + perlio_mg_clear, perlio_mg_free }; @@ -370,17 +494,17 @@ XS(XS_io_MODIFY_SCALAR_ATTRIBUTES) MAGIC *mg; int count = 0; int i; - sv_magic(sv, (SV *)av, '~', NULL, 0); + sv_magic(sv, (SV *)av, PERL_MAGIC_ext, NULL, 0); SvRMAGICAL_off(sv); - mg = mg_find(sv,'~'); + mg = mg_find(sv, PERL_MAGIC_ext); mg->mg_virtual = &perlio_vtab; mg_magical(sv); - Perl_warn(aTHX_ "attrib %_",sv); + Perl_warn(aTHX_ "attrib %"SVf,sv); for (i=2; i < items; i++) { STRLEN len; const char *name = SvPV(ST(i),len); - SV *layer = PerlIO_find_layer(name,len); + SV *layer = PerlIO_find_layer(aTHX_ name,len,1); if (layer) { av_push(av,SvREFCNT_inc(layer)); @@ -395,216 +519,403 @@ XS(XS_io_MODIFY_SCALAR_ATTRIBUTES) XSRETURN(count); } -void -PerlIO_define_layer(PerlIO_funcs *tab) +#endif /* USE_ATTIBUTES_FOR_PERLIO */ + +SV * +PerlIO_tab_sv(pTHX_ PerlIO_funcs *tab) { - dTHX; - HV *stash = gv_stashpv("perlio::Layer", TRUE); + HV *stash = gv_stashpv("PerlIO::Layer", TRUE); SV *sv = sv_bless(newRV_noinc(newSViv(PTR2IV(tab))),stash); - hv_store(PerlIO_layer_hv,tab->name,strlen(tab->name),sv,0); + return sv; } -PerlIO_funcs * -PerlIO_default_layer(I32 n) +void +PerlIO_define_layer(pTHX_ PerlIO_funcs *tab) { - dTHX; - SV **svp; - SV *layer; - PerlIO_funcs *tab = &PerlIO_stdio; - int len; if (!PerlIO_layer_hv) { - const char *s = PerlEnv_getenv("PERLIO"); - newXS("perlio::import",XS_perlio_import,__FILE__); - newXS("perlio::unimport",XS_perlio_unimport,__FILE__); -#if 0 - newXS("io::MODIFY_SCALAR_ATTRIBUTES",XS_io_MODIFY_SCALAR_ATTRIBUTES,__FILE__); -#endif PerlIO_layer_hv = get_hv("open::layers",GV_ADD|GV_ADDMULTI); - PerlIO_layer_av = get_av("open::layers",GV_ADD|GV_ADDMULTI); - PerlIO_define_layer(&PerlIO_unix); - PerlIO_define_layer(&PerlIO_perlio); - PerlIO_define_layer(&PerlIO_stdio); - PerlIO_define_layer(&PerlIO_crlf); -#ifdef HAS_MMAP - PerlIO_define_layer(&PerlIO_mmap); -#endif - av_push(PerlIO_layer_av,SvREFCNT_inc(PerlIO_find_layer(PerlIO_unix.name,0))); - if (s) + } + hv_store(PerlIO_layer_hv,tab->name,strlen(tab->name),PerlIO_tab_sv(aTHX_ tab),0); + PerlIO_debug("define %s %p\n",tab->name,tab); +} + +int +PerlIO_parse_layers(pTHX_ AV *av, const char *names) +{ + if (names) + { + const char *s = names; + while (*s) { - while (*s) + while (isSPACE(*s) || *s == ':') + s++; + if (*s) { - while (*s && isSPACE((unsigned char)*s)) - s++; - if (*s) + STRLEN llen = 0; + const char *e = s; + const char *as = Nullch; + STRLEN alen = 0; + if (!isIDFIRST(*s)) + { + /* Message is consistent with how attribute lists are passed. + Even though this means "foo : : bar" is seen as an invalid separator + character. */ + char q = ((*s == '\'') ? '"' : '\''); + Perl_warn(aTHX_ "perlio: invalid separator character %c%c%c in layer specification list", q, *s, q); + return -1; + } + do + { + e++; + } while (isALNUM(*e)); + llen = e-s; + if (*e == '(') + { + int nesting = 1; + as = ++e; + while (nesting) + { + switch (*e++) + { + case ')': + if (--nesting == 0) + alen = (e-1)-as; + break; + case '(': + ++nesting; + break; + case '\\': + /* It's a nul terminated string, not allowed to \ the terminating null. + Anything other character is passed over. */ + if (*e++) + { + break; + } + /* Drop through */ + case '\0': + e--; + Perl_warn(aTHX_ "perlio: argument list not closed for layer \"%.*s\"",(int)(e - s),s); + return -1; + default: + /* boring. */ + break; + } + } + } + if (e > s) { - const char *e = s; - SV *layer; - while (*e && !isSPACE((unsigned char)*e)) - e++; - if (*s == ':') - s++; - layer = PerlIO_find_layer(s,e-s); + SV *layer = PerlIO_find_layer(aTHX_ s,llen,1); if (layer) { - PerlIO_debug("Pushing %.*s\n",(e-s),s); - av_push(PerlIO_layer_av,SvREFCNT_inc(layer)); + av_push(av,SvREFCNT_inc(layer)); + av_push(av,(as) ? newSVpvn(as,alen) : &PL_sv_undef); } - else - Perl_warn(aTHX_ "perlio: unknown layer \"%.*s\"",(e-s),s); - s = e; + else { + Perl_warn(aTHX_ "perlio: unknown layer \"%.*s\"",(int)llen,s); + return -1; + } } + s = e; } } } - len = av_len(PerlIO_layer_av); - if (len < 1) + return 0; +} + +void +PerlIO_default_buffer(pTHX_ AV *av) +{ + PerlIO_funcs *tab = &PerlIO_perlio; + if (O_BINARY != O_TEXT) + { + tab = &PerlIO_crlf; + } + else { if (PerlIO_stdio.Set_ptrcnt) { - av_push(PerlIO_layer_av,SvREFCNT_inc(PerlIO_find_layer(PerlIO_stdio.name,0))); + tab = &PerlIO_stdio; + } + } + PerlIO_debug("Pushing %s\n",tab->name); + av_push(av,SvREFCNT_inc(PerlIO_find_layer(aTHX_ tab->name,0,0))); + av_push(av,&PL_sv_undef); +} + +SV * +PerlIO_arg_fetch(pTHX_ AV *av,IV n) +{ + SV **svp = av_fetch(av,n,FALSE); + return (svp) ? *svp : Nullsv; +} + +PerlIO_funcs * +PerlIO_layer_fetch(pTHX_ AV *av,IV n,PerlIO_funcs *def) +{ + SV **svp = av_fetch(av,n,FALSE); + SV *layer; + if (svp && (layer = *svp) && SvROK(layer) && SvIOK((layer = SvRV(layer)))) + { + /* PerlIO_debug("Layer %d is %s\n",n/2,tab->name); */ + return INT2PTR(PerlIO_funcs *, SvIV(layer)); + } + if (!def) + Perl_croak(aTHX_ "panic: PerlIO layer array corrupt"); + return def; +} + +AV * +PerlIO_default_layers(pTHX) +{ + IV len; + if (!PerlIO_layer_av) + { + const char *s = (PL_tainting) ? Nullch : PerlEnv_getenv("PERLIO"); + PerlIO_layer_av = get_av("open::layers",GV_ADD|GV_ADDMULTI); + +#ifdef USE_ATTRIBUTES_FOR_PERLIO + newXS("io::MODIFY_SCALAR_ATTRIBUTES",XS_io_MODIFY_SCALAR_ATTRIBUTES,__FILE__); +#endif + + PerlIO_define_layer(aTHX_ &PerlIO_raw); + PerlIO_define_layer(aTHX_ &PerlIO_unix); + PerlIO_define_layer(aTHX_ &PerlIO_perlio); + PerlIO_define_layer(aTHX_ &PerlIO_stdio); + PerlIO_define_layer(aTHX_ &PerlIO_crlf); +#ifdef HAS_MMAP + PerlIO_define_layer(aTHX_ &PerlIO_mmap); +#endif + PerlIO_define_layer(aTHX_ &PerlIO_utf8); + PerlIO_define_layer(aTHX_ &PerlIO_byte); + av_push(PerlIO_layer_av,SvREFCNT_inc(PerlIO_find_layer(aTHX_ PerlIO_unix.name,0,0))); + av_push(PerlIO_layer_av,&PL_sv_undef); + if (s) + { + PerlIO_parse_layers(aTHX_ PerlIO_layer_av,s); } else { - av_push(PerlIO_layer_av,SvREFCNT_inc(PerlIO_find_layer(PerlIO_perlio.name,0))); + PerlIO_default_buffer(aTHX_ PerlIO_layer_av); } - len = av_len(PerlIO_layer_av); } - if (n < 0) - n += len+1; - svp = av_fetch(PerlIO_layer_av,n,0); - if (svp && (layer = *svp) && SvROK(layer) && SvIOK((layer = SvRV(layer)))) + len = av_len(PerlIO_layer_av)+1; + if (len < 2) { - tab = INT2PTR(PerlIO_funcs *, SvIV(layer)); + PerlIO_default_buffer(aTHX_ PerlIO_layer_av); + len = av_len(PerlIO_layer_av); } - /* PerlIO_debug("Layer %d is %s\n",n,tab->name); */ - return tab; + return PerlIO_layer_av; +} + + +PerlIO_funcs * +PerlIO_default_layer(pTHX_ I32 n) +{ + AV *av = PerlIO_default_layers(aTHX); + n *= 2; + if (n < 0) + n += av_len(PerlIO_layer_av)+1; + return PerlIO_layer_fetch(aTHX_ av,n, &PerlIO_stdio); } -#define PerlIO_default_top() PerlIO_default_layer(-1) -#define PerlIO_default_btm() PerlIO_default_layer(0) +#define PerlIO_default_top() PerlIO_default_layer(aTHX_ -1) +#define PerlIO_default_btm() PerlIO_default_layer(aTHX_ 0) void -PerlIO_stdstreams() +PerlIO_stdstreams(pTHX) { if (!_perlio) { - PerlIO_allocate(); - PerlIO_fdopen(0,"Ir"); - PerlIO_fdopen(1,"Iw"); - PerlIO_fdopen(2,"Iw"); + PerlIO_allocate(aTHX); + PerlIO_fdopen(0,"Ir" PERLIO_STDTEXT); + PerlIO_fdopen(1,"Iw" PERLIO_STDTEXT); + PerlIO_fdopen(2,"Iw" PERLIO_STDTEXT); } } PerlIO * -PerlIO_push(PerlIO *f,PerlIO_funcs *tab,const char *mode) +PerlIO_push(pTHX_ PerlIO *f,PerlIO_funcs *tab,const char *mode,SV *arg) { PerlIOl *l = NULL; - Newc('L',l,tab->size,char,PerlIOl); + l = PerlMemShared_calloc(tab->size,sizeof(char)); if (l) { Zero(l,tab->size,char); l->next = *f; l->tab = tab; *f = l; - if ((*l->tab->Pushed)(f,mode) != 0) + PerlIO_debug("PerlIO_push f=%p %s %s %p\n",f,tab->name, + (mode) ? mode : "(Null)",arg); + if ((*l->tab->Pushed)(f,mode,arg) != 0) { - PerlIO_pop(f); + PerlIO_pop(aTHX_ f); return NULL; } } return f; } -int -PerlIO_apply_layers(pTHX_ PerlIO *f, const char *mode, const char *names) +IV +PerlIOPop_pushed(PerlIO *f, const char *mode, SV *arg) { - if (names) + dTHX; + PerlIO_pop(aTHX_ f); + if (*f) { - const char *s = names; - while (*s) + PerlIO_flush(f); + PerlIO_pop(aTHX_ f); + return 0; + } + return -1; +} + +IV +PerlIORaw_pushed(PerlIO *f, const char *mode, SV *arg) +{ + /* Remove the dummy layer */ + dTHX; + PerlIO_pop(aTHX_ f); + /* Pop back to bottom layer */ + if (f && *f) + { + PerlIO_flush(f); + while (!(PerlIOBase(f)->tab->kind & PERLIO_K_RAW)) { - while (isSPACE(*s)) - s++; - if (*s == ':') - s++; - if (*s) + if (*PerlIONext(f)) { - const char *e = s; - while (*e && *e != ':' && !isSPACE(*e)) - e++; - if (e > s) + PerlIO_pop(aTHX_ f); + } + else + { + /* Nothing bellow - push unix on top then remove it */ + if (PerlIO_push(aTHX_ f,PerlIO_default_btm(),mode,arg)) { - if ((e - s) == 3 && strncmp(s,"raw",3) == 0) - { - /* Pop back to bottom layer */ - if (PerlIONext(f)) - { - PerlIO_flush(f); - while (PerlIONext(f)) - { - PerlIO_pop(f); - } - } - } - else - { - SV *layer = PerlIO_find_layer(s,e-s); - if (layer) - { - PerlIO_funcs *tab = INT2PTR(PerlIO_funcs *, SvIV(SvRV(layer))); - if (tab) - { - PerlIO *new = PerlIO_push(f,tab,mode); - if (!new) - return -1; - } - } - else - Perl_warn(aTHX_ "perlio: unknown layer \"%.*s\"",(int)(e-s),s); - } + PerlIO_pop(aTHX_ PerlIONext(f)); } - s = e; + break; } } + PerlIO_debug(":raw f=%p :%s\n",f,PerlIOBase(f)->tab->name); + return 0; } - return 0; + return -1; } - - -/*--------------------------------------------------------------------------------------*/ -/* Given the abstraction above the public API functions */ - int -PerlIO_binmode(pTHX_ PerlIO *fp, int iotype, int mode, const char *names) +PerlIO_apply_layera(pTHX_ PerlIO *f, const char *mode, AV *layers, IV n) { - if (!names || (O_TEXT != O_BINARY && mode & O_BINARY)) + IV max = av_len(layers)+1; + int code = 0; + while (n < max) { - PerlIO *top = fp; - PerlIOl *l; - while (l = *top) + PerlIO_funcs *tab = PerlIO_layer_fetch(aTHX_ layers,n,NULL); + if (tab) { - if (PerlIOBase(top)->tab == &PerlIO_crlf) + if (!PerlIO_push(aTHX_ f,tab,mode,PerlIOArg)) { - PerlIO_flush(top); - PerlIO_pop(top); + code = -1; break; } - top = PerlIONext(top); } + n += 2; } - return PerlIO_apply_layers(aTHX_ fp, NULL, names) == 0 ? TRUE : FALSE; + return code; } -#undef PerlIO_close +int +PerlIO_apply_layers(pTHX_ PerlIO *f, const char *mode, const char *names) +{ + int code = 0; + if (names) + { + AV *layers = newAV(); + code = PerlIO_parse_layers(aTHX_ layers,names); + if (code == 0) + { + code = PerlIO_apply_layera(aTHX_ f, mode, layers, 0); + } + SvREFCNT_dec((SV *) layers); + } + return code; +} + + +/*--------------------------------------------------------------------------------------*/ +/* Given the abstraction above the public API functions */ + +int +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))) + { + PerlIO *top = f; + PerlIOl *l; + while ((l = *top)) + { + if (PerlIOBase(top)->tab == &PerlIO_crlf) + { + PerlIO_flush(top); + PerlIOBase(top)->flags &= ~PERLIO_F_CRLF; + break; + } + top = PerlIONext(top); + } + } + return PerlIO_apply_layers(aTHX_ f, NULL, names) == 0 ? TRUE : FALSE; +} + +#undef PerlIO__close +int +PerlIO__close(PerlIO *f) +{ + if (f && *f) + return (*PerlIOBase(f)->tab->Close)(f); + else + { + SETERRNO(EBADF,SS$_IVCHAN); + return -1; + } +} + +#undef PerlIO_fdupopen +PerlIO * +PerlIO_fdupopen(pTHX_ PerlIO *f) +{ + if (f && *f) + { + char buf[8]; + int fd = PerlLIO_dup(PerlIO_fileno(f)); + PerlIO *new = PerlIO_fdopen(fd,PerlIO_modestr(f,buf)); + if (new) + { + Off_t posn = PerlIO_tell(f); + PerlIO_seek(new,posn,SEEK_SET); + } + return new; + } + else + { + SETERRNO(EBADF,SS$_IVCHAN); + return NULL; + } +} + +#undef PerlIO_close int PerlIO_close(PerlIO *f) { - int code = (*PerlIOBase(f)->tab->Close)(f); - while (*f) + dTHX; + int code = -1; + if (f && *f) { - PerlIO_pop(f); + code = (*PerlIOBase(f)->tab->Close)(f); + while (*f) + { + PerlIO_pop(aTHX_ f); + } } return code; } @@ -613,82 +924,278 @@ PerlIO_close(PerlIO *f) int PerlIO_fileno(PerlIO *f) { - return (*PerlIOBase(f)->tab->Fileno)(f); + if (f && *f) + return (*PerlIOBase(f)->tab->Fileno)(f); + else + { + SETERRNO(EBADF,SS$_IVCHAN); + return -1; + } } +static const char * +PerlIO_context_layers(pTHX_ const char *mode) +{ + const char *type = NULL; + /* Need to supply default layer info from open.pm */ + if (PL_curcop) + { + SV *layers = PL_curcop->cop_io; + if (layers) + { + STRLEN len; + type = SvPV(layers,len); + if (type && mode[0] != 'r') + { + /* Skip to write part */ + const char *s = strchr(type,0); + if (s && (s-type) < len) + { + type = s+1; + } + } + } + } + return type; +} + +static SV * +PerlIO_layer_from_ref(pTHX_ SV *sv) +{ + /* For any scalar type load the handler which is bundled with perl */ + if (SvTYPE(sv) < SVt_PVAV) + return PerlIO_find_layer(aTHX_ "Scalar",6, 1); + + /* For other types allow if layer is known but don't try and load it */ + switch (SvTYPE(sv)) + { + case SVt_PVAV: + return PerlIO_find_layer(aTHX_ "Array",5, 0); + case SVt_PVHV: + return PerlIO_find_layer(aTHX_ "Hash",4, 0); + case SVt_PVCV: + return PerlIO_find_layer(aTHX_ "Code",4, 0); + case SVt_PVGV: + return PerlIO_find_layer(aTHX_ "Glob",4, 0); + } + return Nullsv; +} + +AV * +PerlIO_resolve_layers(pTHX_ const char *layers,const char *mode,int narg, SV **args) +{ + AV *def = PerlIO_default_layers(aTHX); + int incdef = 1; + if (!_perlio) + PerlIO_stdstreams(aTHX); + if (narg) + { + SV *arg = *args; + /* If it is a reference but not an object see if we have a handler for it */ + if (SvROK(arg) && !sv_isobject(arg)) + { + SV *handler = PerlIO_layer_from_ref(aTHX_ SvRV(arg)); + if (handler) + { + def = newAV(); + av_push(def,SvREFCNT_inc(handler)); + av_push(def,&PL_sv_undef); + incdef = 0; + } + /* Don't fail if handler cannot be found + * :Via(...) etc. may do something sensible + * else we will just stringfy and open resulting string. + */ + } + } + if (!layers) + layers = PerlIO_context_layers(aTHX_ mode); + if (layers && *layers) + { + AV *av; + if (incdef) + { + IV n = av_len(def)+1; + av = newAV(); + while (n-- > 0) + { + SV **svp = av_fetch(def,n,0); + av_store(av,n,(svp) ? SvREFCNT_inc(*svp) : &PL_sv_undef); + } + } + else + { + av = def; + } + PerlIO_parse_layers(aTHX_ av,layers); + return av; + } + else + { + if (incdef) + SvREFCNT_inc(def); + return def; + } +} + +PerlIO * +PerlIO_openn(pTHX_ const char *layers, const char *mode, int fd, int imode, int perm, PerlIO *f, int narg, SV **args) +{ + if (!f && narg == 1 && *args == &PL_sv_undef) + { + if ((f = PerlIO_tmpfile())) + { + if (!layers) + layers = PerlIO_context_layers(aTHX_ mode); + if (layers && *layers) + PerlIO_apply_layers(aTHX_ f,mode,layers); + } + } + else + { + AV *layera; + IV n; + PerlIO_funcs *tab = NULL; + if (f && *f) + { + /* This is "reopen" - it is not tested as perl does not use it yet */ + PerlIOl *l = *f; + layera = newAV(); + while (l) + { + SV *arg = (l->tab->Getarg) ? (*l->tab->Getarg)(&l) : &PL_sv_undef; + av_unshift(layera,2); + av_store(layera,0,PerlIO_tab_sv(aTHX_ l->tab)); + av_store(layera,1,arg); + l = *PerlIONext(&l); + } + } + else + { + layera = PerlIO_resolve_layers(aTHX_ layers, mode, narg, args); + } + n = av_len(layera)-1; + while (n >= 0) + { + PerlIO_funcs *t = PerlIO_layer_fetch(aTHX_ layera,n,NULL); + if (t && t->Open) + { + tab = t; + break; + } + n -= 2; + } + if (tab) + { + PerlIO_debug("openn(%s,'%s','%s',%d,%x,%o,%p,%d,%p)\n", + tab->name,layers,mode,fd,imode,perm,f,narg,args); + f = (*tab->Open)(aTHX_ tab, layera, n, mode,fd,imode,perm,f,narg,args); + if (f) + { + if (n+2 < av_len(layera)+1) + { + if (PerlIO_apply_layera(aTHX_ f, mode, layera, n+2) != 0) + { + f = NULL; + } + } + } + } + SvREFCNT_dec(layera); + } + return f; +} #undef PerlIO_fdopen PerlIO * PerlIO_fdopen(int fd, const char *mode) { - PerlIO_funcs *tab = PerlIO_default_top(); - if (!_perlio) - PerlIO_stdstreams(); - return (*tab->Fdopen)(tab,fd,mode); + dTHX; + return PerlIO_openn(aTHX_ Nullch,mode,fd,0,0,NULL,0,NULL); } #undef PerlIO_open PerlIO * PerlIO_open(const char *path, const char *mode) { - PerlIO_funcs *tab = PerlIO_default_top(); - if (!_perlio) - PerlIO_stdstreams(); - return (*tab->Open)(tab,path,mode); + dTHX; + SV *name = sv_2mortal(newSVpvn(path,strlen(path))); + return PerlIO_openn(aTHX_ Nullch,mode,-1,0,0,NULL,1,&name); } #undef PerlIO_reopen PerlIO * PerlIO_reopen(const char *path, const char *mode, PerlIO *f) { - if (f) - { - PerlIO_flush(f); - if ((*PerlIOBase(f)->tab->Reopen)(path,mode,f) == 0) - { - if ((*PerlIOBase(f)->tab->Pushed)(f,mode) == 0) - return f; - } - return NULL; - } - else - return PerlIO_open(path,mode); + dTHX; + SV *name = sv_2mortal(newSVpvn(path,strlen(path))); + return PerlIO_openn(aTHX_ Nullch,mode,-1,0,0,f,1,&name); } #undef PerlIO_read SSize_t PerlIO_read(PerlIO *f, void *vbuf, Size_t count) { - return (*PerlIOBase(f)->tab->Read)(f,vbuf,count); + if (f && *f) + return (*PerlIOBase(f)->tab->Read)(f,vbuf,count); + else + { + SETERRNO(EBADF,SS$_IVCHAN); + return -1; + } } #undef PerlIO_unread SSize_t PerlIO_unread(PerlIO *f, const void *vbuf, Size_t count) { - return (*PerlIOBase(f)->tab->Unread)(f,vbuf,count); + if (f && *f) + return (*PerlIOBase(f)->tab->Unread)(f,vbuf,count); + else + { + SETERRNO(EBADF,SS$_IVCHAN); + return -1; + } } #undef PerlIO_write SSize_t PerlIO_write(PerlIO *f, const void *vbuf, Size_t count) { - return (*PerlIOBase(f)->tab->Write)(f,vbuf,count); + if (f && *f) + return (*PerlIOBase(f)->tab->Write)(f,vbuf,count); + else + { + SETERRNO(EBADF,SS$_IVCHAN); + return -1; + } } #undef PerlIO_seek int PerlIO_seek(PerlIO *f, Off_t offset, int whence) { - return (*PerlIOBase(f)->tab->Seek)(f,offset,whence); + if (f && *f) + return (*PerlIOBase(f)->tab->Seek)(f,offset,whence); + else + { + SETERRNO(EBADF,SS$_IVCHAN); + return -1; + } } #undef PerlIO_tell Off_t PerlIO_tell(PerlIO *f) { - return (*PerlIOBase(f)->tab->Tell)(f); + if (f && *f) + return (*PerlIOBase(f)->tab->Tell)(f); + else + { + SETERRNO(EBADF,SS$_IVCHAN); + return -1; + } } #undef PerlIO_flush @@ -697,10 +1204,35 @@ PerlIO_flush(PerlIO *f) { if (f) { - return (*PerlIOBase(f)->tab->Flush)(f); + if (*f) + { + PerlIO_funcs *tab = PerlIOBase(f)->tab; + if (tab && tab->Flush) + { + return (*tab->Flush)(f); + } + else + { + PerlIO_debug("Cannot flush f=%p :%s\n",f,tab->name); + SETERRNO(EBADF,SS$_IVCHAN); + return -1; + } + } + else + { + PerlIO_debug("Cannot flush f=%p\n",f); + SETERRNO(EBADF,SS$_IVCHAN); + return -1; + } } else { + /* Is it good API design to do flush-all on NULL, + * a potentially errorneous input? Maybe some magical + * value (PerlIO* PERLIO_FLUSH_ALL = (PerlIO*)-1;)? + * Yes, stdio does similar things on fflush(NULL), + * but should we be bound by their design decisions? + * --jhi */ PerlIO **table = &_perlio; int code = 0; while ((f = *table)) @@ -718,56 +1250,102 @@ PerlIO_flush(PerlIO *f) } } +void +PerlIOBase_flush_linebuf() +{ + PerlIO **table = &_perlio; + PerlIO *f; + while ((f = *table)) + { + int i; + table = (PerlIO **)(f++); + for (i=1; i < PERLIO_TABLE_SIZE; i++) + { + if (*f && (PerlIOBase(f)->flags & (PERLIO_F_LINEBUF|PERLIO_F_CANWRITE)) + == (PERLIO_F_LINEBUF|PERLIO_F_CANWRITE)) + PerlIO_flush(f); + f++; + } + } +} + #undef PerlIO_fill int PerlIO_fill(PerlIO *f) { - return (*PerlIOBase(f)->tab->Fill)(f); + if (f && *f) + return (*PerlIOBase(f)->tab->Fill)(f); + else + { + SETERRNO(EBADF,SS$_IVCHAN); + return -1; + } } #undef PerlIO_isutf8 int PerlIO_isutf8(PerlIO *f) { - return (PerlIOBase(f)->flags & PERLIO_F_UTF8) != 0; + if (f && *f) + return (PerlIOBase(f)->flags & PERLIO_F_UTF8) != 0; + else + { + SETERRNO(EBADF,SS$_IVCHAN); + return -1; + } } #undef PerlIO_eof int PerlIO_eof(PerlIO *f) { - return (*PerlIOBase(f)->tab->Eof)(f); + if (f && *f) + return (*PerlIOBase(f)->tab->Eof)(f); + else + { + SETERRNO(EBADF,SS$_IVCHAN); + return -1; + } } #undef PerlIO_error int PerlIO_error(PerlIO *f) { - return (*PerlIOBase(f)->tab->Error)(f); + if (f && *f) + return (*PerlIOBase(f)->tab->Error)(f); + else + { + SETERRNO(EBADF,SS$_IVCHAN); + return -1; + } } #undef PerlIO_clearerr void PerlIO_clearerr(PerlIO *f) { - (*PerlIOBase(f)->tab->Clearerr)(f); + if (f && *f) + (*PerlIOBase(f)->tab->Clearerr)(f); + else + SETERRNO(EBADF,SS$_IVCHAN); } #undef PerlIO_setlinebuf void PerlIO_setlinebuf(PerlIO *f) { - (*PerlIOBase(f)->tab->Setlinebuf)(f); + if (f && *f) + (*PerlIOBase(f)->tab->Setlinebuf)(f); + else + SETERRNO(EBADF,SS$_IVCHAN); } #undef PerlIO_has_base int PerlIO_has_base(PerlIO *f) { - if (f && *f) - { - return (PerlIOBase(f)->tab->Get_base != NULL); - } + if (f && *f) { return (PerlIOBase(f)->tab->Get_base != NULL); } return 0; } @@ -775,10 +1353,10 @@ PerlIO_has_base(PerlIO *f) int PerlIO_fast_gets(PerlIO *f) { - if (f && *f) + if (f && *f && (PerlIOBase(f)->flags & PERLIO_F_FASTGETS)) { - PerlIOl *l = PerlIOBase(f); - return (l->tab->Set_ptrcnt != NULL); + PerlIO_funcs *tab = PerlIOBase(f)->tab; + return (tab->Set_ptrcnt != NULL); } return 0; } @@ -811,28 +1389,38 @@ PerlIO_canset_cnt(PerlIO *f) STDCHAR * PerlIO_get_base(PerlIO *f) { - return (*PerlIOBase(f)->tab->Get_base)(f); + if (f && *f) + return (*PerlIOBase(f)->tab->Get_base)(f); + return NULL; } #undef PerlIO_get_bufsiz int PerlIO_get_bufsiz(PerlIO *f) { - return (*PerlIOBase(f)->tab->Get_bufsiz)(f); + if (f && *f) + return (*PerlIOBase(f)->tab->Get_bufsiz)(f); + return 0; } #undef PerlIO_get_ptr STDCHAR * PerlIO_get_ptr(PerlIO *f) { - return (*PerlIOBase(f)->tab->Get_ptr)(f); + PerlIO_funcs *tab = PerlIOBase(f)->tab; + if (tab->Get_ptr == NULL) + return NULL; + return (*tab->Get_ptr)(f); } #undef PerlIO_get_cnt int PerlIO_get_cnt(PerlIO *f) { - return (*PerlIOBase(f)->tab->Get_cnt)(f); + PerlIO_funcs *tab = PerlIOBase(f)->tab; + if (tab->Get_cnt == NULL) + return 0; + return (*tab->Get_cnt)(f); } #undef PerlIO_set_cnt @@ -842,13 +1430,130 @@ PerlIO_set_cnt(PerlIO *f,int cnt) (*PerlIOBase(f)->tab->Set_ptrcnt)(f,NULL,cnt); } -#undef PerlIO_set_ptrcnt -void -PerlIO_set_ptrcnt(PerlIO *f, STDCHAR *ptr, int cnt) +#undef PerlIO_set_ptrcnt +void +PerlIO_set_ptrcnt(PerlIO *f, STDCHAR *ptr, int cnt) +{ + PerlIO_funcs *tab = PerlIOBase(f)->tab; + if (tab->Set_ptrcnt == NULL) + { + dTHX; + Perl_croak(aTHX_ "PerlIO buffer snooping abuse"); + } + (*PerlIOBase(f)->tab->Set_ptrcnt)(f,ptr,cnt); +} + +/*--------------------------------------------------------------------------------------*/ +/* utf8 and raw dummy layers */ + +IV +PerlIOUtf8_pushed(PerlIO *f, const char *mode, SV *arg) +{ + if (PerlIONext(f)) + { + dTHX; + PerlIO_funcs *tab = PerlIOBase(f)->tab; + PerlIO_pop(aTHX_ f); + if (tab->kind & PERLIO_K_UTF8) + PerlIOBase(f)->flags |= PERLIO_F_UTF8; + else + PerlIOBase(f)->flags &= ~PERLIO_F_UTF8; + return 0; + } + return -1; +} + +PerlIO_funcs PerlIO_utf8 = { + "utf8", + sizeof(PerlIOl), + PERLIO_K_DUMMY|PERLIO_F_UTF8, + PerlIOUtf8_pushed, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, /* flush */ + NULL, /* fill */ + NULL, + NULL, + NULL, + NULL, + NULL, /* get_base */ + NULL, /* get_bufsiz */ + NULL, /* get_ptr */ + NULL, /* get_cnt */ + NULL, /* set_ptrcnt */ +}; + +PerlIO_funcs PerlIO_byte = { + "bytes", + sizeof(PerlIOl), + PERLIO_K_DUMMY, + PerlIOUtf8_pushed, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, /* flush */ + NULL, /* fill */ + NULL, + NULL, + NULL, + NULL, + NULL, /* get_base */ + NULL, /* get_bufsiz */ + NULL, /* get_ptr */ + NULL, /* get_cnt */ + NULL, /* set_ptrcnt */ +}; + +PerlIO * +PerlIORaw_open(pTHX_ PerlIO_funcs *self, AV *layers, IV n,const char *mode, int fd, int imode, int perm, PerlIO *old, int narg, SV **args) { - (*PerlIOBase(f)->tab->Set_ptrcnt)(f,ptr,cnt); + PerlIO_funcs *tab = PerlIO_default_btm(); + return (*tab->Open)(aTHX_ tab,layers,n-2,mode,fd,imode,perm,old,narg,args); } +PerlIO_funcs PerlIO_raw = { + "raw", + sizeof(PerlIOl), + PERLIO_K_DUMMY, + PerlIORaw_pushed, + PerlIOBase_popped, + PerlIORaw_open, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, /* flush */ + NULL, /* fill */ + NULL, + NULL, + NULL, + NULL, + NULL, /* get_base */ + NULL, /* get_bufsiz */ + NULL, /* get_ptr */ + NULL, /* get_cnt */ + NULL, /* set_ptrcnt */ +}; +/*--------------------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------------------*/ /* "Methods" of the "base class" */ @@ -858,27 +1563,71 @@ PerlIOBase_fileno(PerlIO *f) return PerlIO_fileno(PerlIONext(f)); } +char * +PerlIO_modestr(PerlIO *f,char *buf) +{ + char *s = buf; + IV flags = PerlIOBase(f)->flags; + if (flags & PERLIO_F_APPEND) + { + *s++ = 'a'; + if (flags & PERLIO_F_CANREAD) + { + *s++ = '+'; + } + } + else if (flags & PERLIO_F_CANREAD) + { + *s++ = 'r'; + if (flags & PERLIO_F_CANWRITE) + *s++ = '+'; + } + else if (flags & PERLIO_F_CANWRITE) + { + *s++ = 'w'; + if (flags & PERLIO_F_CANREAD) + { + *s++ = '+'; + } + } +#if O_TEXT != O_BINARY + if (!(flags & PERLIO_F_CRLF)) + *s++ = 'b'; +#endif + *s = '\0'; + return buf; +} + IV -PerlIOBase_pushed(PerlIO *f, const char *mode) +PerlIOBase_pushed(PerlIO *f, const char *mode, SV *arg) { PerlIOl *l = PerlIOBase(f); +#if 0 + const char *omode = mode; + char temp[8]; +#endif + PerlIO_funcs *tab = PerlIOBase(f)->tab; l->flags &= ~(PERLIO_F_CANREAD|PERLIO_F_CANWRITE| - PERLIO_F_TRUNCATE|PERLIO_F_APPEND|PERLIO_F_BINARY); + PERLIO_F_TRUNCATE|PERLIO_F_APPEND); + if (tab->Set_ptrcnt != NULL) + l->flags |= PERLIO_F_FASTGETS; if (mode) { + if (*mode == '#' || *mode == 'I') + mode++; switch (*mode++) { case 'r': - l->flags = PERLIO_F_CANREAD; + l->flags |= PERLIO_F_CANREAD; break; case 'a': - l->flags = PERLIO_F_APPEND|PERLIO_F_CANWRITE; + l->flags |= PERLIO_F_APPEND|PERLIO_F_CANWRITE; break; case 'w': - l->flags = PERLIO_F_TRUNCATE|PERLIO_F_CANWRITE; + l->flags |= PERLIO_F_TRUNCATE|PERLIO_F_CANWRITE; break; default: - errno = EINVAL; + SETERRNO(EINVAL,LIB$_INVARG); return -1; } while (*mode) @@ -889,11 +1638,14 @@ PerlIOBase_pushed(PerlIO *f, const char *mode) l->flags |= PERLIO_F_CANREAD|PERLIO_F_CANWRITE; break; case 'b': - l->flags |= PERLIO_F_BINARY; + l->flags &= ~PERLIO_F_CRLF; + break; + case 't': + l->flags |= PERLIO_F_CRLF; break; default: - errno = EINVAL; - return -1; + SETERRNO(EINVAL,LIB$_INVARG); + return -1; } } } @@ -902,10 +1654,14 @@ PerlIOBase_pushed(PerlIO *f, const char *mode) if (l->next) { l->flags |= l->next->flags & - (PERLIO_F_CANREAD|PERLIO_F_CANWRITE| - PERLIO_F_TRUNCATE|PERLIO_F_APPEND|PERLIO_F_BINARY); + (PERLIO_F_CANREAD|PERLIO_F_CANWRITE|PERLIO_F_TRUNCATE|PERLIO_F_APPEND); } } +#if 0 + PerlIO_debug("PerlIOBase_pushed f=%p %s %s fl=%08"UVxf" (%s)\n", + f,PerlIOBase(f)->tab->name,(omode) ? omode : "(Null)", + l->flags,PerlIO_modestr(f,temp)); +#endif return 0; } @@ -918,11 +1674,44 @@ PerlIOBase_popped(PerlIO *f) SSize_t PerlIOBase_unread(PerlIO *f, const void *vbuf, Size_t count) { + dTHX; Off_t old = PerlIO_tell(f); - if (PerlIO_seek(f,-((Off_t)count),SEEK_CUR) == 0) + SSize_t done; + PerlIO_push(aTHX_ f,&PerlIO_pending,"r",Nullsv); + done = PerlIOBuf_unread(f,vbuf,count); + PerlIOSelf(f,PerlIOBuf)->posn = old - done; + return done; +} + +SSize_t +PerlIOBase_read(PerlIO *f, void *vbuf, Size_t count) +{ + STDCHAR *buf = (STDCHAR *) vbuf; + if (f) { - Off_t new = PerlIO_tell(f); - return old - new; + if (!(PerlIOBase(f)->flags & PERLIO_F_CANREAD)) + return 0; + while (count > 0) + { + SSize_t avail = PerlIO_get_cnt(f); + SSize_t take = 0; + if (avail > 0) + take = (count < avail) ? count : avail; + if (take > 0) + { + STDCHAR *ptr = PerlIO_get_ptr(f); + Copy(ptr,buf,take,STDCHAR); + PerlIO_set_ptrcnt(f,ptr+take,(avail -= take)); + count -= take; + buf += take; + } + if (count > 0 && avail <= 0) + { + if (PerlIO_fill(f) != 0) + break; + } + } + return (buf - (STDCHAR *) vbuf); } return 0; } @@ -943,9 +1732,10 @@ IV PerlIOBase_close(PerlIO *f) { IV code = 0; + PerlIO *n = PerlIONext(f); if (PerlIO_flush(f) != 0) code = -1; - if (PerlIO_close(PerlIONext(f)) != 0) + if (n && *n && (*PerlIOBase(n)->tab->Close)(n) != 0) code = -1; PerlIOBase(f)->flags &= ~(PERLIO_F_CANREAD|PERLIO_F_CANWRITE|PERLIO_F_OPEN); return code; @@ -976,14 +1766,20 @@ PerlIOBase_clearerr(PerlIO *f) { if (f && *f) { - PerlIOBase(f)->flags &= ~PERLIO_F_ERROR; + PerlIO *n = PerlIONext(f); + PerlIOBase(f)->flags &= ~(PERLIO_F_ERROR|PERLIO_F_EOF); + if (n) + PerlIO_clearerr(n); } } void PerlIOBase_setlinebuf(PerlIO *f) { - + if (f) + { + PerlIOBase(f)->flags |= PERLIO_F_LINEBUF; + } } /*--------------------------------------------------------------------------------------*/ @@ -1035,14 +1831,21 @@ PerlIOUnix_oflags(const char *mode) } if (*mode == 'b') { - oflags |= O_BINARY; + oflags |= O_BINARY; + oflags &= ~O_TEXT; + mode++; + } + else if (*mode == 't') + { + oflags |= O_TEXT; + oflags &= ~O_BINARY; mode++; } /* Always open in binary mode */ oflags |= O_BINARY; if (*mode || oflags == -1) { - errno = EINVAL; + SETERRNO(EINVAL,LIB$_INVARG); oflags = -1; } return oflags; @@ -1054,69 +1857,74 @@ PerlIOUnix_fileno(PerlIO *f) return PerlIOSelf(f,PerlIOUnix)->fd; } -PerlIO * -PerlIOUnix_fdopen(PerlIO_funcs *self, int fd,const char *mode) +IV +PerlIOUnix_pushed(PerlIO *f, const char *mode, SV *arg) { - PerlIO *f = NULL; - if (*mode == 'I') - mode++; - if (fd >= 0) + IV code = PerlIOBase_pushed(f,mode,arg); + if (*PerlIONext(f)) { - int oflags = PerlIOUnix_oflags(mode); - if (oflags != -1) - { - PerlIOUnix *s = PerlIOSelf(PerlIO_push(f = PerlIO_allocate(),self,mode),PerlIOUnix); - s->fd = fd; - s->oflags = oflags; - PerlIOBase(f)->flags |= PERLIO_F_OPEN; - } + PerlIOUnix *s = PerlIOSelf(f,PerlIOUnix); + s->fd = PerlIO_fileno(PerlIONext(f)); + s->oflags = PerlIOUnix_oflags(mode); } - return f; + PerlIOBase(f)->flags |= PERLIO_F_OPEN; + return code; } PerlIO * -PerlIOUnix_open(PerlIO_funcs *self, const char *path,const char *mode) +PerlIOUnix_open(pTHX_ PerlIO_funcs *self, AV *layers, IV n, const char *mode, int fd, int imode, int perm, PerlIO *f, int narg, SV **args) { - PerlIO *f = NULL; - int oflags = PerlIOUnix_oflags(mode); - if (oflags != -1) + if (f) { - int fd = PerlLIO_open3(path,oflags,0666); - if (fd >= 0) + if (PerlIOBase(f)->flags & PERLIO_F_OPEN) + (*PerlIOBase(f)->tab->Close)(f); + } + if (narg > 0) + { + char *path = SvPV_nolen(*args); + if (*mode == '#') + mode++; + else + { + imode = PerlIOUnix_oflags(mode); + perm = 0666; + } + if (imode != -1) { - PerlIOUnix *s = PerlIOSelf(PerlIO_push(f = PerlIO_allocate(),self,mode),PerlIOUnix); - s->fd = fd; - s->oflags = oflags; - PerlIOBase(f)->flags |= PERLIO_F_OPEN; + fd = PerlLIO_open3(path,imode,perm); } } - return f; -} - -int -PerlIOUnix_reopen(const char *path, const char *mode, PerlIO *f) -{ - PerlIOUnix *s = PerlIOSelf(f,PerlIOUnix); - int oflags = PerlIOUnix_oflags(mode); - if (PerlIOBase(f)->flags & PERLIO_F_OPEN) - (*PerlIOBase(f)->tab->Close)(f); - if (oflags != -1) + if (fd >= 0) { - int fd = PerlLIO_open3(path,oflags,0666); - if (fd >= 0) + PerlIOUnix *s; + if (*mode == 'I') + mode++; + if (!f) { - s->fd = fd; - s->oflags = oflags; - PerlIOBase(f)->flags |= PERLIO_F_OPEN; - return 0; + f = PerlIO_allocate(aTHX); + s = PerlIOSelf(PerlIO_push(aTHX_ f,self,mode,PerlIOArg),PerlIOUnix); } + else + s = PerlIOSelf(f,PerlIOUnix); + s->fd = fd; + s->oflags = imode; + PerlIOBase(f)->flags |= PERLIO_F_OPEN; + return f; + } + else + { + if (f) + { + /* FIXME: pop layers ??? */ + } + return NULL; } - return -1; } SSize_t PerlIOUnix_read(PerlIO *f, void *vbuf, Size_t count) { + dTHX; int fd = PerlIOSelf(f,PerlIOUnix)->fd; if (!(PerlIOBase(f)->flags & PERLIO_F_CANREAD)) return 0; @@ -1131,12 +1939,14 @@ PerlIOUnix_read(PerlIO *f, void *vbuf, Size_t count) PerlIOBase(f)->flags |= PERLIO_F_EOF; return len; } + PERL_ASYNC_CHECK(); } } SSize_t PerlIOUnix_write(PerlIO *f, const void *vbuf, Size_t count) { + dTHX; int fd = PerlIOSelf(f,PerlIOUnix)->fd; while (1) { @@ -1147,12 +1957,14 @@ PerlIOUnix_write(PerlIO *f, const void *vbuf, Size_t count) PerlIOBase(f)->flags |= PERLIO_F_ERROR; return len; } + PERL_ASYNC_CHECK(); } } IV PerlIOUnix_seek(PerlIO *f, Off_t offset, int whence) { + dSYS; Off_t new = PerlLIO_lseek(PerlIOSelf(f,PerlIOUnix)->fd,offset,whence); PerlIOBase(f)->flags &= ~PERLIO_F_EOF; return (new == (Off_t) -1) ? -1 : 0; @@ -1161,12 +1973,14 @@ PerlIOUnix_seek(PerlIO *f, Off_t offset, int whence) Off_t PerlIOUnix_tell(PerlIO *f) { + dSYS; return PerlLIO_lseek(PerlIOSelf(f,PerlIOUnix)->fd,0,SEEK_CUR); } IV PerlIOUnix_close(PerlIO *f) { + dTHX; int fd = PerlIOSelf(f,PerlIOUnix)->fd; int code = 0; while (PerlLIO_close(fd) != 0) @@ -1176,6 +1990,7 @@ PerlIOUnix_close(PerlIO *f) code = -1; break; } + PERL_ASYNC_CHECK(); } if (code == 0) { @@ -1187,13 +2002,12 @@ PerlIOUnix_close(PerlIO *f) PerlIO_funcs PerlIO_unix = { "unix", sizeof(PerlIOUnix), - 0, - PerlIOUnix_fileno, - PerlIOUnix_fdopen, - PerlIOUnix_open, - PerlIOUnix_reopen, - PerlIOBase_pushed, + PERLIO_K_RAW, + PerlIOUnix_pushed, PerlIOBase_noop_ok, + PerlIOUnix_open, + NULL, + PerlIOUnix_fileno, PerlIOUnix_read, PerlIOBase_unread, PerlIOUnix_write, @@ -1225,89 +2039,138 @@ typedef struct IV PerlIOStdio_fileno(PerlIO *f) { - return fileno(PerlIOSelf(f,PerlIOStdio)->stdio); + dSYS; + return PerlSIO_fileno(PerlIOSelf(f,PerlIOStdio)->stdio); } - -PerlIO * -PerlIOStdio_fdopen(PerlIO_funcs *self, int fd,const char *mode) +char * +PerlIOStdio_mode(const char *mode,char *tmode) { - PerlIO *f = NULL; - int init = 0; - if (*mode == 'I') + char *ret = tmode; + while (*mode) { - init = 1; - mode++; + *tmode++ = *mode++; } - if (fd >= 0) + if (O_BINARY != O_TEXT) { - FILE *stdio = NULL; - if (init) - { - switch(fd) - { - case 0: - stdio = stdin; - break; - case 1: - stdio = stdout; - break; - case 2: - stdio = stderr; - break; - } - } - else - stdio = fdopen(fd,mode); + *tmode++ = 'b'; + } + *tmode = '\0'; + return ret; +} + +/* This isn't used yet ... */ +IV +PerlIOStdio_pushed(PerlIO *f, const char *mode, SV *arg) +{ + if (*PerlIONext(f)) + { + dSYS; + PerlIOStdio *s = PerlIOSelf(f,PerlIOStdio); + char tmode[8]; + FILE *stdio = PerlSIO_fdopen(PerlIO_fileno(PerlIONext(f)),mode = PerlIOStdio_mode(mode,tmode)); if (stdio) - { - PerlIOStdio *s = PerlIOSelf(PerlIO_push(f = PerlIO_allocate(),self,mode),PerlIOStdio); - s->stdio = stdio; - } + s->stdio = stdio; + else + return -1; } - return f; + return PerlIOBase_pushed(f,mode,arg); } #undef PerlIO_importFILE PerlIO * PerlIO_importFILE(FILE *stdio, int fl) { + dTHX; PerlIO *f = NULL; if (stdio) { - PerlIOStdio *s = PerlIOSelf(PerlIO_push(f = PerlIO_allocate(),&PerlIO_stdio,"r+"),PerlIOStdio); + PerlIOStdio *s = PerlIOSelf(PerlIO_push(aTHX_ (f = PerlIO_allocate(aTHX)),&PerlIO_stdio,"r+",Nullsv),PerlIOStdio); s->stdio = stdio; } return f; } PerlIO * -PerlIOStdio_open(PerlIO_funcs *self, const char *path,const char *mode) +PerlIOStdio_open(pTHX_ PerlIO_funcs *self, AV *layers, IV n, const char *mode, int fd, int imode, int perm, PerlIO *f, int narg, SV **args) { - PerlIO *f = NULL; - FILE *stdio = fopen(path,mode); - if (stdio) + char tmode[8]; + if (f) { - PerlIOStdio *s = PerlIOSelf(PerlIO_push(f = PerlIO_allocate(),self,mode),PerlIOStdio); - s->stdio = stdio; + char *path = SvPV_nolen(*args); + PerlIOStdio *s = PerlIOSelf(f,PerlIOStdio); + FILE *stdio = PerlSIO_freopen(path,(mode = PerlIOStdio_mode(mode,tmode)),s->stdio); + if (!s->stdio) + return NULL; + s->stdio = stdio; + return f; } - return f; -} - -int -PerlIOStdio_reopen(const char *path, const char *mode, PerlIO *f) -{ - PerlIOStdio *s = PerlIOSelf(f,PerlIOStdio); - FILE *stdio = freopen(path,mode,s->stdio); - if (!s->stdio) - return -1; - s->stdio = stdio; - return 0; + else + { + if (narg > 0) + { + char *path = SvPV_nolen(*args); + if (*mode == '#') + { + mode++; + fd = PerlLIO_open3(path,imode,perm); + } + else + { + FILE *stdio = PerlSIO_fopen(path,mode); + if (stdio) + { + PerlIOStdio *s = PerlIOSelf(PerlIO_push(aTHX_ (f = PerlIO_allocate(aTHX)), self, + (mode = PerlIOStdio_mode(mode,tmode)),PerlIOArg), + PerlIOStdio); + s->stdio = stdio; + } + return f; + } + } + if (fd >= 0) + { + FILE *stdio = NULL; + int init = 0; + if (*mode == 'I') + { + init = 1; + mode++; + } + if (init) + { + switch(fd) + { + case 0: + stdio = PerlSIO_stdin; + break; + case 1: + stdio = PerlSIO_stdout; + break; + case 2: + stdio = PerlSIO_stderr; + break; + } + } + else + { + stdio = PerlSIO_fdopen(fd,mode = PerlIOStdio_mode(mode,tmode)); + } + if (stdio) + { + PerlIOStdio *s = PerlIOSelf(PerlIO_push(aTHX_ (f = PerlIO_allocate(aTHX)),self,mode,PerlIOArg),PerlIOStdio); + s->stdio = stdio; + return f; + } + } + } + return NULL; } SSize_t PerlIOStdio_read(PerlIO *f, void *vbuf, Size_t count) { + dSYS; FILE *s = PerlIOSelf(f,PerlIOStdio)->stdio; SSize_t got = 0; if (count == 1) @@ -1316,7 +2179,7 @@ PerlIOStdio_read(PerlIO *f, void *vbuf, Size_t count) /* Perl is expecting PerlIO_getc() to fill the buffer * Linux's stdio does not do that for fread() */ - int ch = fgetc(s); + int ch = PerlSIO_fgetc(s); if (ch != EOF) { *buf = ch; @@ -1324,20 +2187,21 @@ PerlIOStdio_read(PerlIO *f, void *vbuf, Size_t count) } } else - got = fread(vbuf,1,count,s); + got = PerlSIO_fread(vbuf,1,count,s); return got; } SSize_t PerlIOStdio_unread(PerlIO *f, const void *vbuf, Size_t count) { + dSYS; FILE *s = PerlIOSelf(f,PerlIOStdio)->stdio; STDCHAR *buf = ((STDCHAR *)vbuf)+count-1; SSize_t unread = 0; while (count > 0) { int ch = *buf-- & 0xff; - if (ungetc(ch,s) != ch) + if (PerlSIO_ungetc(ch,s) != ch) break; unread++; count--; @@ -1348,37 +2212,55 @@ PerlIOStdio_unread(PerlIO *f, const void *vbuf, Size_t count) SSize_t PerlIOStdio_write(PerlIO *f, const void *vbuf, Size_t count) { - return fwrite(vbuf,1,count,PerlIOSelf(f,PerlIOStdio)->stdio); + dSYS; + return PerlSIO_fwrite(vbuf,1,count,PerlIOSelf(f,PerlIOStdio)->stdio); } IV PerlIOStdio_seek(PerlIO *f, Off_t offset, int whence) { + dSYS; FILE *stdio = PerlIOSelf(f,PerlIOStdio)->stdio; - return fseek(stdio,offset,whence); + return PerlSIO_fseek(stdio,offset,whence); } Off_t PerlIOStdio_tell(PerlIO *f) { + dSYS; FILE *stdio = PerlIOSelf(f,PerlIOStdio)->stdio; - return ftell(stdio); + return PerlSIO_ftell(stdio); } IV PerlIOStdio_close(PerlIO *f) { + dSYS; +#ifdef SOCKS5_VERSION_NAME + int optval; + Sock_size_t optlen = sizeof(int); +#endif FILE *stdio = PerlIOSelf(f,PerlIOStdio)->stdio; - return fclose(stdio); + return( +#ifdef SOCKS5_VERSION_NAME + (getsockopt(PerlIO_fileno(f), SOL_SOCKET, SO_TYPE, (void *)&optval, &optlen) < 0) ? + PerlSIO_fclose(stdio) : + close(PerlIO_fileno(f)) +#else + PerlSIO_fclose(stdio) +#endif + ); + } IV PerlIOStdio_flush(PerlIO *f) { + dSYS; FILE *stdio = PerlIOSelf(f,PerlIOStdio)->stdio; if (PerlIOBase(f)->flags & PERLIO_F_CANWRITE) { - return fflush(stdio); + return PerlSIO_fflush(stdio); } else { @@ -1390,7 +2272,7 @@ PerlIOStdio_flush(PerlIO *f) */ /* Not writeable - sync by attempting a seek */ int err = errno; - if (fseek(stdio,(Off_t) 0, SEEK_CUR) != 0) + if (PerlSIO_fseek(stdio,(Off_t) 0, SEEK_CUR) != 0) errno = err; #endif } @@ -1400,16 +2282,17 @@ PerlIOStdio_flush(PerlIO *f) IV PerlIOStdio_fill(PerlIO *f) { + dSYS; FILE *stdio = PerlIOSelf(f,PerlIOStdio)->stdio; int c; /* fflush()ing read-only streams can cause trouble on some stdio-s */ if ((PerlIOBase(f)->flags & PERLIO_F_CANWRITE)) { - if (fflush(stdio) != 0) + if (PerlSIO_fflush(stdio) != 0) return EOF; } - c = fgetc(stdio); - if (c == EOF || ungetc(c,stdio) != c) + c = PerlSIO_fgetc(stdio); + if (c == EOF || PerlSIO_ungetc(c,stdio) != c) return EOF; return 0; } @@ -1417,28 +2300,32 @@ PerlIOStdio_fill(PerlIO *f) IV PerlIOStdio_eof(PerlIO *f) { - return feof(PerlIOSelf(f,PerlIOStdio)->stdio); + dSYS; + return PerlSIO_feof(PerlIOSelf(f,PerlIOStdio)->stdio); } IV PerlIOStdio_error(PerlIO *f) { - return ferror(PerlIOSelf(f,PerlIOStdio)->stdio); + dSYS; + return PerlSIO_ferror(PerlIOSelf(f,PerlIOStdio)->stdio); } void PerlIOStdio_clearerr(PerlIO *f) { - clearerr(PerlIOSelf(f,PerlIOStdio)->stdio); + dSYS; + PerlSIO_clearerr(PerlIOSelf(f,PerlIOStdio)->stdio); } void PerlIOStdio_setlinebuf(PerlIO *f) { + dSYS; #ifdef HAS_SETLINEBUF - setlinebuf(PerlIOSelf(f,PerlIOStdio)->stdio); + PerlSIO_setlinebuf(PerlIOSelf(f,PerlIOStdio)->stdio); #else - setvbuf(PerlIOSelf(f,PerlIOStdio)->stdio, Nullch, _IOLBF, 0); + PerlSIO_setvbuf(PerlIOSelf(f,PerlIOStdio)->stdio, Nullch, _IOLBF, 0); #endif } @@ -1446,15 +2333,17 @@ PerlIOStdio_setlinebuf(PerlIO *f) STDCHAR * PerlIOStdio_get_base(PerlIO *f) { + dSYS; FILE *stdio = PerlIOSelf(f,PerlIOStdio)->stdio; - return FILE_base(stdio); + return PerlSIO_get_base(stdio); } Size_t PerlIOStdio_get_bufsiz(PerlIO *f) { + dSYS; FILE *stdio = PerlIOSelf(f,PerlIOStdio)->stdio; - return FILE_bufsiz(stdio); + return PerlSIO_get_bufsiz(stdio); } #endif @@ -1462,30 +2351,33 @@ PerlIOStdio_get_bufsiz(PerlIO *f) STDCHAR * PerlIOStdio_get_ptr(PerlIO *f) { + dSYS; FILE *stdio = PerlIOSelf(f,PerlIOStdio)->stdio; - return FILE_ptr(stdio); + return PerlSIO_get_ptr(stdio); } SSize_t PerlIOStdio_get_cnt(PerlIO *f) { + dSYS; FILE *stdio = PerlIOSelf(f,PerlIOStdio)->stdio; - return FILE_cnt(stdio); + return PerlSIO_get_cnt(stdio); } void PerlIOStdio_set_ptrcnt(PerlIO *f,STDCHAR *ptr,SSize_t cnt) { FILE *stdio = PerlIOSelf(f,PerlIOStdio)->stdio; + dSYS; if (ptr != NULL) { #ifdef STDIO_PTR_LVALUE - FILE_ptr(stdio) = ptr; + PerlSIO_set_ptr(stdio,ptr); #ifdef STDIO_PTR_LVAL_SETS_CNT - if (FILE_cnt(stdio) != (cnt)) + if (PerlSIO_get_cnt(stdio) != (cnt)) { dTHX; - assert(FILE_cnt(stdio) == (cnt)); + assert(PerlSIO_get_cnt(stdio) == (cnt)); } #endif #if (!defined(STDIO_PTR_LVAL_NOCHANGE_CNT)) @@ -1493,17 +2385,17 @@ PerlIOStdio_set_ptrcnt(PerlIO *f,STDCHAR *ptr,SSize_t cnt) return; #endif #else /* STDIO_PTR_LVALUE */ - abort(); + PerlProc_abort(); #endif /* STDIO_PTR_LVALUE */ } /* Now (or only) set cnt */ #ifdef STDIO_CNT_LVALUE - FILE_cnt(stdio) = cnt; + PerlSIO_set_cnt(stdio,cnt); #else /* STDIO_CNT_LVALUE */ #if (defined(STDIO_PTR_LVALUE) && defined(STDIO_PTR_LVAL_SETS_CNT)) - FILE_ptr(stdio) = FILE_ptr(stdio)+(FILE_cnt(stdio)-cnt); + PerlSIO_set_ptr(stdio,PerlSIO_get_ptr(stdio)+(PerlSIO_get_cnt(stdio)-cnt)); #else /* STDIO_PTR_LVAL_SETS_CNT */ - abort(); + PerlProc_abort(); #endif /* STDIO_PTR_LVAL_SETS_CNT */ #endif /* STDIO_CNT_LVALUE */ } @@ -1513,13 +2405,12 @@ PerlIOStdio_set_ptrcnt(PerlIO *f,STDCHAR *ptr,SSize_t cnt) PerlIO_funcs PerlIO_stdio = { "stdio", sizeof(PerlIOStdio), - 0, - PerlIOStdio_fileno, - PerlIOStdio_fdopen, - PerlIOStdio_open, - PerlIOStdio_reopen, + PERLIO_K_BUFFERED, PerlIOBase_pushed, PerlIOBase_noop_ok, + PerlIOStdio_open, + NULL, + PerlIOStdio_fileno, PerlIOStdio_read, PerlIOStdio_unread, PerlIOStdio_write, @@ -1558,15 +2449,32 @@ PerlIO_funcs PerlIO_stdio = { FILE * PerlIO_exportFILE(PerlIO *f, int fl) { + FILE *stdio; PerlIO_flush(f); - /* Should really push stdio discipline when we have them */ - return fdopen(PerlIO_fileno(f),"r+"); + stdio = fdopen(PerlIO_fileno(f),"r+"); + if (stdio) + { + dTHX; + PerlIOStdio *s = PerlIOSelf(PerlIO_push(aTHX_ f,&PerlIO_stdio,"r+",Nullsv),PerlIOStdio); + s->stdio = stdio; + } + return stdio; } #undef PerlIO_findFILE FILE * PerlIO_findFILE(PerlIO *f) { + PerlIOl *l = *f; + while (l) + { + if (l->tab == &PerlIO_stdio) + { + PerlIOStdio *s = PerlIOSelf(&l,PerlIOStdio); + return s->stdio; + } + l = *PerlIONext(&l); + } return PerlIO_exportFILE(f,0); } @@ -1579,56 +2487,64 @@ PerlIO_releaseFILE(PerlIO *p, FILE *f) /*--------------------------------------------------------------------------------------*/ /* perlio buffer layer */ -PerlIO * -PerlIOBuf_fdopen(PerlIO_funcs *self, int fd, const char *mode) +IV +PerlIOBuf_pushed(PerlIO *f, const char *mode, SV *arg) { - PerlIO_funcs *tab = PerlIO_default_btm(); - int init = 0; - PerlIO *f; - if (*mode == 'I') + dSYS; + PerlIOBuf *b = PerlIOSelf(f,PerlIOBuf); + int fd = PerlIO_fileno(f); + Off_t posn; + if (fd >= 0 && PerlLIO_isatty(fd)) { - init = 1; - mode++; + PerlIOBase(f)->flags |= PERLIO_F_LINEBUF|PERLIO_F_TTY; } - f = (*tab->Fdopen)(tab,fd,mode); - if (f) + posn = PerlIO_tell(PerlIONext(f)); + if (posn != (Off_t) -1) { - /* Initial stderr is unbuffered */ - if (!init || fd != 2) - { - PerlIOBuf *b = PerlIOSelf(PerlIO_push(f,self,NULL),PerlIOBuf); - b->posn = PerlIO_tell(PerlIONext(f)); - } + b->posn = posn; } - return f; + return PerlIOBase_pushed(f,mode,arg); } PerlIO * -PerlIOBuf_open(PerlIO_funcs *self, const char *path, const char *mode) +PerlIOBuf_open(pTHX_ PerlIO_funcs *self, AV *layers, IV n, const char *mode, int fd, int imode, int perm, PerlIO *f, int narg, SV **args) { - PerlIO_funcs *tab = PerlIO_default_btm(); - PerlIO *f = (*tab->Open)(tab,path,mode); if (f) { - PerlIOBuf *b = PerlIOSelf(PerlIO_push(f,self,NULL),PerlIOBuf); - b->posn = PerlIO_tell(PerlIONext(f)); + PerlIO *next = PerlIONext(f); + PerlIO_funcs *tab = PerlIO_layer_fetch(aTHX_ layers, n-2, PerlIOBase(next)->tab); + next = (*tab->Open)(aTHX_ tab, layers, n-2, mode,fd,imode,perm,next,narg,args); + if (!next || (*PerlIOBase(f)->tab->Pushed)(f,mode,PerlIOArg) != 0) + { + return NULL; + } } - return f; -} - -int -PerlIOBuf_reopen(const char *path, const char *mode, PerlIO *f) -{ - PerlIO *next = PerlIONext(f); - int code = (*PerlIOBase(next)->tab->Reopen)(path,mode,next); - if (code = 0) - code = (*PerlIOBase(f)->tab->Pushed)(f,mode); - if (code == 0) + else { - PerlIOBuf *b = PerlIOSelf(f,PerlIOBuf); - b->posn = PerlIO_tell(PerlIONext(f)); + PerlIO_funcs *tab = PerlIO_layer_fetch(aTHX_ layers, n-2, PerlIO_default_btm()); + int init = 0; + if (*mode == 'I') + { + init = 1; + mode++; + } + f = (*tab->Open)(aTHX_ tab, layers, n-2, mode,fd,imode,perm,NULL,narg,args); + if (f) + { + PerlIO_push(aTHX_ f,self,mode,PerlIOArg); + fd = PerlIO_fileno(f); +#if O_BINARY != O_TEXT + /* do something about failing setmode()? --jhi */ + PerlLIO_setmode(fd , O_BINARY); +#endif + if (init && fd == 2) + { + /* Initial stderr is unbuffered */ + PerlIOBase(f)->flags |= PERLIO_F_UNBUF; + } + } } - return code; + return f; } /* This "flush" is akin to sfio's sync in that it handles files in either @@ -1642,12 +2558,12 @@ PerlIOBuf_flush(PerlIO *f) if (PerlIOBase(f)->flags & PERLIO_F_WRBUF) { /* write() the buffer */ - STDCHAR *p = b->buf; - int count; + STDCHAR *buf = b->buf; + STDCHAR *p = buf; PerlIO *n = PerlIONext(f); while (p < b->ptr) { - count = PerlIO_write(n,p,b->ptr - p); + SSize_t count = PerlIO_write(n,p,b->ptr - p); if (count > 0) { p += count; @@ -1659,12 +2575,13 @@ PerlIOBuf_flush(PerlIO *f) break; } } - b->posn += (p - b->buf); + b->posn += (p - buf); } else if (PerlIOBase(f)->flags & PERLIO_F_RDBUF) { + STDCHAR *buf = PerlIO_get_base(f); /* Note position change */ - b->posn += (b->ptr - b->buf); + b->posn += (b->ptr - buf); if (b->ptr < b->end) { /* We did not consume all of it */ @@ -1698,6 +2615,11 @@ PerlIOBuf_fill(PerlIO *f) */ if (PerlIO_flush(f) != 0) return -1; + if (PerlIOBase(f)->flags & PERLIO_F_TTY) + PerlIOBase_flush_linebuf(); + + if (!b->buf) + PerlIO_get_base(f); /* allocate via vtable */ b->ptr = b->end = b->buf; if (PerlIO_fast_gets(n)) @@ -1750,32 +2672,11 @@ SSize_t PerlIOBuf_read(PerlIO *f, void *vbuf, Size_t count) { PerlIOBuf *b = PerlIOSelf(f,PerlIOBuf); - STDCHAR *buf = (STDCHAR *) vbuf; if (f) { if (!b->ptr) PerlIO_get_base(f); - if (!(PerlIOBase(f)->flags & PERLIO_F_CANREAD)) - return 0; - while (count > 0) - { - SSize_t avail = PerlIO_get_cnt(f); - SSize_t take = (count < avail) ? count : avail; - if (take > 0) - { - STDCHAR *ptr = PerlIO_get_ptr(f); - Copy(ptr,buf,take,STDCHAR); - PerlIO_set_ptrcnt(f,ptr+take,(avail -= take)); - count -= take; - buf += take; - } - if (count > 0 && avail <= 0) - { - if (PerlIO_fill(f) != 0) - break; - } - } - return (buf - (STDCHAR *) vbuf); + return PerlIOBase_read(f,vbuf,count); } return 0; } @@ -1796,19 +2697,20 @@ PerlIOBuf_unread(PerlIO *f, const void *vbuf, Size_t count) if (PerlIOBase(f)->flags & PERLIO_F_RDBUF) { avail = (b->ptr - b->buf); - if (avail > (SSize_t) count) - avail = count; - b->ptr -= avail; } else { avail = b->bufsiz; - if (avail > (SSize_t) count) - avail = count; - b->end = b->ptr + avail; + b->end = b->buf + avail; + b->ptr = b->end; + PerlIOBase(f)->flags |= PERLIO_F_RDBUF; + b->posn -= b->bufsiz; } + if (avail > (SSize_t) count) + avail = count; if (avail > 0) { + b->ptr -= avail; buf -= avail; if (buf != b->ptr) { @@ -1868,16 +2770,18 @@ PerlIOBuf_write(PerlIO *f, const void *vbuf, Size_t count) if (b->ptr >= (b->buf + b->bufsiz)) PerlIO_flush(f); } + if (PerlIOBase(f)->flags & PERLIO_F_UNBUF) + PerlIO_flush(f); return written; } IV PerlIOBuf_seek(PerlIO *f, Off_t offset, int whence) { - PerlIOBuf *b = PerlIOSelf(f,PerlIOBuf); - int code = PerlIO_flush(f); - if (code == 0) + IV code; + if ((code = PerlIO_flush(f)) == 0) { + PerlIOBuf *b = PerlIOSelf(f,PerlIOBuf); PerlIOBase(f)->flags &= ~PERLIO_F_EOF; code = PerlIO_seek(PerlIONext(f),offset,whence); if (code == 0) @@ -1905,7 +2809,7 @@ PerlIOBuf_close(PerlIO *f) PerlIOBuf *b = PerlIOSelf(f,PerlIOBuf); if (b->buf && b->buf != (STDCHAR *) &b->oneword) { - Safefree(b->buf); + PerlMemShared_free(b->buf); } b->buf = NULL; b->ptr = b->end = b->buf; @@ -1913,15 +2817,6 @@ PerlIOBuf_close(PerlIO *f) return code; } -void -PerlIOBuf_setlinebuf(PerlIO *f) -{ - if (f) - { - PerlIOBase(f)->flags &= ~PERLIO_F_LINEBUF; - } -} - STDCHAR * PerlIOBuf_get_ptr(PerlIO *f) { @@ -1950,7 +2845,7 @@ PerlIOBuf_get_base(PerlIO *f) { if (!b->bufsiz) b->bufsiz = 4096; - New('B',b->buf,b->bufsiz,STDCHAR); + b->buf = PerlMemShared_calloc(b->bufsiz,sizeof(STDCHAR)); if (!b->buf) { b->buf = (STDCHAR *)&b->oneword; @@ -1990,13 +2885,12 @@ PerlIOBuf_set_ptrcnt(PerlIO *f, STDCHAR *ptr, SSize_t cnt) PerlIO_funcs PerlIO_perlio = { "perlio", sizeof(PerlIOBuf), - 0, - PerlIOBase_fileno, - PerlIOBuf_fdopen, - PerlIOBuf_open, - PerlIOBuf_reopen, - PerlIOBase_pushed, + PERLIO_K_BUFFERED, + PerlIOBuf_pushed, PerlIOBase_noop_ok, + PerlIOBuf_open, + NULL, + PerlIOBase_fileno, PerlIOBuf_read, PerlIOBuf_unread, PerlIOBuf_write, @@ -2008,7 +2902,7 @@ PerlIO_funcs PerlIO_perlio = { PerlIOBase_eof, PerlIOBase_error, PerlIOBase_clearerr, - PerlIOBuf_setlinebuf, + PerlIOBase_setlinebuf, PerlIOBuf_get_base, PerlIOBuf_bufsiz, PerlIOBuf_get_ptr, @@ -2017,6 +2911,123 @@ PerlIO_funcs PerlIO_perlio = { }; /*--------------------------------------------------------------------------------------*/ +/* Temp layer to hold unread chars when cannot do it any other way */ + +IV +PerlIOPending_fill(PerlIO *f) +{ + /* Should never happen */ + PerlIO_flush(f); + return 0; +} + +IV +PerlIOPending_close(PerlIO *f) +{ + /* A tad tricky - flush pops us, then we close new top */ + PerlIO_flush(f); + return PerlIO_close(f); +} + +IV +PerlIOPending_seek(PerlIO *f, Off_t offset, int whence) +{ + /* A tad tricky - flush pops us, then we seek new top */ + PerlIO_flush(f); + return PerlIO_seek(f,offset,whence); +} + + +IV +PerlIOPending_flush(PerlIO *f) +{ + dTHX; + PerlIOBuf *b = PerlIOSelf(f,PerlIOBuf); + if (b->buf && b->buf != (STDCHAR *) &b->oneword) + { + PerlMemShared_free(b->buf); + b->buf = NULL; + } + PerlIO_pop(aTHX_ f); + return 0; +} + +void +PerlIOPending_set_ptrcnt(PerlIO *f, STDCHAR *ptr, SSize_t cnt) +{ + if (cnt <= 0) + { + PerlIO_flush(f); + } + else + { + PerlIOBuf_set_ptrcnt(f,ptr,cnt); + } +} + +IV +PerlIOPending_pushed(PerlIO *f,const char *mode,SV *arg) +{ + IV code = PerlIOBase_pushed(f,mode,arg); + PerlIOl *l = PerlIOBase(f); + /* Our PerlIO_fast_gets must match what we are pushed on, + or sv_gets() etc. get muddled when it changes mid-string + when we auto-pop. + */ + l->flags = (l->flags & ~(PERLIO_F_FASTGETS|PERLIO_F_UTF8)) | + (PerlIOBase(PerlIONext(f))->flags & (PERLIO_F_FASTGETS|PERLIO_F_UTF8)); + return code; +} + +SSize_t +PerlIOPending_read(PerlIO *f, void *vbuf, Size_t count) +{ + SSize_t avail = PerlIO_get_cnt(f); + SSize_t got = 0; + if (count < avail) + avail = count; + if (avail > 0) + got = PerlIOBuf_read(f,vbuf,avail); + if (got >= 0 && got < count) + { + SSize_t more = PerlIO_read(f,((STDCHAR *) vbuf)+got,count-got); + if (more >= 0 || got == 0) + got += more; + } + return got; +} + +PerlIO_funcs PerlIO_pending = { + "pending", + sizeof(PerlIOBuf), + PERLIO_K_BUFFERED, + PerlIOPending_pushed, + PerlIOBase_noop_ok, + NULL, + NULL, + PerlIOBase_fileno, + PerlIOPending_read, + PerlIOBuf_unread, + PerlIOBuf_write, + PerlIOPending_seek, + PerlIOBuf_tell, + PerlIOPending_close, + PerlIOPending_flush, + PerlIOPending_fill, + PerlIOBase_eof, + PerlIOBase_error, + PerlIOBase_clearerr, + PerlIOBase_setlinebuf, + PerlIOBuf_get_base, + PerlIOBuf_bufsiz, + PerlIOBuf_get_ptr, + PerlIOBuf_get_cnt, + PerlIOPending_set_ptrcnt, +}; + + + +/*--------------------------------------------------------------------------------------*/ /* crlf - translation On read translate CR,LF to "\n" we do this by overriding ptr/cnt entries to hand back a line at a time and keeping a record of which nl we "lied" about. @@ -2029,56 +3040,77 @@ typedef struct STDCHAR *nl; /* Position of crlf we "lied" about in the buffer */ } PerlIOCrlf; +IV +PerlIOCrlf_pushed(PerlIO *f, const char *mode,SV *arg) +{ + IV code; + PerlIOBase(f)->flags |= PERLIO_F_CRLF; + code = PerlIOBuf_pushed(f,mode,arg); +#if 0 + PerlIO_debug("PerlIOCrlf_pushed f=%p %s %s fl=%08"UVxf"\n", + f,PerlIOBase(f)->tab->name,(mode) ? mode : "(Null)", + PerlIOBase(f)->flags); +#endif + return code; +} + + SSize_t PerlIOCrlf_unread(PerlIO *f, const void *vbuf, Size_t count) { - const STDCHAR *buf = (const STDCHAR *) vbuf+count; - PerlIOBuf *b = PerlIOSelf(f,PerlIOBuf); PerlIOCrlf *c = PerlIOSelf(f,PerlIOCrlf); - SSize_t unread = 0; - if (PerlIOBase(f)->flags & PERLIO_F_WRBUF) - PerlIO_flush(f); if (c->nl) { *(c->nl) = 0xd; c->nl = NULL; } - if (!b->buf) - PerlIO_get_base(f); - if (b->buf) + if (!(PerlIOBase(f)->flags & PERLIO_F_CRLF)) + return PerlIOBuf_unread(f,vbuf,count); + else { - if (!(PerlIOBase(f)->flags & PERLIO_F_RDBUF)) - { - b->end = b->ptr = b->buf + b->bufsiz; - PerlIOBase(f)->flags |= PERLIO_F_RDBUF; - } - while (count > 0 && b->ptr > b->buf) + const STDCHAR *buf = (const STDCHAR *) vbuf+count; + PerlIOBuf *b = PerlIOSelf(f,PerlIOBuf); + SSize_t unread = 0; + if (PerlIOBase(f)->flags & PERLIO_F_WRBUF) + PerlIO_flush(f); + if (!b->buf) + PerlIO_get_base(f); + if (b->buf) { - int ch = *--buf; - if (ch == '\n') + if (!(PerlIOBase(f)->flags & PERLIO_F_RDBUF)) + { + b->end = b->ptr = b->buf + b->bufsiz; + PerlIOBase(f)->flags |= PERLIO_F_RDBUF; + b->posn -= b->bufsiz; + } + while (count > 0 && b->ptr > b->buf) { - if (b->ptr - 2 >= b->buf) + int ch = *--buf; + if (ch == '\n') { - *--(b->ptr) = 0xa; - *--(b->ptr) = 0xd; - unread++; - count--; + if (b->ptr - 2 >= b->buf) + { + *--(b->ptr) = 0xa; + *--(b->ptr) = 0xd; + unread++; + count--; + } + else + { + buf++; + break; + } } else { - buf++; - break; + *--(b->ptr) = ch; + unread++; + count--; } } - else - { - *--(b->ptr) = ch; - unread++; - count--; - } } + return unread; } - return unread; } SSize_t @@ -2090,7 +3122,7 @@ PerlIOCrlf_get_cnt(PerlIO *f) if (PerlIOBase(f)->flags & PERLIO_F_RDBUF) { PerlIOCrlf *c = PerlIOSelf(f,PerlIOCrlf); - if (!c->nl) + if ((PerlIOBase(f)->flags & PERLIO_F_CRLF) && !c->nl) { STDCHAR *nl = b->ptr; scan: @@ -2124,7 +3156,6 @@ PerlIOCrlf_get_cnt(PerlIO *f) else { int code; - dTHX; b->ptr++; /* say we have read it as far as flush() is concerned */ b->buf++; /* Leave space an front of buffer */ b->bufsiz--; /* Buffer is thus smaller */ @@ -2151,6 +3182,7 @@ PerlIOCrlf_set_ptrcnt(PerlIO *f, STDCHAR *ptr, SSize_t cnt) { PerlIOBuf *b = PerlIOSelf(f,PerlIOBuf); PerlIOCrlf *c = PerlIOSelf(f,PerlIOCrlf); + IV flags = PerlIOBase(f)->flags; if (!b->buf) PerlIO_get_base(f); if (!ptr) @@ -2160,7 +3192,7 @@ PerlIOCrlf_set_ptrcnt(PerlIO *f, STDCHAR *ptr, SSize_t cnt) else { ptr = b->end; - if (ptr > b->buf && ptr[-1] == 0xd) + if ((flags & PERLIO_F_CRLF) && ptr > b->buf && ptr[-1] == 0xd) ptr--; } ptr -= cnt; @@ -2174,16 +3206,16 @@ PerlIOCrlf_set_ptrcnt(PerlIO *f, STDCHAR *ptr, SSize_t cnt) else { chk = b->end; - if (chk > b->buf && chk[-1] == 0xd) + if ((flags & PERLIO_F_CRLF) && chk > b->buf && chk[-1] == 0xd) chk--; } chk -= cnt; - + if (ptr != chk) { dTHX; - Perl_croak(aTHX_ "ptr wrong %p != %p nl=%p e=%p for %d", - ptr, chk, c->nl, b->end, cnt); + Perl_croak(aTHX_ "ptr wrong %p != %p fl=%08"UVxf" nl=%p e=%p for %d", + ptr, chk, flags, c->nl, b->end, cnt); } } if (c->nl) @@ -2203,52 +3235,59 @@ PerlIOCrlf_set_ptrcnt(PerlIO *f, STDCHAR *ptr, SSize_t cnt) SSize_t PerlIOCrlf_write(PerlIO *f, const void *vbuf, Size_t count) { - PerlIOBuf *b = PerlIOSelf(f,PerlIOBuf); - const STDCHAR *buf = (const STDCHAR *) vbuf; - const STDCHAR *ebuf = buf+count; - if (!b->buf) - PerlIO_get_base(f); - if (!(PerlIOBase(f)->flags & PERLIO_F_CANWRITE)) - return 0; - while (buf < ebuf) + if (!(PerlIOBase(f)->flags & PERLIO_F_CRLF)) + return PerlIOBuf_write(f,vbuf,count); + else { - STDCHAR *eptr = b->buf+b->bufsiz; - PerlIOBase(f)->flags |= PERLIO_F_WRBUF; - while (buf < ebuf && b->ptr < eptr) + PerlIOBuf *b = PerlIOSelf(f,PerlIOBuf); + const STDCHAR *buf = (const STDCHAR *) vbuf; + const STDCHAR *ebuf = buf+count; + if (!b->buf) + PerlIO_get_base(f); + if (!(PerlIOBase(f)->flags & PERLIO_F_CANWRITE)) + return 0; + while (buf < ebuf) { - if (*buf == '\n') + STDCHAR *eptr = b->buf+b->bufsiz; + PerlIOBase(f)->flags |= PERLIO_F_WRBUF; + while (buf < ebuf && b->ptr < eptr) { - if ((b->ptr + 2) > eptr) - { - /* Not room for both */ - PerlIO_flush(f); - break; - } - else + if (*buf == '\n') { - *(b->ptr)++ = 0xd; /* CR */ - *(b->ptr)++ = 0xa; /* LF */ - buf++; - if (PerlIOBase(f)->flags & PERLIO_F_LINEBUF) + if ((b->ptr + 2) > eptr) { + /* Not room for both */ PerlIO_flush(f); break; } + else + { + *(b->ptr)++ = 0xd; /* CR */ + *(b->ptr)++ = 0xa; /* LF */ + buf++; + if (PerlIOBase(f)->flags & PERLIO_F_LINEBUF) + { + PerlIO_flush(f); + break; + } + } + } + else + { + int ch = *buf++; + *(b->ptr)++ = ch; + } + if (b->ptr >= eptr) + { + PerlIO_flush(f); + break; } - } - else - { - int ch = *buf++; - *(b->ptr)++ = ch; - } - if (b->ptr >= eptr) - { - PerlIO_flush(f); - break; } } + if (PerlIOBase(f)->flags & PERLIO_F_UNBUF) + PerlIO_flush(f); + return (buf - (STDCHAR *) vbuf); } - return (buf - (STDCHAR *) vbuf); } IV @@ -2266,13 +3305,12 @@ PerlIOCrlf_flush(PerlIO *f) PerlIO_funcs PerlIO_crlf = { "crlf", sizeof(PerlIOCrlf), - 0, - PerlIOBase_fileno, - PerlIOBuf_fdopen, - PerlIOBuf_open, - PerlIOBuf_reopen, - PerlIOBase_pushed, + PERLIO_K_BUFFERED|PERLIO_K_CANCRLF, + PerlIOCrlf_pushed, PerlIOBase_noop_ok, /* popped */ + PerlIOBuf_open, + NULL, + PerlIOBase_fileno, PerlIOBuf_read, /* generic read works with ptr/cnt lies ... */ PerlIOCrlf_unread, /* Put CR,LF in buffer for each '\n' */ PerlIOCrlf_write, /* Put CR,LF in buffer for each '\n' */ @@ -2284,7 +3322,7 @@ PerlIO_funcs PerlIO_crlf = { PerlIOBase_eof, PerlIOBase_error, PerlIOBase_clearerr, - PerlIOBuf_setlinebuf, + PerlIOBase_setlinebuf, PerlIOBuf_get_base, PerlIOBuf_bufsiz, PerlIOBuf_get_ptr, @@ -2311,7 +3349,6 @@ PerlIOMmap_map(PerlIO *f) { dTHX; PerlIOMmap *m = PerlIOSelf(f,PerlIOMmap); - PerlIOBuf *b = &m->base; IV flags = PerlIOBase(f)->flags; IV code = 0; if (m->len) @@ -2369,12 +3406,15 @@ PerlIOMmap_map(PerlIO *f) } posn = (b->posn / page_size) * page_size; len = st.st_size - posn; - m->mptr = mmap(NULL, len, PROT_READ, MAP_PRIVATE, fd, posn); + m->mptr = mmap(NULL, len, PROT_READ, MAP_SHARED, fd, posn); if (m->mptr && m->mptr != (Mmap_t) -1) { -#if defined(HAS_MADVISE) && defined(MADV_SEQUENTIAL) +#if 0 && defined(HAS_MADVISE) && defined(MADV_SEQUENTIAL) madvise(m->mptr, len, MADV_SEQUENTIAL); #endif +#if 0 && defined(HAS_MADVISE) && defined(MADV_WILLNEED) + madvise(m->mptr, len, MADV_WILLNEED); +#endif PerlIOBase(f)->flags = (flags & ~PERLIO_F_EOF) | PERLIO_F_RDBUF; b->end = ((STDCHAR *)m->mptr) + len; b->buf = ((STDCHAR *)m->mptr) + (b->posn - posn); @@ -2478,7 +3518,7 @@ PerlIOMmap_unread(PerlIO *f, const void *vbuf, Size_t count) m->bbuf = b->buf; } } - return PerlIOBuf_unread(f,vbuf,count); +return PerlIOBuf_unread(f,vbuf,count); } SSize_t @@ -2569,13 +3609,12 @@ PerlIOMmap_close(PerlIO *f) PerlIO_funcs PerlIO_mmap = { "mmap", sizeof(PerlIOMmap), - 0, - PerlIOBase_fileno, - PerlIOBuf_fdopen, - PerlIOBuf_open, - PerlIOBuf_reopen, - PerlIOBase_pushed, + PERLIO_K_BUFFERED, + PerlIOBuf_pushed, PerlIOBase_noop_ok, + PerlIOBuf_open, + NULL, + PerlIOBase_fileno, PerlIOBuf_read, PerlIOMmap_unread, PerlIOMmap_write, @@ -2587,7 +3626,7 @@ PerlIO_funcs PerlIO_mmap = { PerlIOBase_eof, PerlIOBase_error, PerlIOBase_clearerr, - PerlIOBuf_setlinebuf, + PerlIOBase_setlinebuf, PerlIOMmap_get_base, PerlIOBuf_bufsiz, PerlIOBuf_get_ptr, @@ -2600,9 +3639,15 @@ PerlIO_funcs PerlIO_mmap = { void PerlIO_init(void) { + dTHX; +#ifndef WIN32 + call_atexit(PerlIO_cleanup_layers, NULL); +#endif if (!_perlio) { +#ifndef WIN32 atexit(&PerlIO_cleanup); +#endif } } @@ -2611,7 +3656,10 @@ PerlIO * PerlIO_stdin(void) { if (!_perlio) - PerlIO_stdstreams(); + { + dTHX; + PerlIO_stdstreams(aTHX); + } return &_perlio[1]; } @@ -2620,7 +3668,10 @@ PerlIO * PerlIO_stdout(void) { if (!_perlio) - PerlIO_stdstreams(); + { + dTHX; + PerlIO_stdstreams(aTHX); + } return &_perlio[2]; } @@ -2629,7 +3680,10 @@ PerlIO * PerlIO_stderr(void) { if (!_perlio) - PerlIO_stdstreams(); + { + dTHX; + PerlIO_stdstreams(aTHX); + } return &_perlio[3]; } @@ -2640,8 +3694,14 @@ char * PerlIO_getname(PerlIO *f, char *buf) { dTHX; + char *name = NULL; +#ifdef VMS + FILE *stdio = PerlIOSelf(f,PerlIOStdio)->stdio; + if (stdio) name = fgetname(stdio, buf); +#else Perl_croak(aTHX_ "Don't know how to get file name"); - return NULL; +#endif + return name; } @@ -2708,6 +3768,7 @@ PerlIO_vprintf(PerlIO *f, const char *fmt, va_list ap) SV *sv = newSVpvn("",0); char *s; STRLEN len; + SSize_t wrote; #ifdef NEED_VA_COPY va_list apc; Perl_va_copy(ap, apc); @@ -2716,7 +3777,9 @@ PerlIO_vprintf(PerlIO *f, const char *fmt, va_list ap) sv_vcatpvf(sv, fmt, &ap); #endif s = SvPV(sv,len); - return PerlIO_write(f,s,len); + wrote = PerlIO_write(f,s,len); + SvREFCNT_dec(sv); + return wrote; } #undef PerlIO_printf @@ -2749,11 +3812,12 @@ PerlIO_tmpfile(void) { /* I have no idea how portable mkstemp() is ... */ #if defined(WIN32) || !defined(HAVE_MKSTEMP) + dTHX; PerlIO *f = NULL; - FILE *stdio = tmpfile(); + FILE *stdio = PerlSIO_tmpfile(); if (stdio) { - PerlIOStdio *s = PerlIOSelf(PerlIO_push(f = PerlIO_allocate(),&PerlIO_stdio,"w+"),PerlIOStdio); + PerlIOStdio *s = PerlIOSelf(PerlIO_push(aTHX_ (f = PerlIO_allocate(aTHX)),&PerlIO_stdio,"w+",Nullsv),PerlIOStdio); s->stdio = stdio; } return f; @@ -2790,47 +3854,70 @@ PerlIO_tmpfile(void) #ifndef HAS_FSETPOS #undef PerlIO_setpos int -PerlIO_setpos(PerlIO *f, const Fpos_t *pos) +PerlIO_setpos(PerlIO *f, SV *pos) { - return PerlIO_seek(f,*pos,0); + dTHX; + if (SvOK(pos)) + { + STRLEN len; + Off_t *posn = (Off_t *) SvPV(pos,len); + if (f && len == sizeof(Off_t)) + return PerlIO_seek(f,*posn,SEEK_SET); + } + SETERRNO(EINVAL,SS$_IVCHAN); + return -1; } #else -#ifndef PERLIO_IS_STDIO #undef PerlIO_setpos int -PerlIO_setpos(PerlIO *f, const Fpos_t *pos) +PerlIO_setpos(PerlIO *f, SV *pos) { + dTHX; + if (SvOK(pos)) + { + STRLEN len; + Fpos_t *fpos = (Fpos_t *) SvPV(pos,len); + if (f && len == sizeof(Fpos_t)) + { #if defined(USE_64_BIT_STDIO) && defined(USE_FSETPOS64) - return fsetpos64(f, pos); + return fsetpos64(f, fpos); #else - return fsetpos(f, pos); + return fsetpos(f, fpos); #endif + } + } + SETERRNO(EINVAL,SS$_IVCHAN); + return -1; } #endif -#endif #ifndef HAS_FGETPOS #undef PerlIO_getpos int -PerlIO_getpos(PerlIO *f, Fpos_t *pos) +PerlIO_getpos(PerlIO *f, SV *pos) { - *pos = PerlIO_tell(f); - return *pos == -1 ? -1 : 0; + dTHX; + Off_t posn = PerlIO_tell(f); + sv_setpvn(pos,(char *)&posn,sizeof(posn)); + return (posn == (Off_t)-1) ? -1 : 0; } #else -#ifndef PERLIO_IS_STDIO #undef PerlIO_getpos int -PerlIO_getpos(PerlIO *f, Fpos_t *pos) +PerlIO_getpos(PerlIO *f, SV *pos) { + dTHX; + Fpos_t fpos; + int code; #if defined(USE_64_BIT_STDIO) && defined(USE_FSETPOS64) - return fgetpos64(f, pos); + code = fgetpos64(f, &fpos); #else - return fgetpos(f, pos); + code = fgetpos(f, &fpos); #endif + sv_setpvn(pos,(char *)&fpos,sizeof(fpos)); + return code; } #endif -#endif #if (defined(PERLIO_IS_STDIO) || !defined(USE_SFIO)) && !defined(HAS_VPRINTF) @@ -2882,5 +3969,7 @@ PerlIO_sprintf(char *s, int n, const char *fmt,...) } #endif -#endif /* !PERL_IMPLICIT_SYS */ + + +