[ID 20001112.007] sfio's sftell isn't ftell

[perl5.git] / perlsfio.h

diff --git a/perlsfio.h b/perlsfio.h
index 8c9387f..22f5427 100644 (file)
--- a/perlsfio.h
+++ b/perlsfio.h
@@ -3,6 +3,11 @@
 #include <sfio.h>
 #endif
 
 #include <sfio.h>
 #endif
 

+/* sfio 2000 changed _stdopen to _stdfdopen */
+#if SFIO_VERSION >= 20000101L
+#define _stdopen _stdfdopen 
+#endif
+

 extern Sfio_t* _stdopen _ARG_((int, const char*));
 extern int     _stdprintf _ARG_((const char*, ...));
 
 extern Sfio_t* _stdopen _ARG_((int, const char*));
 extern int     _stdprintf _ARG_((const char*, ...));
 


@@ -18,6 +23,7 @@ extern int    _stdprintf _ARG_((const char*, ...));
 #define PerlIO_write(f,buf,count)      sfwrite(f,buf,count)
 #define PerlIO_open(path,mode)         sfopen(NULL,path,mode)
 #define PerlIO_fdopen(fd,mode)         _stdopen(fd,mode)
 #define PerlIO_write(f,buf,count)      sfwrite(f,buf,count)
 #define PerlIO_open(path,mode)         sfopen(NULL,path,mode)
 #define PerlIO_fdopen(fd,mode)         _stdopen(fd,mode)

+#define PerlIO_reopen(path,mode,f)     sfopen(f,path,mode)

 #define PerlIO_close(f)                        sfclose(f)
 #define PerlIO_puts(f,s)               sfputr(f,s,-1)
 #define PerlIO_putc(f,c)               sfputc(f,c)
 #define PerlIO_close(f)                        sfclose(f)
 #define PerlIO_puts(f,s)               sfputr(f,s,-1)
 #define PerlIO_putc(f,c)               sfputc(f,c)


@@ -29,15 +35,15 @@ extern int  _stdprintf _ARG_((const char*, ...));
 #define PerlIO_fileno(f)               sffileno(f)
 #define PerlIO_clearerr(f)             sfclrerr(f)
 #define PerlIO_flush(f)                        sfsync(f)
 #define PerlIO_fileno(f)               sffileno(f)
 #define PerlIO_clearerr(f)             sfclrerr(f)
 #define PerlIO_flush(f)                        sfsync(f)

-#define PerlIO_tell(f)                 sftell(f)
+#define PerlIO_tell(f)                 sfseek(f,0,1|SF_SHARE)

 #define PerlIO_seek(f,o,w)             sfseek(f,o,w)
 #define PerlIO_rewind(f)               (void) sfseek((f),0L,0)
 #define PerlIO_tmpfile()               sftmp(0)
 
 #define PerlIO_seek(f,o,w)             sfseek(f,o,w)
 #define PerlIO_rewind(f)               (void) sfseek((f),0L,0)
 #define PerlIO_tmpfile()               sftmp(0)
 

-#define PerlIO_importFILE(f,fl)                croak("Import from FILE * unimplemeted")
-#define PerlIO_exportFILE(f,fl)                croak("Export to FILE * unimplemeted")
+#define PerlIO_importFILE(f,fl)                Perl_croak(aTHX_ "Import from FILE * unimplemeted")
+#define PerlIO_exportFILE(f,fl)                Perl_croak(aTHX_ "Export to FILE * unimplemeted")

 #define PerlIO_findFILE(f)             NULL
 #define PerlIO_findFILE(f)             NULL

-#define PerlIO_releaseFILE(p,f)                croak("Release of FILE * unimplemeted")
+#define PerlIO_releaseFILE(p,f)                Perl_croak(aTHX_ "Release of FILE * unimplemeted")

 
 #define PerlIO_setlinebuf(f)           sfset(f,SF_LINE,1)
 
 
 #define PerlIO_setlinebuf(f)           sfset(f,SF_LINE,1)
 


@@ -46,10 +52,10 @@ extern int  _stdprintf _ARG_((const char*, ...));
 #define PerlIO_has_cntptr(f)           1       
 #define PerlIO_get_ptr(f)              ((f)->next)
 #define PerlIO_get_cnt(f)              ((f)->endr - (f)->next)
 #define PerlIO_has_cntptr(f)           1       
 #define PerlIO_get_ptr(f)              ((f)->next)
 #define PerlIO_get_cnt(f)              ((f)->endr - (f)->next)

-#define PerlIO_canset_cnt(f)           1      
-#define PerlIO_fast_gets(f)            1        
-#define PerlIO_set_ptrcnt(f,p,c)       ((f)->next = (p))          
-#define PerlIO_set_cnt(f,c)            1
+#define PerlIO_canset_cnt(f)           0
+#define PerlIO_fast_gets(f)            1
+#define PerlIO_set_ptrcnt(f,p,c)       STMT_START {(f)->next = (unsigned char *)(p); assert(FILE_cnt(f) == (c))} STMT_END
+#define PerlIO_set_cnt(f,c)            Perl_croak(aTHX_ "Cannot set 'cnt' of FILE * on this system");

 
 #define PerlIO_has_base(f)             1         
 #define PerlIO_get_base(f)             ((f)->data)
 
 #define PerlIO_has_base(f)             1         
 #define PerlIO_get_base(f)             ((f)->data)