X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perlsdio.h;h=efc52e1cd42a7fcf212c723cb29f00ee583ec155;hb=164e0d64e76aeb41b383f338cffa7d2e2e075e7c;hp=f5c2921f38b251f8a428dcf0797bb15d47b03155;hpb=aa6893958c2bfb6fa4ab923c8466c188c65748fd;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/perlsdio.h b/perlsdio.h
index f5c2921..efc52e1 100644
--- a/perlsdio.h
+++ b/perlsdio.h
@@ -16,7 +16,6 @@
 #define PerlIO_printf			fprintf
 #define PerlIO_stdoutf			printf
 #define PerlIO_vprintf(f,fmt,a)		vfprintf(f,fmt,a)          
-#define PerlIO_read(f,buf,count)	fread(buf,1,count,f)
 #define PerlIO_write(f,buf,count)	fwrite1(buf,1,count,f)
 #define PerlIO_open			fopen
 #define PerlIO_fdopen			fdopen
@@ -24,21 +23,30 @@
 #define PerlIO_close(f)			fclose(f)
 #define PerlIO_puts(f,s)		fputs(s,f)
 #define PerlIO_putc(f,c)		fputc(c,f)
-#if defined(VMS) && defined(__DECC)
-   /* Unusual definition of ungetc() here to accomodate fast_sv_gets()'
-    * belief that it can mix getc/ungetc with reads from stdio buffer */
-   int decc$ungetc(int __c, FILE *__stream);
-#  define PerlIO_ungetc(f,c) ((c) == EOF ? EOF : \
-          ((*(f) && !((*(f))->_flag & _IONBF) && \
-          ((*(f))->_ptr > (*(f))->_base)) ? \
-          ((*(f))->_cnt++, *(--(*(f))->_ptr) = (c)) : decc$ungetc(c,f)))
-   /* Work around bug in DECCRTL/AXP (DECC v5.x) which causes read
-    * from a pipe after EOF has been returned once to hang.
+#if defined(VMS)
+#  if defined(__DECC)
+     /* Unusual definition of ungetc() here to accomodate fast_sv_gets()'
+      * belief that it can mix getc/ungetc with reads from stdio buffer */
+     int decc$ungetc(int __c, FILE *__stream);
+#    define PerlIO_ungetc(f,c) ((c) == EOF ? EOF : \
+            ((*(f) && !((*(f))->_flag & _IONBF) && \
+            ((*(f))->_ptr > (*(f))->_base)) ? \
+            ((*(f))->_cnt++, *(--(*(f))->_ptr) = (c)) : decc$ungetc(c,f)))
+#  else
+#    define PerlIO_ungetc(f,c)		ungetc(c,f)
+#  endif
+   /* Work around bug in DECCRTL/AXP (DECC v5.x) and some versions of old
+    * VAXCRTL which causes read from a pipe after EOF has been returned
+    * once to hang.
     */
-#  define PerlIO_getc(f)		(feof(f) ? EOF : getc(f))
+#  define PerlIO_getc(f) \
+		(feof(f) ? EOF : getc(f))
+#  define PerlIO_read(f,buf,count) \
+		(feof(f) ? 0 : (SSize_t)fread(buf,1,count,f))
 #else
 #  define PerlIO_ungetc(f,c)		ungetc(c,f)
 #  define PerlIO_getc(f)		getc(f)
+#  define PerlIO_read(f,buf,count)	(SSize_t)fread(buf,1,count,f)
 #endif
 #define PerlIO_eof(f)			feof(f)
 #define PerlIO_getname(f,b)		fgetname(f,b)
@@ -47,7 +55,12 @@
 #define PerlIO_clearerr(f)		clearerr(f)
 #define PerlIO_flush(f)			Fflush(f)
 #define PerlIO_tell(f)			ftell(f)
-#define PerlIO_seek(f,o,w)		fseek(f,o,w)
+#if defined(VMS) && !defined(__DECC)
+   /* Old VAXC RTL doesn't reset EOF on seek; Perl folk seem to expect this */
+#  define PerlIO_seek(f,o,w)	(((f) && (*f) && ((*f)->_flag &= ~_IOEOF)),fseek(f,o,w))
+#else
+#  define PerlIO_seek(f,o,w)		fseek(f,o,w)
+#endif
 #ifdef HAS_FGETPOS
 #define PerlIO_getpos(f,p)		fgetpos(f,p)
 #endif
@@ -98,7 +111,7 @@
 #define PerlIO_has_cntptr(f)		0
 #define PerlIO_canset_cnt(f)		0
 #define PerlIO_get_cnt(f)		(abort(),0)
-#define PerlIO_get_ptr(f)		(abort(),0)
+#define PerlIO_get_ptr(f)		(abort(),(void *)0)
 #define PerlIO_set_cnt(f,c)		abort()
 #define PerlIO_set_ptrcnt(f,p,c)	abort()
 
@@ -115,7 +128,7 @@
 #define PerlIO_get_bufsiz(f)		FILE_bufsiz(f)       
 #else
 #define PerlIO_has_base(f)		0
-#define PerlIO_get_base(f)		(abort(),0)
+#define PerlIO_get_base(f)		(abort(),(void *)0)
 #define PerlIO_get_bufsiz(f)		(abort(),0)
 #endif
 #else /* PERLIO_IS_STDIO */
@@ -224,7 +237,9 @@
 #undef fopen
 #undef vfprintf
 #undef fgetc
+#undef getc_unlocked
 #undef fputc
+#undef putc_unlocked
 #undef fputs
 #undef ungetc
 #undef fread
@@ -257,8 +272,14 @@
 #define fputc(c,f)		PerlIO_putc(f,c)
 #define fputs(s,f)		PerlIO_puts(f,s)
 #define getc(f)			PerlIO_getc(f)
+#ifdef getc_unlocked
+#undef getc_unlocked
+#endif
 #define getc_unlocked(f)	PerlIO_getc(f)
 #define putc(c,f)		PerlIO_putc(f,c)
+#ifdef putc_unlocked
+#undef putc_unlocked
+#endif
 #define putc_unlocked(c,f)	PerlIO_putc(c,f)
 #define ungetc(c,f)		PerlIO_ungetc(f,c)
 #if 0