X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/245468ebf9e9a3ea7e3600e1d4513bdc24459c6b..HEAD:/win32/win32iop.h diff --git a/win32/win32iop.h b/win32/win32iop.h index e835b2e..a50d840 100644 --- a/win32/win32iop.h +++ b/win32/win32iop.h @@ -13,11 +13,7 @@ #endif #endif -#if defined(_MSC_VER) || defined(__MINGW32__) -# include -#else -# include -#endif +#include /* * defines for flock emulation @@ -67,10 +63,13 @@ DllExport int win32_fseek(FILE *pf,Off_t offset,int origin); DllExport int win32_fgetpos(FILE *pf,fpos_t *p); DllExport int win32_fsetpos(FILE *pf,const fpos_t *p); DllExport void win32_rewind(FILE *pf); +DllExport int win32_tmpfd(void); +DllExport int win32_tmpfd_mode(int mode); DllExport FILE* win32_tmpfile(void); DllExport void win32_abort(void); DllExport int win32_fstat(int fd,Stat_t *sbufptr); DllExport int win32_stat(const char *name,Stat_t *sbufptr); +DllExport int win32_lstat(const char *name,Stat_t *sbufptr); DllExport int win32_pipe( int *phandles, unsigned int psize, int textmode ); DllExport PerlIO* win32_popen( const char *command, const char *mode ); DllExport PerlIO* win32_popenlist(const char *mode, IV narg, SV **args); @@ -85,10 +84,11 @@ DllExport int win32_dup2(int h1, int h2); DllExport int win32_open(const char *path, int oflag,...); DllExport int win32_close(int fd); DllExport int win32_eof(int fd); +DllExport int win32_isatty(int fd); DllExport int win32_read(int fd, void *buf, unsigned int cnt); DllExport int win32_write(int fd, const void *buf, unsigned int cnt); DllExport int win32_spawnvp(int mode, const char *cmdname, - const char *const *argv); + const char *const *argv); DllExport int win32_mkdir(const char *dir, int mode); DllExport int win32_rmdir(const char *dir); DllExport int win32_chdir(const char *dir); @@ -116,23 +116,29 @@ DllExport int win32_open_osfhandle(intptr_t handle, int flags); DllExport intptr_t win32_get_osfhandle(int fd); DllExport FILE* win32_fdupopen(FILE *pf); -DllExport DIR* win32_opendir(char *filename); +DllExport DIR* win32_opendir(const char *filename); DllExport struct direct* win32_readdir(DIR *dirp); DllExport long win32_telldir(DIR *dirp); DllExport void win32_seekdir(DIR *dirp, long loc); DllExport void win32_rewinddir(DIR *dirp); DllExport int win32_closedir(DIR *dirp); +DllExport DIR* win32_dirp_dup(DIR *const dirp, CLONE_PARAMS *const param); +DllExport char* win32_getenvironmentstrings(void); +/* also see win32_freeenvironmentstrings macro */ DllExport char* win32_getenv(const char *name); DllExport int win32_putenv(const char *name); DllExport unsigned win32_sleep(unsigned int); +DllExport int win32_pause(void); DllExport int win32_times(struct tms *timebuf); DllExport unsigned win32_alarm(unsigned int sec); -DllExport int win32_stat(const char *path, Stat_t *buf); DllExport char* win32_longpath(char *path); +DllExport char* win32_ansipath(const WCHAR *path); DllExport int win32_ioctl(int i, unsigned int u, char *data); DllExport int win32_link(const char *oldname, const char *newname); +DllExport int win32_symlink(const char *oldname, const char *newname); +DllExport int win32_readlink(const char *path, char *buf, size_t bufsiz); DllExport int win32_unlink(const char *f); DllExport int win32_utime(const char *f, struct utimbuf *t); DllExport int win32_gettimeofday(struct timeval *tp, void *not_used); @@ -158,8 +164,12 @@ DllExport Sighandler_t win32_signal(int sig, Sighandler_t subcode); END_EXTERN_C +/* see comment in win32_getenvironmentstrings */ +#define win32_freeenvironmentstrings(x) win32_free(x) #undef alarm -#define alarm win32_alarm +#define alarm win32_alarm +#undef strerror +#define strerror win32_strerror /* * the following six(6) is #define in stdio.h @@ -184,39 +194,33 @@ END_EXTERN_C #undef uname #undef wait -#ifdef __BORLANDC__ -#undef ungetc -#undef getc -#undef putc -#undef getchar -#undef putchar +#if defined(__MINGW32__) #undef fileno #endif #define stderr win32_stderr() #define stdout win32_stdout() -#define stdin win32_stdin() +#define stdin win32_stdin() #define feof(f) win32_feof(f) #define ferror(f) win32_ferror(f) #define errno (*win32_errno()) #define environ (*win32_environ()) -#define strerror win32_strerror /* * redirect to our own version */ #undef fprintf -#define fprintf win32_fprintf -#define vfprintf win32_vfprintf -#define printf win32_printf -#define vprintf win32_vprintf +#define fprintf win32_fprintf +#define vfprintf win32_vfprintf +#define printf win32_printf +#define vprintf win32_vprintf #define fread(buf,size,count,f) win32_fread(buf,size,count,f) #define fwrite(buf,size,count,f) win32_fwrite(buf,size,count,f) #define fopen win32_fopen #undef fdopen #define fdopen win32_fdopen #define freopen win32_freopen -#define fclose(f) win32_fclose(f) +#define fclose(f) win32_fclose(f) #define fputs(s,f) win32_fputs(s,f) #define fputc(c,f) win32_fputc(c,f) #define ungetc(c,f) win32_ungetc(c,f) @@ -232,9 +236,17 @@ END_EXTERN_C #define rewind(f) win32_rewind(f) #define tmpfile() win32_tmpfile() #define abort() win32_abort() +#ifdef __MINGW32__ +# undef fstat +#endif #define fstat(fd,bufptr) win32_fstat(fd,bufptr) +#ifdef __MINGW32__ +# undef stat +#endif #define stat(pth,bufptr) win32_stat(pth,bufptr) +#define lstat(pth,bufptr) win32_lstat(pth,bufptr) #define longpath(pth) win32_longpath(pth) +#define ansipath(pth) win32_ansipath(pth) #define rename(old,new) win32_rename(old,new) #define setmode(fd,mode) win32_setmode(fd,mode) #define chsize(fd,sz) win32_chsize(fd,sz) @@ -245,6 +257,7 @@ END_EXTERN_C #define open win32_open #define close(fd) win32_close(fd) #define eof(fd) win32_eof(fd) +#define isatty(fd) win32_isatty(fd) #define read(fd,b,s) win32_read(fd,b,s) #define write(fd,b,s) win32_write(fd,b,s) #define _open_osfhandle win32_open_osfhandle @@ -276,7 +289,6 @@ END_EXTERN_C #define access(p,m) win32_access(p,m) #define chmod(p,m) win32_chmod(p,m) - #if !defined(MYMALLOC) || !defined(PERL_CORE) #undef malloc #undef calloc @@ -288,12 +300,18 @@ END_EXTERN_C #define free win32_free #endif +/* XXX Why are APIs like sleep(), times() etc. inside a block + * XXX guarded by "#ifndef WIN32IO_IS_STDIO"? + */ + #define pipe(fd) win32_pipe((fd), 512, O_BINARY) -#define pause() win32_sleep((32767L << 16) + 32767) +#define pause win32_pause #define sleep win32_sleep #define times win32_times #define ioctl win32_ioctl #define link win32_link +#define symlink win32_symlink +#define readlink win32_readlink #define unlink win32_unlink #define utime win32_utime #define gettimeofday win32_gettimeofday @@ -301,6 +319,8 @@ END_EXTERN_C #define wait win32_wait #define waitpid win32_waitpid #define kill win32_kill +#define killpg(pid, sig) win32_kill(pid, -(sig)) + #define opendir win32_opendir #define readdir win32_readdir