/* 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.
#undef PerlMemShared_free
#define PerlMemShared_free(x) free(x)
-
-#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;
-}
-
int
perlsio_binmode(FILE *fp, int iotype, int mode)
{
}
return 0;
# else
+ dTHX;
if (PerlLIO_setmode(fileno(fp), mode) != -1) {
# if defined(WIN32) && defined(__BORLANDC__)
/* The translation mode of the stream is maintained independent
#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;
+}
+
int
PerlIO_binmode(pTHX_ PerlIO *fp, int iotype, int mode, const char *names)
{
return perlsio_binmode(fp,iotype,mode);
}
+/* 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)
+ {
+ char *name = SvPV_nolen(*args);
+ if (*mode == '#')
+ {
+ fd = PerlLIO_open3(name,imode,perm);
+ if (fd >= 0)
+ return PerlIO_fdopen(fd,mode+1);
+ }
+ else if (old)
+ {
+ return PerlIO_reopen(name,mode,old);
+ }
+ else
+ {
+ return PerlIO_open(name,mode);
+ }
+ }
+ else
+ {
+ return PerlIO_fdopen(fd,mode);
+ }
+ return NULL;
+}
+
#endif
PerlIO *_perlio = NULL;
#define PERLIO_TABLE_SIZE 64
+
+
PerlIO *
PerlIO_allocate(pTHX)
{
}
void
-PerlIO_pop(PerlIO *f)
+PerlIO_pop(pTHX_ PerlIO *f)
{
- dTHX;
PerlIOl *l = *f;
if (l)
{
PerlIO_debug("PerlIO_pop f=%p %s\n",f,l->tab->name);
- (*l->tab->Popped)(f);
+ if (l->tab->Popped)
+ (*l->tab->Popped)(f);
*f = l->next;
PerlMemShared_free(l);
}
}
SV *
-PerlIO_find_layer(const char *name, STRLEN len)
+PerlIO_find_layer(pTHX_ const char *name, STRLEN len)
{
- dTHX;
SV **svp;
SV *sv;
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;
+ if (!svp && 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 NULL;
}
{
STRLEN len;
const char *name = SvPV(ST(i),len);
- SV *layer = PerlIO_find_layer(name,len);
+ SV *layer = PerlIO_find_layer(aTHX_ name,len);
if (layer)
{
av_push(av,SvREFCNT_inc(layer));
XSRETURN(count);
}
-void
-PerlIO_define_layer(PerlIO_funcs *tab)
+SV *
+PerlIO_tab_sv(pTHX_ PerlIO_funcs *tab)
{
- dTHX;
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);
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)
+ {
+ tab = &PerlIO_stdio;
+ }
+ }
+ PerlIO_debug("Pushing %s\n",tab->name);
+ av_push(av,SvREFCNT_inc(PerlIO_find_layer(aTHX_ tab->name,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;
+}
+
+#define MYARG PerlIO_arg_fetch(aTHX_ layers,n+1)
+
+
+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:layer array corrupt");
+ return def;
+}
+
+AV *
+PerlIO_default_layers(pTHX)
+{
+ IV len;
+ if (!PerlIO_layer_av)
{
- if (O_BINARY != O_TEXT)
+ const char *s = (PL_tainting) ? Nullch : PerlEnv_getenv("PERLIO");
+ PerlIO_layer_av = get_av("open::layers",GV_ADD|GV_ADDMULTI);
+ 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_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)));
+ av_push(PerlIO_layer_av,&PL_sv_undef);
+ if (s)
{
- av_push(PerlIO_layer_av,SvREFCNT_inc(PerlIO_find_layer(PerlIO_crlf.name,0)));
+ PerlIO_parse_layers(aTHX_ PerlIO_layer_av,s);
}
else
{
- if (PerlIO_stdio.Set_ptrcnt)
- {
- av_push(PerlIO_layer_av,SvREFCNT_inc(PerlIO_find_layer(PerlIO_stdio.name,0)));
- }
- 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;
}
-#define PerlIO_default_top() PerlIO_default_layer(-1)
-#define PerlIO_default_btm() PerlIO_default_layer(0)
+
+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(aTHX_ -1)
+#define PerlIO_default_btm() PerlIO_default_layer(aTHX_ 0)
void
-PerlIO_stdstreams()
+PerlIO_stdstreams(pTHX)
{
if (!_perlio)
{
- dTHX;
PerlIO_allocate(aTHX);
PerlIO_fdopen(0,"Ir" PERLIO_STDTEXT);
PerlIO_fdopen(1,"Iw" PERLIO_STDTEXT);
}
PerlIO *
-PerlIO_push(PerlIO *f,PerlIO_funcs *tab,const char *mode,const char *arg,STRLEN len)
+PerlIO_push(pTHX_ PerlIO *f,PerlIO_funcs *tab,const char *mode,SV *arg)
{
- dTHX;
PerlIOl *l = NULL;
l = PerlMemShared_calloc(tab->size,sizeof(char));
if (l)
l->next = *f;
l->tab = tab;
*f = l;
- PerlIO_debug("PerlIO_push f=%p %s %s\n",f,tab->name,(mode) ? mode : "(Null)");
- if ((*l->tab->Pushed)(f,mode,arg,len) != 0)
+ PerlIO_debug("PerlIO_push f=%p %s %s '%s'\n",f,tab->name,
+ (mode) ? mode : "(Null)",(arg) ? SvPV_nolen(arg) : "(Null)");
+ 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)
+ {
+ int code = 0;
+ 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;
- const char *as = Nullch;
- const char *ae = Nullch;
- int count = 0;
- while (*e && *e != ':' && !isSPACE(*e))
- {
- if (*e == '(')
- {
- if (!as)
- as = e;
- count++;
- }
- else if (*e == ')')
- {
- if (as && --count == 0)
- ae = 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 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
- {
- STRLEN len = ((as) ? as : e)-s;
- SV *layer = PerlIO_find_layer(s,len);
- if (layer)
- {
- PerlIO_funcs *tab = INT2PTR(PerlIO_funcs *, SvIV(SvRV(layer)));
- if (tab)
- {
- len = (as) ? (ae-(as++)-1) : 0;
- if (!PerlIO_push(f,tab,mode,as,len))
- return -1;
- }
- }
- else
- Perl_warn(aTHX_ "perlio: unknown layer \"%.*s\"",(int)len,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;
+}
+
+int
+PerlIO_apply_layera(pTHX_ PerlIO *f, const char *mode, AV *layers, IV n)
+{
+ IV max = av_len(layers)+1;
+ int code = 0;
+ while (n < max)
+ {
+ PerlIO_funcs *tab = PerlIO_layer_fetch(aTHX_ layers,n,NULL);
+ if (tab)
+ {
+ if (!PerlIO_push(aTHX_ f,tab,mode,MYARG))
+ {
+ code -1;
+ break;
+ }
+ }
+ n += 2;
+ }
+ return code;
}
+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;
+}
/*--------------------------------------------------------------------------------------*/
int
PerlIO_close(PerlIO *f)
{
+ dTHX;
int code = (*PerlIOBase(f)->tab->Close)(f);
while (*f)
{
- PerlIO_pop(f);
+ PerlIO_pop(aTHX_ f);
}
return code;
}
return (*PerlIOBase(f)->tab->Fileno)(f);
}
+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;
+}
+
+AV *
+PerlIO_resolve_layers(pTHX_ const char *layers,const char *mode,int narg, SV **args)
+{
+ AV *def = PerlIO_default_layers(aTHX);
+ if (!_perlio)
+ PerlIO_stdstreams(aTHX);
+ /* FIXME !!! */
+ if (!layers)
+ layers = PerlIO_context_layers(aTHX_ mode);
+ if (layers && *layers)
+ {
+ AV *av = newAV();
+ IV n = av_len(def)+1;
+ while (n-- > 0)
+ {
+ SV **svp = av_fetch(def,n,0);
+ av_store(av,n,(svp) ? SvREFCNT_inc(*svp) : &PL_sv_undef);
+ }
+ PerlIO_parse_layers(aTHX_ av,layers);
+ return av;
+ }
+ else
+ {
+ 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)
+{
+ AV *layera;
+ IV n;
+ PerlIO_funcs *tab;
+ if (f && *f)
+ {
+ 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,Nullch,0) == 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
{
if (f)
{
- return (*PerlIOBase(f)->tab->Flush)(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);
+ errno = EINVAL;
+ return -1;
+ }
}
else
{
(*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)
{
- 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);
+ 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" */
}
IV
-PerlIOBase_pushed(PerlIO *f, const char *mode, const char *arg, STRLEN len)
+PerlIOBase_pushed(PerlIO *f, const char *mode, SV *arg)
{
PerlIOl *l = PerlIOBase(f);
const char *omode = mode;
return 0;
}
-extern PerlIO_funcs PerlIO_pending;
-
SSize_t
PerlIOBase_unread(PerlIO *f, const void *vbuf, Size_t count)
{
-#if 0
+ dTHX;
Off_t old = PerlIO_tell(f);
- if (0 && PerlIO_seek(f,-((Off_t)count),SEEK_CUR) == 0)
- {
- Off_t new = PerlIO_tell(f);
- return old - new;
- }
- else
- {
- return 0;
- }
-#else
- PerlIO_push(f,&PerlIO_pending,"r",Nullch,0);
- return PerlIOBuf_unread(f,vbuf,count);
-#endif
+ 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;
}
IV
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)
{
- dTHX;
- 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(aTHX),self,mode,Nullch,0),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)
{
- dTHX;
- 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(aTHX),self,mode,Nullch,0),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)
{
- dTHX;
- 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,MYARG),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
PerlIOBase(f)->flags |= PERLIO_F_EOF;
return len;
}
+ PERL_ASYNC_CHECK();
}
}
PerlIOBase(f)->flags |= PERLIO_F_ERROR;
return len;
}
+ PERL_ASYNC_CHECK();
}
}
code = -1;
break;
}
+ PERL_ASYNC_CHECK();
}
if (code == 0)
{
"unix",
sizeof(PerlIOUnix),
PERLIO_K_RAW,
- PerlIOUnix_fileno,
- PerlIOUnix_fdopen,
- PerlIOUnix_open,
- PerlIOUnix_reopen,
- PerlIOBase_pushed,
+ PerlIOUnix_pushed,
PerlIOBase_noop_ok,
+ PerlIOUnix_open,
+ NULL,
+ PerlIOUnix_fileno,
PerlIOUnix_read,
PerlIOBase_unread,
PerlIOUnix_write,
return ret;
}
-PerlIO *
-PerlIOStdio_fdopen(PerlIO_funcs *self, int fd,const char *mode)
+/* This isn't used yet ... */
+IV
+PerlIOStdio_pushed(PerlIO *f, const char *mode, SV *arg)
{
dTHX;
- PerlIO *f = NULL;
- int init = 0;
- char tmode[8];
- if (*mode == 'I')
- {
- init = 1;
- mode++;
- }
- if (fd >= 0)
+ if (*PerlIONext(f))
{
- FILE *stdio = NULL;
- 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));
- }
+ 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(aTHX),self,mode,Nullch,0),PerlIOStdio);
- s->stdio = stdio;
- }
+ s->stdio = stdio;
+ else
+ return -1;
}
- return f;
+ return PerlIOBase_pushed(f,mode,arg);
}
#undef PerlIO_importFILE
PerlIO *f = NULL;
if (stdio)
{
- PerlIOStdio *s = PerlIOSelf(PerlIO_push(f = PerlIO_allocate(aTHX),&PerlIO_stdio,"r+",Nullch,0),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)
{
- dTHX;
- PerlIO *f = NULL;
- FILE *stdio = PerlSIO_fopen(path,mode);
- if (stdio)
+ char tmode[8];
+ if (f)
{
- char tmode[8];
- PerlIOStdio *s = PerlIOSelf(PerlIO_push(f = PerlIO_allocate(aTHX), self,
- (mode = PerlIOStdio_mode(mode,tmode)),Nullch,0),
- 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)
-{
- dTHX;
- PerlIOStdio *s = PerlIOSelf(f,PerlIOStdio);
- char tmode[8];
- FILE *stdio = PerlSIO_freopen(path,(mode = PerlIOStdio_mode(mode,tmode)),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)),MYARG),
+ 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,MYARG),PerlIOStdio);
+ s->stdio = stdio;
+ return f;
+ }
+ }
+ }
+ return NULL;
}
SSize_t
PerlIOStdio_close(PerlIO *f)
{
dTHX;
-#ifdef HAS_SOCKET
+#ifdef HAS_SOCKS5_INIT
int optval, optlen = sizeof(int);
#endif
FILE *stdio = PerlIOSelf(f,PerlIOStdio)->stdio;
return(
-#ifdef HAS_SOCKET
+#ifdef HAS_SOCKS5_INIT
(getsockopt(PerlIO_fileno(f), SOL_SOCKET, SO_TYPE, (char *)&optval, &optlen) < 0) ?
PerlSIO_fclose(stdio) :
close(PerlIO_fileno(f))
"stdio",
sizeof(PerlIOStdio),
PERLIO_K_BUFFERED,
- PerlIOStdio_fileno,
- PerlIOStdio_fdopen,
- PerlIOStdio_open,
- PerlIOStdio_reopen,
PerlIOBase_pushed,
PerlIOBase_noop_ok,
+ PerlIOStdio_open,
+ NULL,
+ PerlIOStdio_fileno,
PerlIOStdio_read,
PerlIOStdio_unread,
PerlIOStdio_write,
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);
}
/* perlio buffer layer */
IV
-PerlIOBuf_pushed(PerlIO *f, const char *mode, const char *arg, STRLEN len)
+PerlIOBuf_pushed(PerlIO *f, const char *mode, SV *arg)
{
PerlIOBuf *b = PerlIOSelf(f,PerlIOBuf);
- b->posn = PerlIO_tell(PerlIONext(f));
- return PerlIOBase_pushed(f,mode,arg,len);
-}
-
-PerlIO *
-PerlIOBuf_fdopen(PerlIO_funcs *self, int fd, const char *mode)
-{
- dTHX;
- PerlIO_funcs *tab = PerlIO_default_btm();
- int init = 0;
- PerlIO *f;
- if (*mode == 'I')
+ int fd = PerlIO_fileno(f);
+ Off_t posn;
+ if (fd >= 0 && PerlLIO_isatty(fd))
{
- init = 1;
- mode++;
+ PerlIOBase(f)->flags |= PERLIO_F_LINEBUF;
}
-#if O_BINARY != O_TEXT
- /* do something about failing setmode()? --jhi */
- PerlLIO_setmode(fd, O_BINARY);
-#endif
- f = (*tab->Fdopen)(tab,fd,mode);
- if (f)
+ posn = PerlIO_tell(PerlIONext(f));
+ if (posn != (Off_t) -1)
{
- PerlIOBuf *b = PerlIOSelf(PerlIO_push(f,self,mode,Nullch,0),PerlIOBuf);
- if (init && fd == 2)
- {
- /* Initial stderr is unbuffered */
- PerlIOBase(f)->flags |= PERLIO_F_UNBUF;
- }
-#if 0
- PerlIO_debug("PerlIOBuf_fdopen %s f=%p fd=%d m=%s fl=%08"UVxf"\n",
- self->name,f,fd,mode,PerlIOBase(f)->flags);
-#endif
+ 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)
{
- PerlIO_push(f,self,mode,Nullch,0);
+ 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,MYARG) != 0)
+ {
+ return NULL;
+ }
+ }
+ else
+ {
+ 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)
+ {
+ PerlIOBuf *b = PerlIOSelf(PerlIO_push(aTHX_ f,self,mode,MYARG),PerlIOBuf);
+ 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 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,Nullch,0);
- return code;
-}
-
/* This "flush" is akin to sfio's sync in that it handles files in either
read or write state
*/
/* write() the buffer */
STDCHAR *buf = b->buf;
STDCHAR *p = buf;
- int count;
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;
"perlio",
sizeof(PerlIOBuf),
PERLIO_K_BUFFERED,
- PerlIOBase_fileno,
- PerlIOBuf_fdopen,
- PerlIOBuf_open,
- PerlIOBuf_reopen,
PerlIOBuf_pushed,
PerlIOBase_noop_ok,
+ PerlIOBuf_open,
+ NULL,
+ PerlIOBase_fileno,
PerlIOBuf_read,
PerlIOBuf_unread,
PerlIOBuf_write,
IV
PerlIOPending_flush(PerlIO *f)
{
+ dTHX;
PerlIOBuf *b = PerlIOSelf(f,PerlIOBuf);
if (b->buf && b->buf != (STDCHAR *) &b->oneword)
{
- dTHX;
PerlMemShared_free(b->buf);
b->buf = NULL;
}
- PerlIO_pop(f);
+ PerlIO_pop(aTHX_ f);
return 0;
}
}
IV
-PerlIOPending_pushed(PerlIO *f,const char *mode,const char *arg,STRLEN len)
+PerlIOPending_pushed(PerlIO *f,const char *mode,SV *arg)
{
- IV code = PerlIOBuf_pushed(f,mode,arg,len);
+ 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) |
- (PerlIOBase(PerlIONext(f))->flags & PERLIO_F_FASTGETS);
+ l->flags = (l->flags & ~(PERLIO_F_FASTGETS|PERLIO_F_UTF8)) |
+ (PerlIOBase(PerlIONext(f))->flags & (PERLIO_F_FASTGETS|PERLIO_F_UTF8));
return code;
}
avail = count;
if (avail > 0)
got = PerlIOBuf_read(f,vbuf,avail);
- if (got < count)
- got += PerlIO_read(f,((STDCHAR *) vbuf)+got,count-got);
+ 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,
- PerlIOBase_fileno,
- NULL,
- NULL,
- NULL,
PerlIOPending_pushed,
PerlIOBase_noop_ok,
+ NULL,
+ NULL,
+ PerlIOBase_fileno,
PerlIOPending_read,
PerlIOBuf_unread,
PerlIOBuf_write,
} PerlIOCrlf;
IV
-PerlIOCrlf_pushed(PerlIO *f, const char *mode,const char *arg,STRLEN len)
+PerlIOCrlf_pushed(PerlIO *f, const char *mode,SV *arg)
{
IV code;
PerlIOBase(f)->flags |= PERLIO_F_CRLF;
- code = PerlIOBuf_pushed(f,mode,arg,len);
+ 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)",
"crlf",
sizeof(PerlIOCrlf),
PERLIO_K_BUFFERED|PERLIO_K_CANCRLF,
- PerlIOBase_fileno,
- PerlIOBuf_fdopen,
- PerlIOBuf_open,
- PerlIOBuf_reopen,
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' */
"mmap",
sizeof(PerlIOMmap),
PERLIO_K_BUFFERED,
- PerlIOBase_fileno,
- PerlIOBuf_fdopen,
- PerlIOBuf_open,
- PerlIOBuf_reopen,
PerlIOBuf_pushed,
PerlIOBase_noop_ok,
+ PerlIOBuf_open,
+ NULL,
+ PerlIOBase_fileno,
PerlIOBuf_read,
PerlIOMmap_unread,
PerlIOMmap_write,
PerlIO_stdin(void)
{
if (!_perlio)
- PerlIO_stdstreams();
+ {
+ dTHX;
+ PerlIO_stdstreams(aTHX);
+ }
return &_perlio[1];
}
PerlIO_stdout(void)
{
if (!_perlio)
- PerlIO_stdstreams();
+ {
+ dTHX;
+ PerlIO_stdstreams(aTHX);
+ }
return &_perlio[2];
}
PerlIO_stderr(void)
{
if (!_perlio)
- PerlIO_stdstreams();
+ {
+ dTHX;
+ PerlIO_stdstreams(aTHX);
+ }
return &_perlio[3];
}
SV *sv = newSVpvn("",0);
char *s;
STRLEN len;
+ SSize_t wrote;
#ifdef NEED_VA_COPY
va_list apc;
Perl_va_copy(ap, apc);
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
FILE *stdio = PerlSIO_tmpfile();
if (stdio)
{
- PerlIOStdio *s = PerlIOSelf(PerlIO_push(f = PerlIO_allocate(aTHX),&PerlIO_stdio,"w+",Nullch,0),PerlIOStdio);
+ PerlIOStdio *s = PerlIOSelf(PerlIO_push(aTHX_ (f = PerlIO_allocate(aTHX)),&PerlIO_stdio,"w+",Nullsv),PerlIOStdio);
s->stdio = stdio;
}
return f;