X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=iperlsys.h;h=9ad325606230d19692afec10b67ffe8a86ef132c;hb=4b7fcc74dfb0dfcd72a60881ab8de354c43fa9fb;hp=ebffcc3aebe3edda8f7c0e866cd7d5e1d64f2c46;hpb=8d9b2e3c6958e5856b03a00694b8ae02817ed002;p=p5sagit%2Fp5-mst-13.2.git diff --git a/iperlsys.h b/iperlsys.h index ebffcc3..9ad3256 100644 --- a/iperlsys.h +++ b/iperlsys.h @@ -71,7 +71,7 @@ # define PERLIO_IS_STDIO # endif #else -extern void PerlIO_init _((void)); +extern void PerlIO_init (void); #endif #ifdef PERL_OBJECT @@ -114,7 +114,7 @@ public: virtual int Printf(PerlIO*, int &err, const char *,...) = 0; virtual int Vprintf(PerlIO*, int &err, const char *, va_list) = 0; virtual long Tell(PerlIO*, int &err) = 0; - virtual int Seek(PerlIO*, off_t, int, int &err) = 0; + virtual int Seek(PerlIO*, Off_t, int, int &err) = 0; virtual void Rewind(PerlIO*, int &err) = 0; virtual PerlIO * Tmpfile(int &err) = 0; virtual int Getpos(PerlIO*, Fpos_t *, int &err) = 0; @@ -127,54 +127,76 @@ public: #endif }; -#define PerlIO_canset_cnt(f) 1 -#define PerlIO_has_base(f) 1 -#define PerlIO_has_cntptr(f) 1 -#define PerlIO_fast_gets(f) 1 - -#define PerlIO_stdin() piStdIO->Stdin() -#define PerlIO_stdout() piStdIO->Stdout() -#define PerlIO_stderr() piStdIO->Stderr() -#define PerlIO_open(x,y) piStdIO->Open((x),(y), ErrorNo()) -#define PerlIO_close(f) piStdIO->Close((f), ErrorNo()) -#define PerlIO_eof(f) piStdIO->Eof((f), ErrorNo()) -#define PerlIO_error(f) piStdIO->Error((f), ErrorNo()) -#define PerlIO_clearerr(f) piStdIO->Clearerr((f), ErrorNo()) -#define PerlIO_getc(f) piStdIO->Getc((f), ErrorNo()) -#define PerlIO_get_base(f) piStdIO->GetBase((f), ErrorNo()) -#define PerlIO_get_bufsiz(f) piStdIO->GetBufsiz((f), ErrorNo()) -#define PerlIO_get_cnt(f) piStdIO->GetCnt((f), ErrorNo()) -#define PerlIO_get_ptr(f) piStdIO->GetPtr((f), ErrorNo()) -#define PerlIO_putc(f,c) piStdIO->Putc((f),(c), ErrorNo()) -#define PerlIO_puts(f,s) piStdIO->Puts((f),(s), ErrorNo()) -#define PerlIO_flush(f) piStdIO->Flush((f), ErrorNo()) -#define PerlIO_gets(s, n, fp) piStdIO->Gets((fp), s, n, ErrorNo()) -#define PerlIO_ungetc(f,c) piStdIO->Ungetc((f),(c), ErrorNo()) -#define PerlIO_fileno(f) piStdIO->Fileno((f), ErrorNo()) -#define PerlIO_fdopen(f, s) piStdIO->Fdopen((f),(s), ErrorNo()) -#define PerlIO_reopen(p, m, f) piStdIO->Reopen((p), (m), (f), ErrorNo()) + + +#ifdef USE_STDIO_PTR +# define PerlIO_has_cntptr(f) 1 +# ifdef STDIO_CNT_LVALUE +# define PerlIO_canset_cnt(f) 1 +# ifdef STDIO_PTR_LVALUE +# define PerlIO_fast_gets(f) 1 +# endif +# else +# define PerlIO_canset_cnt(f) 0 +# endif +#else /* USE_STDIO_PTR */ +# define PerlIO_has_cntptr(f) 0 +# define PerlIO_canset_cnt(f) 0 +#endif /* USE_STDIO_PTR */ + +#ifndef PerlIO_fast_gets +#define PerlIO_fast_gets(f) 0 +#endif + +#ifdef FILE_base +#define PerlIO_has_base(f) 1 +#else +#define PerlIO_has_base(f) 0 +#endif + +#define PerlIO_stdin() PL_piStdIO->Stdin() +#define PerlIO_stdout() PL_piStdIO->Stdout() +#define PerlIO_stderr() PL_piStdIO->Stderr() +#define PerlIO_open(x,y) PL_piStdIO->Open((x),(y), ErrorNo()) +#define PerlIO_close(f) PL_piStdIO->Close((f), ErrorNo()) +#define PerlIO_eof(f) PL_piStdIO->Eof((f), ErrorNo()) +#define PerlIO_error(f) PL_piStdIO->Error((f), ErrorNo()) +#define PerlIO_clearerr(f) PL_piStdIO->Clearerr((f), ErrorNo()) +#define PerlIO_getc(f) PL_piStdIO->Getc((f), ErrorNo()) +#define PerlIO_get_base(f) PL_piStdIO->GetBase((f), ErrorNo()) +#define PerlIO_get_bufsiz(f) PL_piStdIO->GetBufsiz((f), ErrorNo()) +#define PerlIO_get_cnt(f) PL_piStdIO->GetCnt((f), ErrorNo()) +#define PerlIO_get_ptr(f) PL_piStdIO->GetPtr((f), ErrorNo()) +#define PerlIO_putc(f,c) PL_piStdIO->Putc((f),(c), ErrorNo()) +#define PerlIO_puts(f,s) PL_piStdIO->Puts((f),(s), ErrorNo()) +#define PerlIO_flush(f) PL_piStdIO->Flush((f), ErrorNo()) +#define PerlIO_gets(s, n, fp) PL_piStdIO->Gets((fp), s, n, ErrorNo()) +#define PerlIO_ungetc(f,c) PL_piStdIO->Ungetc((f),(c), ErrorNo()) +#define PerlIO_fileno(f) PL_piStdIO->Fileno((f), ErrorNo()) +#define PerlIO_fdopen(f, s) PL_piStdIO->Fdopen((f),(s), ErrorNo()) +#define PerlIO_reopen(p, m, f) PL_piStdIO->Reopen((p), (m), (f), ErrorNo()) #define PerlIO_read(f,buf,count) \ - (SSize_t)piStdIO->Read((f), (buf), (count), ErrorNo()) + (SSize_t)PL_piStdIO->Read((f), (buf), (count), ErrorNo()) #define PerlIO_write(f,buf,count) \ - piStdIO->Write((f), (buf), (count), ErrorNo()) -#define PerlIO_setbuf(f,b) piStdIO->SetBuf((f), (b), ErrorNo()) -#define PerlIO_setvbuf(f,b,t,s) piStdIO->SetVBuf((f), (b), (t), (s), ErrorNo()) -#define PerlIO_set_cnt(f,c) piStdIO->SetCnt((f), (c), ErrorNo()) + PL_piStdIO->Write((f), (buf), (count), ErrorNo()) +#define PerlIO_setbuf(f,b) PL_piStdIO->SetBuf((f), (b), ErrorNo()) +#define PerlIO_setvbuf(f,b,t,s) PL_piStdIO->SetVBuf((f), (b), (t), (s), ErrorNo()) +#define PerlIO_set_cnt(f,c) PL_piStdIO->SetCnt((f), (c), ErrorNo()) #define PerlIO_set_ptrcnt(f,p,c) \ - piStdIO->SetPtrCnt((f), (p), (c), ErrorNo()) -#define PerlIO_setlinebuf(f) piStdIO->Setlinebuf((f), ErrorNo()) + PL_piStdIO->SetPtrCnt((f), (p), (c), ErrorNo()) +#define PerlIO_setlinebuf(f) PL_piStdIO->Setlinebuf((f), ErrorNo()) #define PerlIO_printf fprintf -#define PerlIO_stdoutf piStdIO->Printf -#define PerlIO_vprintf(f,fmt,a) piStdIO->Vprintf((f), ErrorNo(), (fmt),a) -#define PerlIO_tell(f) piStdIO->Tell((f), ErrorNo()) -#define PerlIO_seek(f,o,w) piStdIO->Seek((f),(o),(w), ErrorNo()) -#define PerlIO_getpos(f,p) piStdIO->Getpos((f),(p), ErrorNo()) -#define PerlIO_setpos(f,p) piStdIO->Setpos((f),(p), ErrorNo()) -#define PerlIO_rewind(f) piStdIO->Rewind((f), ErrorNo()) -#define PerlIO_tmpfile() piStdIO->Tmpfile(ErrorNo()) -#define PerlIO_init() piStdIO->Init(ErrorNo()) +#define PerlIO_stdoutf PL_piStdIO->Printf +#define PerlIO_vprintf(f,fmt,a) PL_piStdIO->Vprintf((f), ErrorNo(), (fmt),a) +#define PerlIO_tell(f) PL_piStdIO->Tell((f), ErrorNo()) +#define PerlIO_seek(f,o,w) PL_piStdIO->Seek((f),(o),(w), ErrorNo()) +#define PerlIO_getpos(f,p) PL_piStdIO->Getpos((f),(p), ErrorNo()) +#define PerlIO_setpos(f,p) PL_piStdIO->Setpos((f),(p), ErrorNo()) +#define PerlIO_rewind(f) PL_piStdIO->Rewind((f), ErrorNo()) +#define PerlIO_tmpfile() PL_piStdIO->Tmpfile(ErrorNo()) +#define PerlIO_init() PL_piStdIO->Init(ErrorNo()) #undef init_os_extras -#define init_os_extras() piStdIO->InitOSExtras(this) +#define init_os_extras() PL_piStdIO->InitOSExtras(this) #else /* PERL_OBJECT */ @@ -228,133 +250,133 @@ struct _PerlIO; #endif #ifndef PerlIO_stdoutf -extern int PerlIO_stdoutf _((const char *,...)) +extern int PerlIO_stdoutf (const char *,...) __attribute__((format (printf, 1, 2))); #endif #ifndef PerlIO_puts -extern int PerlIO_puts _((PerlIO *,const char *)); +extern int PerlIO_puts (PerlIO *,const char *); #endif #ifndef PerlIO_open -extern PerlIO * PerlIO_open _((const char *,const char *)); +extern PerlIO * PerlIO_open (const char *,const char *); #endif #ifndef PerlIO_close -extern int PerlIO_close _((PerlIO *)); +extern int PerlIO_close (PerlIO *); #endif #ifndef PerlIO_eof -extern int PerlIO_eof _((PerlIO *)); +extern int PerlIO_eof (PerlIO *); #endif #ifndef PerlIO_error -extern int PerlIO_error _((PerlIO *)); +extern int PerlIO_error (PerlIO *); #endif #ifndef PerlIO_clearerr -extern void PerlIO_clearerr _((PerlIO *)); +extern void PerlIO_clearerr (PerlIO *); #endif #ifndef PerlIO_getc -extern int PerlIO_getc _((PerlIO *)); +extern int PerlIO_getc (PerlIO *); #endif #ifndef PerlIO_putc -extern int PerlIO_putc _((PerlIO *,int)); +extern int PerlIO_putc (PerlIO *,int); #endif #ifndef PerlIO_flush -extern int PerlIO_flush _((PerlIO *)); +extern int PerlIO_flush (PerlIO *); #endif #ifndef PerlIO_ungetc -extern int PerlIO_ungetc _((PerlIO *,int)); +extern int PerlIO_ungetc (PerlIO *,int); #endif #ifndef PerlIO_fileno -extern int PerlIO_fileno _((PerlIO *)); +extern int PerlIO_fileno (PerlIO *); #endif #ifndef PerlIO_fdopen -extern PerlIO * PerlIO_fdopen _((int, const char *)); +extern PerlIO * PerlIO_fdopen (int, const char *); #endif #ifndef PerlIO_importFILE -extern PerlIO * PerlIO_importFILE _((FILE *,int)); +extern PerlIO * PerlIO_importFILE (FILE *,int); #endif #ifndef PerlIO_exportFILE -extern FILE * PerlIO_exportFILE _((PerlIO *,int)); +extern FILE * PerlIO_exportFILE (PerlIO *,int); #endif #ifndef PerlIO_findFILE -extern FILE * PerlIO_findFILE _((PerlIO *)); +extern FILE * PerlIO_findFILE (PerlIO *); #endif #ifndef PerlIO_releaseFILE -extern void PerlIO_releaseFILE _((PerlIO *,FILE *)); +extern void PerlIO_releaseFILE (PerlIO *,FILE *); #endif #ifndef PerlIO_read -extern SSize_t PerlIO_read _((PerlIO *,void *,Size_t)); +extern SSize_t PerlIO_read (PerlIO *,void *,Size_t); #endif #ifndef PerlIO_write -extern SSize_t PerlIO_write _((PerlIO *,const void *,Size_t)); +extern SSize_t PerlIO_write (PerlIO *,const void *,Size_t); #endif #ifndef PerlIO_setlinebuf -extern void PerlIO_setlinebuf _((PerlIO *)); +extern void PerlIO_setlinebuf (PerlIO *); #endif #ifndef PerlIO_printf -extern int PerlIO_printf _((PerlIO *, const char *,...)) +extern int PerlIO_printf (PerlIO *, const char *,...) __attribute__((format (printf, 2, 3))); #endif #ifndef PerlIO_sprintf -extern int PerlIO_sprintf _((char *, int, const char *,...)) +extern int PerlIO_sprintf (char *, int, const char *,...) __attribute__((format (printf, 3, 4))); #endif #ifndef PerlIO_vprintf -extern int PerlIO_vprintf _((PerlIO *, const char *, va_list)); +extern int PerlIO_vprintf (PerlIO *, const char *, va_list); #endif #ifndef PerlIO_tell -extern long PerlIO_tell _((PerlIO *)); +extern Off_t PerlIO_tell (PerlIO *); #endif #ifndef PerlIO_seek -extern int PerlIO_seek _((PerlIO *,off_t,int)); +extern int PerlIO_seek (PerlIO *, Off_t, int); #endif #ifndef PerlIO_rewind -extern void PerlIO_rewind _((PerlIO *)); +extern void PerlIO_rewind (PerlIO *); #endif #ifndef PerlIO_has_base -extern int PerlIO_has_base _((PerlIO *)); +extern int PerlIO_has_base (PerlIO *); #endif #ifndef PerlIO_has_cntptr -extern int PerlIO_has_cntptr _((PerlIO *)); +extern int PerlIO_has_cntptr (PerlIO *); #endif #ifndef PerlIO_fast_gets -extern int PerlIO_fast_gets _((PerlIO *)); +extern int PerlIO_fast_gets (PerlIO *); #endif #ifndef PerlIO_canset_cnt -extern int PerlIO_canset_cnt _((PerlIO *)); +extern int PerlIO_canset_cnt (PerlIO *); #endif #ifndef PerlIO_get_ptr -extern STDCHAR * PerlIO_get_ptr _((PerlIO *)); +extern STDCHAR * PerlIO_get_ptr (PerlIO *); #endif #ifndef PerlIO_get_cnt -extern int PerlIO_get_cnt _((PerlIO *)); +extern int PerlIO_get_cnt (PerlIO *); #endif #ifndef PerlIO_set_cnt -extern void PerlIO_set_cnt _((PerlIO *,int)); +extern void PerlIO_set_cnt (PerlIO *,int); #endif #ifndef PerlIO_set_ptrcnt -extern void PerlIO_set_ptrcnt _((PerlIO *,STDCHAR *,int)); +extern void PerlIO_set_ptrcnt (PerlIO *,STDCHAR *,int); #endif #ifndef PerlIO_get_base -extern STDCHAR * PerlIO_get_base _((PerlIO *)); +extern STDCHAR * PerlIO_get_base (PerlIO *); #endif #ifndef PerlIO_get_bufsiz -extern int PerlIO_get_bufsiz _((PerlIO *)); +extern int PerlIO_get_bufsiz (PerlIO *); #endif #ifndef PerlIO_tmpfile -extern PerlIO * PerlIO_tmpfile _((void)); +extern PerlIO * PerlIO_tmpfile (void); #endif #ifndef PerlIO_stdin -extern PerlIO * PerlIO_stdin _((void)); +extern PerlIO * PerlIO_stdin (void); #endif #ifndef PerlIO_stdout -extern PerlIO * PerlIO_stdout _((void)); +extern PerlIO * PerlIO_stdout (void); #endif #ifndef PerlIO_stderr -extern PerlIO * PerlIO_stderr _((void)); +extern PerlIO * PerlIO_stderr (void); #endif #ifndef PerlIO_getpos -extern int PerlIO_getpos _((PerlIO *,Fpos_t *)); +extern int PerlIO_getpos (PerlIO *,Fpos_t *); #endif #ifndef PerlIO_setpos -extern int PerlIO_setpos _((PerlIO *,const Fpos_t *)); +extern int PerlIO_setpos (PerlIO *,const Fpos_t *); #endif @@ -379,23 +401,23 @@ public: }; #define PerlDir_mkdir(name, mode) \ - piDir->Makedir((name), (mode), ErrorNo()) + PL_piDir->Makedir((name), (mode), ErrorNo()) #define PerlDir_chdir(name) \ - piDir->Chdir((name), ErrorNo()) + PL_piDir->Chdir((name), ErrorNo()) #define PerlDir_rmdir(name) \ - piDir->Rmdir((name), ErrorNo()) + PL_piDir->Rmdir((name), ErrorNo()) #define PerlDir_close(dir) \ - piDir->Close((dir), ErrorNo()) + PL_piDir->Close((dir), ErrorNo()) #define PerlDir_open(name) \ - piDir->Open((name), ErrorNo()) + PL_piDir->Open((name), ErrorNo()) #define PerlDir_read(dir) \ - piDir->Read((dir), ErrorNo()) + PL_piDir->Read((dir), ErrorNo()) #define PerlDir_rewind(dir) \ - piDir->Rewind((dir), ErrorNo()) + PL_piDir->Rewind((dir), ErrorNo()) #define PerlDir_seek(dir, loc) \ - piDir->Seek((dir), (loc), ErrorNo()) + PL_piDir->Seek((dir), (loc), ErrorNo()) #define PerlDir_tell(dir) \ - piDir->Tell((dir), ErrorNo()) + PL_piDir->Tell((dir), ErrorNo()) #else /* PERL_OBJECT */ @@ -428,19 +450,43 @@ public: virtual int Putenv(const char *envstring, int &err) = 0; virtual char * LibPath(char *patchlevel) =0; virtual char * SiteLibPath(char *patchlevel) =0; + virtual int Uname(struct utsname *name, int &err) =0; + virtual char * Getenv_len(const char *varname, unsigned long *len, int &err) = 0; +#ifdef HAS_ENVGETENV + virtual char * ENVGetenv(const char *varname, int &err) = 0; + virtual char * ENVGetenv_len(const char *varname, unsigned long *len, int &err) = 0; +#endif }; -#define PerlEnv_putenv(str) piENV->Putenv((str), ErrorNo()) -#define PerlEnv_getenv(str) piENV->Getenv((str), ErrorNo()) +#define PerlEnv_putenv(str) PL_piENV->Putenv((str), ErrorNo()) +#define PerlEnv_getenv(str) PL_piENV->Getenv((str), ErrorNo()) +#define PerlEnv_getenv_len(str,l) PL_piENV->Getenv_len((str), (l), ErrorNo()) +#ifdef HAS_ENVGETENV +# define PerlEnv_ENVgetenv(str) PL_piENV->ENVGetenv((str), ErrorNo()) +# define PerlEnv_ENVgetenv_len(str,l) PL_piENV->ENVGetenv_len((str), (l), ErrorNo()) +#else +# define PerlEnv_ENVgetenv(str) PerlEnv_getenv((str)) +# define PerlEnv_ENVgetenv_len(str,l) PerlEnv_getenv_len((str),(l)) +#endif +#define PerlEnv_uname(name) PL_piENV->Uname((name), ErrorNo()) #ifdef WIN32 -#define PerlEnv_lib_path(str) piENV->LibPath((str)) -#define PerlEnv_sitelib_path(str) piENV->SiteLibPath((str)) +#define PerlEnv_lib_path(str) PL_piENV->LibPath((str)) +#define PerlEnv_sitelib_path(str) PL_piENV->SiteLibPath((str)) #endif #else /* PERL_OBJECT */ #define PerlEnv_putenv(str) putenv((str)) #define PerlEnv_getenv(str) getenv((str)) +#define PerlEnv_getenv_len(str,l) getenv_len((str), (l)) +#ifdef HAS_ENVGETENV +# define PerlEnv_ENVgetenv(str) ENVgetenv((str)) +# define PerlEnv_ENVgetenv_len(str,l) ENVgetenv_len((str), (l)) +#else +# define PerlEnv_ENVgetenv(str) PerlEnv_getenv((str)) +# define PerlEnv_ENVgetenv_len(str,l) PerlEnv_getenv_len((str), (l)) +#endif +#define PerlEnv_uname(name) uname((name)) #endif /* PERL_OBJECT */ @@ -487,55 +533,55 @@ public: }; #define PerlLIO_access(file, mode) \ - piLIO->Access((file), (mode), ErrorNo()) + PL_piLIO->Access((file), (mode), ErrorNo()) #define PerlLIO_chmod(file, mode) \ - piLIO->Chmod((file), (mode), ErrorNo()) + PL_piLIO->Chmod((file), (mode), ErrorNo()) #define PerlLIO_chown(file, owner, group) \ - piLIO->Chown((file), (owner), (group), ErrorNo()) + PL_piLIO->Chown((file), (owner), (group), ErrorNo()) #define PerlLIO_chsize(fd, size) \ - piLIO->Chsize((fd), (size), ErrorNo()) + PL_piLIO->Chsize((fd), (size), ErrorNo()) #define PerlLIO_close(fd) \ - piLIO->Close((fd), ErrorNo()) + PL_piLIO->Close((fd), ErrorNo()) #define PerlLIO_dup(fd) \ - piLIO->Dup((fd), ErrorNo()) + PL_piLIO->Dup((fd), ErrorNo()) #define PerlLIO_dup2(fd1, fd2) \ - piLIO->Dup2((fd1), (fd2), ErrorNo()) + PL_piLIO->Dup2((fd1), (fd2), ErrorNo()) #define PerlLIO_flock(fd, op) \ - piLIO->Flock((fd), (op), ErrorNo()) + PL_piLIO->Flock((fd), (op), ErrorNo()) #define PerlLIO_fstat(fd, buf) \ - piLIO->FileStat((fd), (buf), ErrorNo()) + PL_piLIO->FileStat((fd), (buf), ErrorNo()) #define PerlLIO_ioctl(fd, u, buf) \ - piLIO->IOCtl((fd), (u), (buf), ErrorNo()) + PL_piLIO->IOCtl((fd), (u), (buf), ErrorNo()) #define PerlLIO_isatty(fd) \ - piLIO->Isatty((fd), ErrorNo()) + PL_piLIO->Isatty((fd), ErrorNo()) #define PerlLIO_lseek(fd, offset, mode) \ - piLIO->Lseek((fd), (offset), (mode), ErrorNo()) + PL_piLIO->Lseek((fd), (offset), (mode), ErrorNo()) #define PerlLIO_lstat(name, buf) \ - piLIO->Lstat((name), (buf), ErrorNo()) + PL_piLIO->Lstat((name), (buf), ErrorNo()) #define PerlLIO_mktemp(file) \ - piLIO->Mktemp((file), ErrorNo()) + PL_piLIO->Mktemp((file), ErrorNo()) #define PerlLIO_open(file, flag) \ - piLIO->Open((file), (flag), ErrorNo()) + PL_piLIO->Open((file), (flag), ErrorNo()) #define PerlLIO_open3(file, flag, perm) \ - piLIO->Open((file), (flag), (perm), ErrorNo()) + PL_piLIO->Open((file), (flag), (perm), ErrorNo()) #define PerlLIO_read(fd, buf, count) \ - piLIO->Read((fd), (buf), (count), ErrorNo()) + PL_piLIO->Read((fd), (buf), (count), ErrorNo()) #define PerlLIO_rename(oname, newname) \ - piLIO->Rename((oname), (newname), ErrorNo()) + PL_piLIO->Rename((oname), (newname), ErrorNo()) #define PerlLIO_setmode(fd, mode) \ - piLIO->Setmode((fd), (mode), ErrorNo()) + PL_piLIO->Setmode((fd), (mode), ErrorNo()) #define PerlLIO_stat(name, buf) \ - piLIO->NameStat((name), (buf), ErrorNo()) + PL_piLIO->NameStat((name), (buf), ErrorNo()) #define PerlLIO_tmpnam(str) \ - piLIO->Tmpnam((str), ErrorNo()) + PL_piLIO->Tmpnam((str), ErrorNo()) #define PerlLIO_umask(mode) \ - piLIO->Umask((mode), ErrorNo()) + PL_piLIO->Umask((mode), ErrorNo()) #define PerlLIO_unlink(file) \ - piLIO->Unlink((file), ErrorNo()) + PL_piLIO->Unlink((file), ErrorNo()) #define PerlLIO_utime(file, time) \ - piLIO->Utime((file), (time), ErrorNo()) + PL_piLIO->Utime((file), (time), ErrorNo()) #define PerlLIO_write(fd, buf, count) \ - piLIO->Write((fd), (buf), (count), ErrorNo()) + PL_piLIO->Write((fd), (buf), (count), ErrorNo()) #else /* PERL_OBJECT */ @@ -551,7 +597,11 @@ public: #define PerlLIO_ioctl(fd, u, buf) ioctl((fd), (u), (buf)) #define PerlLIO_isatty(fd) isatty((fd)) #define PerlLIO_lseek(fd, offset, mode) lseek((fd), (offset), (mode)) +#ifdef HAS_LSTAT #define PerlLIO_lstat(name, buf) lstat((name), (buf)) +#else +#define PerlLIO_lstat(name, buf) PerlLIO_stat((name), (buf)) +#endif #define PerlLIO_mktemp(file) mktemp((file)) #define PerlLIO_mkstemp(file) mkstemp((file)) #define PerlLIO_open(file, flag) open((file), (flag)) @@ -582,9 +632,9 @@ public: virtual void Free(void*) = 0; }; -#define PerlMem_malloc(size) piMem->Malloc((size)) -#define PerlMem_realloc(buf, size) piMem->Realloc((buf), (size)) -#define PerlMem_free(buf) piMem->Free((buf)) +#define PerlMem_malloc(size) PL_piMem->Malloc((size)) +#define PerlMem_realloc(buf, size) PL_piMem->Realloc((buf), (size)) +#define PerlMem_free(buf) PL_piMem->Free((buf)) #else /* PERL_OBJECT */ @@ -602,7 +652,7 @@ public: #ifdef PERL_OBJECT #ifndef Sighandler_t -typedef Signal_t (*Sighandler_t) _((int)); +typedef Signal_t (*Sighandler_t) (int); #endif #ifndef jmp_buf #include @@ -612,6 +662,7 @@ class IPerlProc { public: virtual void Abort(void) = 0; + virtual char * Crypt(const char* clear, const char* salt) = 0; virtual void Exit(int status) = 0; virtual void _Exit(int status) = 0; virtual int Execl(const char *cmdname, const char *arg0, @@ -648,49 +699,51 @@ public: #endif }; -#define PerlProc_abort() piProc->Abort() -#define PerlProc_exit(s) piProc->Exit((s)) -#define PerlProc__exit(s) piProc->_Exit((s)) +#define PerlProc_abort() PL_piProc->Abort() +#define PerlProc_crypt(c,s) PL_piProc->Crypt((c), (s)) +#define PerlProc_exit(s) PL_piProc->Exit((s)) +#define PerlProc__exit(s) PL_piProc->_Exit((s)) #define PerlProc_execl(c, w, x, y, z) \ - piProc->Execl((c), (w), (x), (y), (z)) - -#define PerlProc_execv(c, a) piProc->Execv((c), (a)) -#define PerlProc_execvp(c, a) piProc->Execvp((c), (a)) -#define PerlProc_getuid() piProc->Getuid() -#define PerlProc_geteuid() piProc->Geteuid() -#define PerlProc_getgid() piProc->Getgid() -#define PerlProc_getegid() piProc->Getegid() -#define PerlProc_getlogin() piProc->Getlogin() -#define PerlProc_kill(i, a) piProc->Kill((i), (a)) -#define PerlProc_killpg(i, a) piProc->Killpg((i), (a)) -#define PerlProc_pause() piProc->PauseProc() -#define PerlProc_popen(c, m) piProc->Popen((c), (m)) -#define PerlProc_pclose(f) piProc->Pclose((f)) -#define PerlProc_pipe(fd) piProc->Pipe((fd)) -#define PerlProc_setuid(u) piProc->Setuid((u)) -#define PerlProc_setgid(g) piProc->Setgid((g)) -#define PerlProc_sleep(t) piProc->Sleep((t)) -#define PerlProc_times(t) piProc->Times((t)) -#define PerlProc_wait(t) piProc->Wait((t)) -#define PerlProc_waitpid(p,s,f) piProc->Waitpid((p), (s), (f)) + PL_piProc->Execl((c), (w), (x), (y), (z)) + +#define PerlProc_execv(c, a) PL_piProc->Execv((c), (a)) +#define PerlProc_execvp(c, a) PL_piProc->Execvp((c), (a)) +#define PerlProc_getuid() PL_piProc->Getuid() +#define PerlProc_geteuid() PL_piProc->Geteuid() +#define PerlProc_getgid() PL_piProc->Getgid() +#define PerlProc_getegid() PL_piProc->Getegid() +#define PerlProc_getlogin() PL_piProc->Getlogin() +#define PerlProc_kill(i, a) PL_piProc->Kill((i), (a)) +#define PerlProc_killpg(i, a) PL_piProc->Killpg((i), (a)) +#define PerlProc_pause() PL_piProc->PauseProc() +#define PerlProc_popen(c, m) PL_piProc->Popen((c), (m)) +#define PerlProc_pclose(f) PL_piProc->Pclose((f)) +#define PerlProc_pipe(fd) PL_piProc->Pipe((fd)) +#define PerlProc_setuid(u) PL_piProc->Setuid((u)) +#define PerlProc_setgid(g) PL_piProc->Setgid((g)) +#define PerlProc_sleep(t) PL_piProc->Sleep((t)) +#define PerlProc_times(t) PL_piProc->Times((t)) +#define PerlProc_wait(t) PL_piProc->Wait((t)) +#define PerlProc_waitpid(p,s,f) PL_piProc->Waitpid((p), (s), (f)) #define PerlProc_setjmp(b, n) Sigsetjmp((b), (n)) #define PerlProc_longjmp(b, n) Siglongjmp((b), (n)) -#define PerlProc_signal(n, h) piProc->Signal((n), (h)) +#define PerlProc_signal(n, h) PL_piProc->Signal((n), (h)) #ifdef WIN32 #define PerlProc_GetSysMsg(s,l,e) \ - piProc->GetSysMsg((s), (l), (e)) + PL_piProc->GetSysMsg((s), (l), (e)) -#define PerlProc_FreeBuf(s) piProc->FreeBuf((s)) -#define PerlProc_Cmd(s) piProc->DoCmd((s)) -#define do_spawn(s) piProc->Spawn((s)) -#define do_spawnvp(m, c, a) piProc->Spawnvp((m), (c), (a)) -#define PerlProc_aspawn(m,c,a) piProc->ASpawn((m), (c), (a)) +#define PerlProc_FreeBuf(s) PL_piProc->FreeBuf((s)) +#define PerlProc_Cmd(s) PL_piProc->DoCmd((s)) +#define do_spawn(s) PL_piProc->Spawn((s)) +#define do_spawnvp(m, c, a) PL_piProc->Spawnvp((m), (c), (a)) +#define PerlProc_aspawn(m,c,a) PL_piProc->ASpawn((m), (c), (a)) #endif #else /* PERL_OBJECT */ #define PerlProc_abort() abort() +#define PerlProc_crypt(c,s) crypt((c), (s)) #define PerlProc_exit(s) exit((s)) #define PerlProc__exit(s) _exit((s)) #define PerlProc_execl(c,w,x,y,z) \ @@ -797,53 +850,53 @@ public: #endif }; -#define PerlSock_htonl(x) piSock->Htonl(x) -#define PerlSock_htons(x) piSock->Htons(x) -#define PerlSock_ntohl(x) piSock->Ntohl(x) -#define PerlSock_ntohs(x) piSock->Ntohs(x) -#define PerlSock_accept(s, a, l) piSock->Accept(s, a, l, ErrorNo()) -#define PerlSock_bind(s, n, l) piSock->Bind(s, n, l, ErrorNo()) -#define PerlSock_connect(s, n, l) piSock->Connect(s, n, l, ErrorNo()) -#define PerlSock_endhostent() piSock->Endhostent(ErrorNo()) -#define PerlSock_endnetent() piSock->Endnetent(ErrorNo()) -#define PerlSock_endprotoent() piSock->Endprotoent(ErrorNo()) -#define PerlSock_endservent() piSock->Endservent(ErrorNo()) -#define PerlSock_gethostbyaddr(a, l, t) piSock->Gethostbyaddr(a, l, t, ErrorNo()) -#define PerlSock_gethostbyname(n) piSock->Gethostbyname(n, ErrorNo()) -#define PerlSock_gethostent() piSock->Gethostent(ErrorNo()) -#define PerlSock_gethostname(n, l) piSock->Gethostname(n, l, ErrorNo()) -#define PerlSock_getnetbyaddr(n, t) piSock->Getnetbyaddr(n, t, ErrorNo()) -#define PerlSock_getnetbyname(c) piSock->Getnetbyname(c, ErrorNo()) -#define PerlSock_getnetent() piSock->Getnetent(ErrorNo()) -#define PerlSock_getpeername(s, n, l) piSock->Getpeername(s, n, l, ErrorNo()) -#define PerlSock_getprotobyname(n) piSock->Getprotobyname(n, ErrorNo()) -#define PerlSock_getprotobynumber(n) piSock->Getprotobynumber(n, ErrorNo()) -#define PerlSock_getprotoent() piSock->Getprotoent(ErrorNo()) -#define PerlSock_getservbyname(n, p) piSock->Getservbyname(n, p, ErrorNo()) -#define PerlSock_getservbyport(port, p) piSock->Getservbyport(port, p, ErrorNo()) -#define PerlSock_getservent() piSock->Getservent(ErrorNo()) -#define PerlSock_getsockname(s, n, l) piSock->Getsockname(s, n, l, ErrorNo()) -#define PerlSock_getsockopt(s,l,n,v,i) piSock->Getsockopt(s, l, n, v, i, ErrorNo()) -#define PerlSock_inet_addr(c) piSock->InetAddr(c, ErrorNo()) -#define PerlSock_inet_ntoa(i) piSock->InetNtoa(i, ErrorNo()) -#define PerlSock_listen(s, b) piSock->Listen(s, b, ErrorNo()) -#define PerlSock_recv(s, b, l, f) piSock->Recv(s, b, l, f, ErrorNo()) +#define PerlSock_htonl(x) PL_piSock->Htonl(x) +#define PerlSock_htons(x) PL_piSock->Htons(x) +#define PerlSock_ntohl(x) PL_piSock->Ntohl(x) +#define PerlSock_ntohs(x) PL_piSock->Ntohs(x) +#define PerlSock_accept(s, a, l) PL_piSock->Accept(s, a, l, ErrorNo()) +#define PerlSock_bind(s, n, l) PL_piSock->Bind(s, n, l, ErrorNo()) +#define PerlSock_connect(s, n, l) PL_piSock->Connect(s, n, l, ErrorNo()) +#define PerlSock_endhostent() PL_piSock->Endhostent(ErrorNo()) +#define PerlSock_endnetent() PL_piSock->Endnetent(ErrorNo()) +#define PerlSock_endprotoent() PL_piSock->Endprotoent(ErrorNo()) +#define PerlSock_endservent() PL_piSock->Endservent(ErrorNo()) +#define PerlSock_gethostbyaddr(a, l, t) PL_piSock->Gethostbyaddr(a, l, t, ErrorNo()) +#define PerlSock_gethostbyname(n) PL_piSock->Gethostbyname(n, ErrorNo()) +#define PerlSock_gethostent() PL_piSock->Gethostent(ErrorNo()) +#define PerlSock_gethostname(n, l) PL_piSock->Gethostname(n, l, ErrorNo()) +#define PerlSock_getnetbyaddr(n, t) PL_piSock->Getnetbyaddr(n, t, ErrorNo()) +#define PerlSock_getnetbyname(c) PL_piSock->Getnetbyname(c, ErrorNo()) +#define PerlSock_getnetent() PL_piSock->Getnetent(ErrorNo()) +#define PerlSock_getpeername(s, n, l) PL_piSock->Getpeername(s, n, l, ErrorNo()) +#define PerlSock_getprotobyname(n) PL_piSock->Getprotobyname(n, ErrorNo()) +#define PerlSock_getprotobynumber(n) PL_piSock->Getprotobynumber(n, ErrorNo()) +#define PerlSock_getprotoent() PL_piSock->Getprotoent(ErrorNo()) +#define PerlSock_getservbyname(n, p) PL_piSock->Getservbyname(n, p, ErrorNo()) +#define PerlSock_getservbyport(port, p) PL_piSock->Getservbyport(port, p, ErrorNo()) +#define PerlSock_getservent() PL_piSock->Getservent(ErrorNo()) +#define PerlSock_getsockname(s, n, l) PL_piSock->Getsockname(s, n, l, ErrorNo()) +#define PerlSock_getsockopt(s,l,n,v,i) PL_piSock->Getsockopt(s, l, n, v, i, ErrorNo()) +#define PerlSock_inet_addr(c) PL_piSock->InetAddr(c, ErrorNo()) +#define PerlSock_inet_ntoa(i) PL_piSock->InetNtoa(i, ErrorNo()) +#define PerlSock_listen(s, b) PL_piSock->Listen(s, b, ErrorNo()) +#define PerlSock_recv(s, b, l, f) PL_piSock->Recv(s, b, l, f, ErrorNo()) #define PerlSock_recvfrom(s,b,l,f,from,fromlen) \ - piSock->Recvfrom(s, b, l, f, from, fromlen, ErrorNo()) + PL_piSock->Recvfrom(s, b, l, f, from, fromlen, ErrorNo()) #define PerlSock_select(n, r, w, e, t) \ - piSock->Select(n, (char*)r, (char*)w, (char*)e, t, ErrorNo()) -#define PerlSock_send(s, b, l, f) piSock->Send(s, b, l, f, ErrorNo()) + PL_piSock->Select(n, (char*)r, (char*)w, (char*)e, t, ErrorNo()) +#define PerlSock_send(s, b, l, f) PL_piSock->Send(s, b, l, f, ErrorNo()) #define PerlSock_sendto(s, b, l, f, t, tlen) \ - piSock->Sendto(s, b, l, f, t, tlen, ErrorNo()) -#define PerlSock_sethostent(f) piSock->Sethostent(f, ErrorNo()) -#define PerlSock_setnetent(f) piSock->Setnetent(f, ErrorNo()) -#define PerlSock_setprotoent(f) piSock->Setprotoent(f, ErrorNo()) -#define PerlSock_setservent(f) piSock->Setservent(f, ErrorNo()) + PL_piSock->Sendto(s, b, l, f, t, tlen, ErrorNo()) +#define PerlSock_sethostent(f) PL_piSock->Sethostent(f, ErrorNo()) +#define PerlSock_setnetent(f) PL_piSock->Setnetent(f, ErrorNo()) +#define PerlSock_setprotoent(f) PL_piSock->Setprotoent(f, ErrorNo()) +#define PerlSock_setservent(f) PL_piSock->Setservent(f, ErrorNo()) #define PerlSock_setsockopt(s, l, n, v, len) \ - piSock->Setsockopt(s, l, n, v, len, ErrorNo()) -#define PerlSock_shutdown(s, h) piSock->Shutdown(s, h, ErrorNo()) -#define PerlSock_socket(a, t, p) piSock->Socket(a, t, p, ErrorNo()) -#define PerlSock_socketpair(a, t, p, f) piSock->Socketpair(a, t, p, f, ErrorNo()) + PL_piSock->Setsockopt(s, l, n, v, len, ErrorNo()) +#define PerlSock_shutdown(s, h) PL_piSock->Shutdown(s, h, ErrorNo()) +#define PerlSock_socket(a, t, p) PL_piSock->Socket(a, t, p, ErrorNo()) +#define PerlSock_socketpair(a, t, p, f) PL_piSock->Socketpair(a, t, p, f, ErrorNo()) #else /* PERL_OBJECT */ @@ -882,6 +935,7 @@ public: #define PerlSock_inet_addr(c) inet_addr(c) #define PerlSock_inet_ntoa(i) inet_ntoa(i) #define PerlSock_listen(s, b) listen(s, b) +#define PerlSock_recv(s, b, l, f) recv(s, b, l, f) #define PerlSock_recvfrom(s, b, l, f, from, fromlen) \ recvfrom(s, b, l, f, from, fromlen) #define PerlSock_select(n, r, w, e, t) select(n, r, w, e, t) @@ -901,5 +955,22 @@ public: #endif /* PERL_OBJECT */ +/* Mention + + HAS_READV + HAS_RECVMSG + HAS_SENDMSG + HAS_WRITEV + HAS_STRUCT_MSGHDR + HAS_STRUCT_CMSGHDR + + here so that Configure picks them up. Perl core does not + use them but somebody might want to extend Socket:: or IO:: + someday. + + Jarkko Hietaniemi November 1998 + + */ + #endif /* __Inc__IPerl___ */