X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perliol.h;h=e9f6a975bb3f85487ac1c695f0ab0076758fb0b0;hb=fcf2db383b9625d65c84a8308e9be05a073bed3b;hp=1b7c1724e104a3808c81cfa23db07d2b34c6c3a1;hpb=66ecd56be076649bc9da523c12d89e06e353e801;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/perliol.h b/perliol.h
index 1b7c172..e9f6a97 100644
--- a/perliol.h
+++ b/perliol.h
@@ -1,17 +1,35 @@
 #ifndef _PERLIOL_H
 #define _PERLIOL_H
 
+typedef struct
+{
+ PerlIO_funcs *funcs;
+ SV *arg;
+} PerlIO_pair_t;
+
+typedef struct
+{
+ IV refcnt;
+ IV cur;
+ IV len;
+ PerlIO_pair_t *array;
+} PerlIO_list_t;
+
 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);
+ IV		(*Pushed)(PerlIO *f,const char *mode,SV *arg);
  IV		(*Popped)(PerlIO *f);
+ PerlIO *	(*Open)(pTHX_ PerlIO_funcs *tab,
+			PerlIO_list_t *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);
@@ -34,6 +52,17 @@ struct _PerlIO_funcs
  void		(*Set_ptrcnt)(PerlIO *f,STDCHAR *ptr,SSize_t cnt);
 };
 
+/*--------------------------------------------------------------------------------------*/
+/* Kind values */
+#define PERLIO_K_RAW		0x00000001
+#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
 {
  PerlIOl *	next;       /* Lower layer */
@@ -44,50 +73,65 @@ struct _PerlIO
 /*--------------------------------------------------------------------------------------*/
 
 /* Flag values */
-#define PERLIO_F_EOF		0x00010000
-#define PERLIO_F_CANWRITE	0x00020000
-#define PERLIO_F_CANREAD	0x00040000
-#define PERLIO_F_ERROR		0x00080000
-#define PERLIO_F_TRUNCATE	0x00100000
-#define PERLIO_F_APPEND		0x00200000
-#define PERLIO_F_BINARY		0x00400000
-#define PERLIO_F_UTF8		0x00800000
-#define PERLIO_F_LINEBUF	0x01000000
-#define PERLIO_F_WRBUF		0x02000000
-#define PERLIO_F_RDBUF		0x04000000
-#define PERLIO_F_TEMP		0x08000000
-#define PERLIO_F_OPEN		0x10000000
+#define PERLIO_F_EOF		0x00000100
+#define PERLIO_F_CANWRITE	0x00000200
+#define PERLIO_F_CANREAD	0x00000400
+#define PERLIO_F_ERROR		0x00000800
+#define PERLIO_F_TRUNCATE	0x00001000
+#define PERLIO_F_APPEND		0x00002000
+#define PERLIO_F_CRLF		0x00004000
+#define PERLIO_F_UTF8		0x00008000
+#define PERLIO_F_UNBUF		0x00010000
+#define PERLIO_F_WRBUF		0x00020000
+#define PERLIO_F_RDBUF		0x00040000
+#define PERLIO_F_LINEBUF	0x00080000
+#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;
+/* 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(void);
+extern PerlIO *PerlIO_allocate(pTHX);
+extern SV *PerlIO_arg_fetch(PerlIO_list_t *av,IV n);
+#define PerlIOArg PerlIO_arg_fetch(layers,n)
+
+#if O_BINARY != O_TEXT
+#define PERLIO_STDTEXT "t"
+#else
+#define PERLIO_STDTEXT ""
+#endif
 
 /*--------------------------------------------------------------------------------------*/
 /* Generic, or stub layer functions */
 
 extern IV	PerlIOBase_fileno    (PerlIO *f);
-extern IV	PerlIOBase_pushed    (PerlIO *f, const char *mode);
+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);
 extern void	PerlIOBase_clearerr  (PerlIO *f);
-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);
@@ -109,9 +153,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, PerlIO_list_t *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);
@@ -120,7 +163,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);