From 0424723402ef153af8ee44222315d9b6a818d1ba Mon Sep 17 00:00:00 2001 From: Tony Cook Date: Tue, 2 Jul 2019 15:22:26 +1000 Subject: [PATCH 2/3] (perl #134221) support append mode temp files on Win32 too MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Petr Písař --- perlio.c | 2 +- win32/win32.c | 10 +++++++++- win32/win32iop.h | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/perlio.c b/perlio.c index a737e79e02..81ebc156ad 100644 --- a/perlio.c +++ b/perlio.c @@ -5059,7 +5059,7 @@ PerlIO_tmpfile_flags(int imode) #endif PerlIO *f = NULL; #ifdef WIN32 - const int fd = win32_tmpfd(); + const int fd = win32_tmpfd_mode(imode); if (fd >= 0) f = PerlIO_fdopen(fd, "w+b"); #elif ! defined(VMS) && ! defined(OS2) diff --git a/win32/win32.c b/win32/win32.c index 8104d864c2..91fdffe09b 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2907,10 +2907,18 @@ win32_rewind(FILE *pf) DllExport int win32_tmpfd(void) +{ + return win32_tmpfd_mode(0); +} + +DllExport int +win32_tmpfd_mode(int mode) { char prefix[MAX_PATH+1]; char filename[MAX_PATH+1]; DWORD len = GetTempPath(MAX_PATH, prefix); + mode &= ~( O_ACCMODE | O_CREAT | O_EXCL ); + mode |= O_RDWR; if (len && len < MAX_PATH) { if (GetTempFileName(prefix, "plx", 0, filename)) { HANDLE fh = CreateFile(filename, @@ -2922,7 +2930,7 @@ win32_tmpfd(void) | FILE_FLAG_DELETE_ON_CLOSE, NULL); if (fh != INVALID_HANDLE_VALUE) { - int fd = win32_open_osfhandle((intptr_t)fh, 0); + int fd = win32_open_osfhandle((intptr_t)fh, mode); if (fd >= 0) { PERL_DEB(dTHX;) DEBUG_p(PerlIO_printf(Perl_debug_log, diff --git a/win32/win32iop.h b/win32/win32iop.h index 53330e5951..559e1f9cd2 100644 --- a/win32/win32iop.h +++ b/win32/win32iop.h @@ -64,6 +64,7 @@ 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); -- 2.20.1