X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perlsdio.h;h=5a15a719ca76bf1a921c0468f0f233eba4bbdcc3;hb=ba51d756f9ffaa3939ada6861397f27ce3967220;hp=082d96d561b7782f48faace4a0a4da6380c24eb2;hpb=33dcbb9a4b5517789b5e779cf126923149d7ff89;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/perlsdio.h b/perlsdio.h
index 082d96d..5a15a71 100644
--- a/perlsdio.h
+++ b/perlsdio.h
@@ -16,16 +16,40 @@
 #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(path,mode)		fopen(path,mode)
-#define PerlIO_fdopen(fd,mode)		fdopen(fd,mode)
+#define PerlIO_open			fopen
+#define PerlIO_fdopen			fdopen
+#define PerlIO_reopen		freopen
 #define PerlIO_close(f)			fclose(f)
 #define PerlIO_puts(f,s)		fputs(s,f)
 #define PerlIO_putc(f,c)		fputc(c,f)
-#define PerlIO_ungetc(f,c)		ungetc(c,f)
-#define PerlIO_getc(f)			getc(f)
+#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_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)
 #define PerlIO_error(f)			ferror(f)
 #define PerlIO_fileno(f)		fileno(f)
 #define PerlIO_clearerr(f)		clearerr(f)
@@ -60,9 +84,9 @@
 #define PerlIO_get_ptr(f)		FILE_ptr(f)          
 #define PerlIO_get_cnt(f)		FILE_cnt(f)          
 
-#ifdef FILE_CNT_LVALUE
+#ifdef STDIO_CNT_LVALUE
 #define PerlIO_canset_cnt(f)		1      
-#ifdef FILE_PTR_LVALUE
+#ifdef STDIO_PTR_LVALUE
 #define PerlIO_fast_gets(f)		1        
 #endif
 #define PerlIO_set_cnt(f,c)		(FILE_cnt(f) = (c))          
@@ -71,7 +95,7 @@
 #define PerlIO_set_cnt(f,c)		abort()
 #endif
 
-#ifdef FILE_PTR_LVALUE
+#ifdef STDIO_PTR_LVALUE
 #define PerlIO_set_ptrcnt(f,p,c)	(FILE_ptr(f) = (p), PerlIO_set_cnt(f,c))          
 #else
 #define PerlIO_set_ptrcnt(f,p,c)	abort()
@@ -80,8 +104,9 @@
 #else  /* USE_STDIO_PTR */
 
 #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()
 
@@ -98,7 +123,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 */
@@ -139,6 +164,8 @@
 #undef setvbuf
 #undef fscanf
 #undef fgets
+#undef getc_unlocked
+#undef putc_unlocked
 #define fprintf    _CANNOT _fprintf_
 #define stdin      _CANNOT _stdin_
 #define stdout     _CANNOT _stdout_