X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perliol.h;h=de875470fa5562d4ff724aa50b5a2ee25a823ed7;hb=adbebc0b48cadbf7319b9fc2090fadc929baf733;hp=04c7071fa4d9d1bedd9a590a24f6cc22fdaaa7f2;hpb=2262cf14e8afd6344e2db8a34a016b75d306accc;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/perliol.h b/perliol.h
index 04c7071..de87547 100644
--- a/perliol.h
+++ b/perliol.h
@@ -6,12 +6,16 @@ struct _PerlIO_funcs
  char *		name;
  Size_t		size;
  IV		kind;
- IV		(*Fileno)(PerlIO *f);
- PerlIO *	(*Fdopen)(PerlIO_funcs *tab, int fd, const char *mode);
- PerlIO *	(*Open)(PerlIO_funcs *tab, const char *path, const char *mode);
- int		(*Reopen)(const char *path, const char *mode, PerlIO *f);
- IV		(*Pushed)(PerlIO *f,const char *mode,const char *arg,STRLEN len);
+ IV		(*Pushed)(PerlIO *f,const char *mode,SV *arg);
  IV		(*Popped)(PerlIO *f);
+ PerlIO *	(*Open)(pTHX_ PerlIO_funcs *tab,
+			AV *layers, IV n,
+			const char *mode,
+			int fd, int imode, int perm,
+			PerlIO *old,
+			int narg, SV **args);
+ SV *		(*Getarg)(PerlIO *f);
+ IV		(*Fileno)(PerlIO *f);
  /* Unix-like functions - cf sfio line disciplines */
  SSize_t	(*Read)(PerlIO *f, void *vbuf, Size_t count);
  SSize_t	(*Unread)(PerlIO *f, const void *vbuf, Size_t count);
@@ -40,6 +44,9 @@ struct _PerlIO_funcs
 #define PERLIO_K_BUFFERED	0x00000002
 #define PERLIO_K_CANCRLF	0x00000004
 #define PERLIO_K_FASTGETS	0x00000008
+#define PERLIO_K_DUMMY		0x00000010
+#define PERLIO_K_UTF8		0x00008000
+#define PERLIO_K_DESTRUCT	0x00010000
 
 /*--------------------------------------------------------------------------------------*/
 struct _PerlIO
@@ -67,24 +74,29 @@ struct _PerlIO
 #define PERLIO_F_TEMP		0x00100000
 #define PERLIO_F_OPEN		0x00200000
 #define PERLIO_F_FASTGETS	0x00400000
+#define PERLIO_F_TTY		0x00800000
 
 #define PerlIOBase(f)      (*(f))
 #define PerlIOSelf(f,type) ((type *)PerlIOBase(f))
 #define PerlIONext(f)      (&(PerlIOBase(f)->next))
 
 /*--------------------------------------------------------------------------------------*/
-
-extern PerlIO_funcs PerlIO_unix;
-extern PerlIO_funcs PerlIO_perlio;
-extern PerlIO_funcs PerlIO_stdio;
-extern PerlIO_funcs PerlIO_crlf;
-/* The EXT is need for Cygwin -- but why only for _pending? --jhi */
+/* Data exports - EXT rather than extern is needed for Cygwin */
+EXT PerlIO_funcs PerlIO_unix;
+EXT PerlIO_funcs PerlIO_perlio;
+EXT PerlIO_funcs PerlIO_stdio;
+EXT PerlIO_funcs PerlIO_crlf;
+EXT PerlIO_funcs PerlIO_utf8;
+EXT PerlIO_funcs PerlIO_byte;
+EXT PerlIO_funcs PerlIO_raw;
 EXT PerlIO_funcs PerlIO_pending;
 #ifdef HAS_MMAP
-extern PerlIO_funcs PerlIO_mmap;
+EXT PerlIO_funcs PerlIO_mmap;
 #endif
 
 extern PerlIO *PerlIO_allocate(pTHX);
+extern SV *PerlIO_arg_fetch(pTHX_ AV *av,IV n);
+#define PerlIOArg PerlIO_arg_fetch(aTHX_ layers,n+1)
 
 #if O_BINARY != O_TEXT
 #define PERLIO_STDTEXT "t"
@@ -96,8 +108,9 @@ extern PerlIO *PerlIO_allocate(pTHX);
 /* Generic, or stub layer functions */
 
 extern IV	PerlIOBase_fileno    (PerlIO *f);
-extern IV	PerlIOBase_pushed    (PerlIO *f, const char *mode,const char *arg,STRLEN len);
+extern IV	PerlIOBase_pushed    (PerlIO *f, const char *mode,SV *arg);
 extern IV	PerlIOBase_popped    (PerlIO *f);
+extern SSize_t	PerlIOBase_read       (PerlIO *f, void *vbuf, Size_t count);
 extern SSize_t	PerlIOBase_unread    (PerlIO *f, const void *vbuf, Size_t count);
 extern IV	PerlIOBase_eof       (PerlIO *f);
 extern IV	PerlIOBase_error     (PerlIO *f);
@@ -106,6 +119,7 @@ extern IV	PerlIOBase_flush     (PerlIO *f);
 extern IV	PerlIOBase_fill      (PerlIO *f);
 extern IV	PerlIOBase_close     (PerlIO *f);
 extern void	PerlIOBase_setlinebuf(PerlIO *f);
+extern void	PerlIOBase_flush_linebuf(void);
 
 extern IV	PerlIOBase_noop_ok   (PerlIO *f);
 extern IV	PerlIOBase_noop_fail (PerlIO *f);
@@ -127,9 +141,8 @@ typedef struct
  IV		oneword;    /* Emergency buffer */
 } PerlIOBuf;
 
-extern PerlIO *	PerlIOBuf_fdopen     (PerlIO_funcs *self, int fd, const char *mode);
-extern PerlIO *	PerlIOBuf_open       (PerlIO_funcs *self, const char *path, const char *mode);
-extern int	PerlIOBuf_reopen     (const char *path, const char *mode, PerlIO *f);
+extern PerlIO *	PerlIOBuf_open       (pTHX_ PerlIO_funcs *self, AV *layers, IV n, const char *mode, int fd, int imode, int perm, PerlIO *old, int narg, SV **args);
+extern IV	PerlIOBuf_pushed     (PerlIO *f, const char *mode,SV *arg);
 extern SSize_t	PerlIOBuf_read       (PerlIO *f, void *vbuf, Size_t count);
 extern SSize_t	PerlIOBuf_unread     (PerlIO *f, const void *vbuf, Size_t count);
 extern SSize_t	PerlIOBuf_write      (PerlIO *f, const void *vbuf, Size_t count);
@@ -138,7 +151,6 @@ extern Off_t	PerlIOBuf_tell       (PerlIO *f);
 extern IV	PerlIOBuf_close      (PerlIO *f);
 extern IV	PerlIOBuf_flush      (PerlIO *f);
 extern IV	PerlIOBuf_fill       (PerlIO *f);
-extern void	PerlIOBuf_setlinebuf (PerlIO *f);
 extern STDCHAR *PerlIOBuf_get_base   (PerlIO *f);
 extern Size_t	PerlIOBuf_bufsiz     (PerlIO *f);
 extern STDCHAR *PerlIOBuf_get_ptr    (PerlIO *f);