This is a live mirror of the Perl 5 development currently hosted at
https://github.com/perl/perl5
https://perl5.git.perl.org
/
perl5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Slience compiler warnings for NV, [IU]V compare
[perl5.git]
/
perlio.c
diff --git
a/perlio.c
b/perlio.c
index
81ebc15
..
b3b4327
100644
(file)
--- a/
perlio.c
+++ b/
perlio.c
@@
-26,9
+26,9
@@
* Invent a dSYS macro to abstract this out
*/
#ifdef PERL_IMPLICIT_SYS
* Invent a dSYS macro to abstract this out
*/
#ifdef PERL_IMPLICIT_SYS
-#define dSYS dTHX
+#
define dSYS dTHX
#else
#else
-#define dSYS dNOOP
+#
define dSYS dNOOP
#endif
#define PERLIO_NOT_STDIO 0
#endif
#define PERLIO_NOT_STDIO 0
@@
-43,14
+43,14
@@
#include "perl.h"
#ifdef PERL_IMPLICIT_CONTEXT
#include "perl.h"
#ifdef PERL_IMPLICIT_CONTEXT
-#undef dSYS
-#define dSYS dTHX
+#
undef dSYS
+#
define dSYS dTHX
#endif
#include "XSUB.h"
#ifdef VMS
#endif
#include "XSUB.h"
#ifdef VMS
-#include <rms.h>
+#
include <rms.h>
#endif
#define PerlIO_lockcnt(f) (((PerlIOl*)(f))->head->flags)
#endif
#define PerlIO_lockcnt(f) (((PerlIOl*)(f))->head->flags)
@@
-123,11
+123,11
@@
perlsio_binmode(FILE *fp, int iotype, int mode)
#ifdef DOSISH
dTHX;
PERL_UNUSED_ARG(iotype);
#ifdef DOSISH
dTHX;
PERL_UNUSED_ARG(iotype);
-#ifdef NETWARE
+#
ifdef NETWARE
if (PerlLIO_setmode(fp, mode) != -1) {
if (PerlLIO_setmode(fp, mode) != -1) {
-#else
+#
else
if (PerlLIO_setmode(fileno(fp), mode) != -1) {
if (PerlLIO_setmode(fileno(fp), mode) != -1) {
-#endif
+#
endif
return 1;
}
else
return 1;
}
else
@@
-152,7
+152,7
@@
perlsio_binmode(FILE *fp, int iotype, int mode)
}
#ifndef O_ACCMODE
}
#ifndef O_ACCMODE
-#define O_ACCMODE 3 /* Assume traditional implementation */
+#
define O_ACCMODE 3 /* Assume traditional implementation */
#endif
int
#endif
int
@@
-199,7
+199,7
@@
PerlIO_intmode2str(int rawmode, char *mode, int *writing)
* with it won't do much good. */
if (rawmode & O_BINARY)
mode[ix++] = 'b';
* with it won't do much good. */
if (rawmode & O_BINARY)
mode[ix++] = 'b';
-#
endif
+#endif
mode[ix] = '\0';
return ptype;
}
mode[ix] = '\0';
return ptype;
}
@@
-236,23
+236,23
@@
PerlIO_binmode(pTHX_ PerlIO *fp, int iotype, int mode, const char *names)
PerlIO *
PerlIO_fdupopen(pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
{
PerlIO *
PerlIO_fdupopen(pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
{
-#
if defined(PERL_MICRO) || defined(__SYMBIAN32__
)
+#
if defined(PERL_MICRO
)
return NULL;
return NULL;
-#elif defined(PERL_IMPLICIT_SYS)
+#
elif defined(PERL_IMPLICIT_SYS)
return PerlSIO_fdupopen(f);
return PerlSIO_fdupopen(f);
-#else
-# ifdef WIN32
+#
else
+#
ifdef WIN32
return win32_fdupopen(f);
return win32_fdupopen(f);
-# else
+#
else
if (f) {
const int fd = PerlLIO_dup_cloexec(PerlIO_fileno(f));
if (fd >= 0) {
char mode[8];
if (f) {
const int fd = PerlLIO_dup_cloexec(PerlIO_fileno(f));
if (fd >= 0) {
char mode[8];
-# ifdef DJGPP
+#
ifdef DJGPP
const int omode = djgpp_get_stream_mode(f);
const int omode = djgpp_get_stream_mode(f);
-# else
+#
else
const int omode = fcntl(fd, F_GETFL);
const int omode = fcntl(fd, F_GETFL);
-# endif
+#
endif
PerlIO_intmode2str(omode,mode,NULL);
/* the r+ is a hack */
return PerlIO_fdopen(fd, mode);
PerlIO_intmode2str(omode,mode,NULL);
/* the r+ is a hack */
return PerlIO_fdopen(fd, mode);
@@
-262,9
+262,9
@@
PerlIO_fdupopen(pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
else {
SETERRNO(EBADF, SS_IVCHAN);
}
else {
SETERRNO(EBADF, SS_IVCHAN);
}
-# endif
+#
endif
return NULL;
return NULL;
-#endif
+#
endif
}
}
@@
-415,9
+415,9
@@
PerlIO_verify_head(pTHX_ PerlIO *f)
{
PerlIOl *head, *p;
int seen = 0;
{
PerlIOl *head, *p;
int seen = 0;
-#ifndef PERL_IMPLICIT_SYS
+#
ifndef PERL_IMPLICIT_SYS
PERL_UNUSED_CONTEXT;
PERL_UNUSED_CONTEXT;
-#endif
+#
endif
if (!PerlIOValid(f))
return;
p = head = PerlIOBase(f)->head;
if (!PerlIOValid(f))
return;
p = head = PerlIOBase(f)->head;
@@
-1066,9
+1066,9
@@
PerlIO_default_layers(pTHX)
PerlIO_define_layer(aTHX_ PERLIO_FUNCS_CAST(&PerlIO_unix));
#if defined(WIN32)
PerlIO_define_layer(aTHX_ PERLIO_FUNCS_CAST(&PerlIO_win32));
PerlIO_define_layer(aTHX_ PERLIO_FUNCS_CAST(&PerlIO_unix));
#if defined(WIN32)
PerlIO_define_layer(aTHX_ PERLIO_FUNCS_CAST(&PerlIO_win32));
-#if 0
+#
if 0
osLayer = &PerlIO_win32;
osLayer = &PerlIO_win32;
-#endif
+#
endif
#endif
PerlIO_define_layer(aTHX_ PERLIO_FUNCS_CAST(&PerlIO_raw));
PerlIO_define_layer(aTHX_ PERLIO_FUNCS_CAST(&PerlIO_perlio));
#endif
PerlIO_define_layer(aTHX_ PERLIO_FUNCS_CAST(&PerlIO_raw));
PerlIO_define_layer(aTHX_ PERLIO_FUNCS_CAST(&PerlIO_perlio));
@@
-1490,7
+1490,7
@@
PerlIO_openn(pTHX_ const char *layers, const char *mode, int fd,
int imode, int perm, PerlIO *f, int narg, SV **args)
{
if (!f && narg == 1 && *args == &PL_sv_undef) {
int imode, int perm, PerlIO *f, int narg, SV **args)
{
if (!f && narg == 1 && *args == &PL_sv_undef) {
- i
nt i
mode = PerlIOUnix_oflags(mode);
+ imode = PerlIOUnix_oflags(mode);
if (imode != -1 && (f = PerlIO_tmpfile_flags(imode))) {
if (!layers || !*layers)
if (imode != -1 && (f = PerlIO_tmpfile_flags(imode))) {
if (!layers || !*layers)
@@
-2256,7
+2256,6
@@
static void
S_more_refcounted_fds(pTHX_ const int new_fd)
PERL_TSA_REQUIRES(PL_perlio_mutex)
{
S_more_refcounted_fds(pTHX_ const int new_fd)
PERL_TSA_REQUIRES(PL_perlio_mutex)
{
- dVAR;
const int old_max = PL_perlio_fd_refcnt_size;
const int new_max = 16 + (new_fd & ~15);
int *new_array;
const int old_max = PL_perlio_fd_refcnt_size;
const int new_max = 16 + (new_fd & ~15);
int *new_array;
@@
-2306,7
+2305,6
@@
PerlIOUnix_refcnt_inc(int fd)
{
dTHX;
if (fd >= 0) {
{
dTHX;
if (fd >= 0) {
- dVAR;
MUTEX_LOCK(&PL_perlio_mutex);
if (fd >= PL_perlio_fd_refcnt_size)
MUTEX_LOCK(&PL_perlio_mutex);
if (fd >= PL_perlio_fd_refcnt_size)
@@
-2335,8
+2333,6
@@
PerlIOUnix_refcnt_dec(int fd)
if (fd >= 0) {
#ifdef DEBUGGING
dTHX;
if (fd >= 0) {
#ifdef DEBUGGING
dTHX;
-#else
- dVAR;
#endif
MUTEX_LOCK(&PL_perlio_mutex);
if (fd >= PL_perlio_fd_refcnt_size) {
#endif
MUTEX_LOCK(&PL_perlio_mutex);
if (fd >= PL_perlio_fd_refcnt_size) {
@@
-2365,7
+2361,6
@@
PerlIOUnix_refcnt(int fd)
dTHX;
int cnt = 0;
if (fd >= 0) {
dTHX;
int cnt = 0;
if (fd >= 0) {
- dVAR;
MUTEX_LOCK(&PL_perlio_mutex);
if (fd >= PL_perlio_fd_refcnt_size) {
/* diag_listed_as: refcnt: fd %d%s */
MUTEX_LOCK(&PL_perlio_mutex);
if (fd >= PL_perlio_fd_refcnt_size) {
/* diag_listed_as: refcnt: fd %d%s */
@@
-2416,14
+2411,13
@@
PerlIO_cleanup(pTHX)
void PerlIO_teardown(void) /* Call only from PERL_SYS_TERM(). */
{
void PerlIO_teardown(void) /* Call only from PERL_SYS_TERM(). */
{
- dVAR;
#if 0
/* XXX we can't rely on an interpreter being present at this late stage,
XXX so we can't use a function like PerlLIO_write that relies on one
being present (at least in win32) :-(.
Disable for now.
*/
#if 0
/* XXX we can't rely on an interpreter being present at this late stage,
XXX so we can't use a function like PerlLIO_write that relies on one
being present (at least in win32) :-(.
Disable for now.
*/
-#ifdef DEBUGGING
+#
ifdef DEBUGGING
{
/* By now all filehandles should have been closed, so any
* stray (non-STD-)filehandles indicate *possible* (PerlIO)
{
/* By now all filehandles should have been closed, so any
* stray (non-STD-)filehandles indicate *possible* (PerlIO)
@@
-2442,7
+2436,7
@@
void PerlIO_teardown(void) /* Call only from PERL_SYS_TERM(). */
}
}
}
}
}
}
-#endif
+#
endif
#endif
/* Not bothering with PL_perlio_mutex since by now
* all the interpreters are gone. */
#endif
/* Not bothering with PL_perlio_mutex since by now
* all the interpreters are gone. */
@@
-2560,7
+2554,7
@@
PerlIOUnix_oflags(const char *mode)
mode++;
break;
default:
mode++;
break;
default:
-#
if O_BINARY != 0
+#if O_BINARY != 0
/* bit-or:ing with zero O_BINARY would be useless. */
/*
* If neither "t" nor "b" was specified, open the file
/* bit-or:ing with zero O_BINARY would be useless. */
/*
* If neither "t" nor "b" was specified, open the file
@@
-2571,7
+2565,7
@@
PerlIOUnix_oflags(const char *mode)
* set the errno and invalidate the flags.
*/
oflags |= O_BINARY;
* set the errno and invalidate the flags.
*/
oflags |= O_BINARY;
-#
endif
+#endif
break;
}
if (*mode || oflags == -1) {
break;
}
if (*mode || oflags == -1) {
@@
-2744,10
+2738,6
@@
PerlIOUnix_read(pTHX_ PerlIO *f, void *vbuf, Size_t count)
if (PerlIO_lockcnt(f)) /* in use: abort ungracefully */
return -1;
fd = PerlIOSelf(f, PerlIOUnix)->fd;
if (PerlIO_lockcnt(f)) /* in use: abort ungracefully */
return -1;
fd = PerlIOSelf(f, PerlIOUnix)->fd;
-#ifdef PERLIO_STD_SPECIAL
- if (fd == 0)
- return PERLIO_STD_IN(fd, vbuf, count);
-#endif
if (!(PerlIOBase(f)->flags & PERLIO_F_CANREAD) ||
PerlIOBase(f)->flags & (PERLIO_F_EOF|PERLIO_F_ERROR)) {
return 0;
if (!(PerlIOBase(f)->flags & PERLIO_F_CANREAD) ||
PerlIOBase(f)->flags & (PERLIO_F_EOF|PERLIO_F_ERROR)) {
return 0;
@@
-2781,10
+2771,6
@@
PerlIOUnix_write(pTHX_ PerlIO *f, const void *vbuf, Size_t count)
if (PerlIO_lockcnt(f)) /* in use: abort ungracefully */
return -1;
fd = PerlIOSelf(f, PerlIOUnix)->fd;
if (PerlIO_lockcnt(f)) /* in use: abort ungracefully */
return -1;
fd = PerlIOSelf(f, PerlIOUnix)->fd;
-#ifdef PERLIO_STD_SPECIAL
- if (fd == 1 || fd == 2)
- return PERLIO_STD_OUT(fd, vbuf, count);
-#endif
while (1) {
const SSize_t len = PerlLIO_write(fd, vbuf, count);
if (len >= 0 || errno != EINTR) {
while (1) {
const SSize_t len = PerlLIO_write(fd, vbuf, count);
if (len >= 0 || errno != EINTR) {
@@
-2818,6
+2804,7
@@
PerlIOUnix_close(pTHX_ PerlIO *f)
const int fd = PerlIOSelf(f, PerlIOUnix)->fd;
int code = 0;
if (PerlIOBase(f)->flags & PERLIO_F_OPEN) {
const int fd = PerlIOSelf(f, PerlIOUnix)->fd;
int code = 0;
if (PerlIOBase(f)->flags & PERLIO_F_OPEN) {
+ code = PerlIOBase_close(aTHX_ f);
if (PerlIOUnix_refcnt_dec(fd) > 0) {
PerlIOBase(f)->flags &= ~PERLIO_F_OPEN;
return 0;
if (PerlIOUnix_refcnt_dec(fd) > 0) {
PerlIOBase(f)->flags &= ~PERLIO_F_OPEN;
return 0;
@@
-2882,7
+2869,7
@@
PERLIO_FUNCS_DECL(PerlIO_unix) = {
/* perl5.8 - This ensures the last minute VMS ungetc fix is not
broken by the last second glibc 2.3 fix
*/
/* perl5.8 - This ensures the last minute VMS ungetc fix is not
broken by the last second glibc 2.3 fix
*/
-#define STDIO_BUFFER_WRITABLE
+#
define STDIO_BUFFER_WRITABLE
#endif
#endif
@@
-3180,22
+3167,22
@@
PerlIOStdio_invalidate_fileno(pTHX_ FILE *f)
/* XXX this could use PerlIO_canset_fileno() and
* PerlIO_set_fileno() support from Configure
*/
/* XXX this could use PerlIO_canset_fileno() and
* PerlIO_set_fileno() support from Configure
*/
-#
if defined(HAS_FDCLOSE)
+#if defined(HAS_FDCLOSE)
return fdclose(f, NULL) == 0 ? 1 : 0;
return fdclose(f, NULL) == 0 ? 1 : 0;
-#
elif defined(__UCLIBC__)
+#elif defined(__UCLIBC__)
/* uClibc must come before glibc because it defines __GLIBC__ as well. */
f->__filedes = -1;
return 1;
/* uClibc must come before glibc because it defines __GLIBC__ as well. */
f->__filedes = -1;
return 1;
-#
elif defined(__GLIBC__)
+#elif defined(__GLIBC__)
/* There may be a better way for GLIBC:
- libio.h defines a flag to not close() on cleanup
*/
f->_fileno = -1;
return 1;
/* There may be a better way for GLIBC:
- libio.h defines a flag to not close() on cleanup
*/
f->_fileno = -1;
return 1;
-#
elif defined(__sun)
+#elif defined(__sun)
PERL_UNUSED_ARG(f);
return 0;
PERL_UNUSED_ARG(f);
return 0;
-#
elif defined(__hpux)
+#elif defined(__hpux)
f->__fileH = 0xff;
f->__fileL = 0xff;
return 1;
f->__fileH = 0xff;
f->__fileL = 0xff;
return 1;
@@
-3204,47
+3191,47
@@
PerlIOStdio_invalidate_fileno(pTHX_ FILE *f)
[For OSF only have confirmation for Tru64 (alpha)
but assume other OSFs will be similar.]
*/
[For OSF only have confirmation for Tru64 (alpha)
but assume other OSFs will be similar.]
*/
-#
elif defined(_AIX) || defined(__osf__) || defined(__irix__)
+#elif defined(_AIX) || defined(__osf__) || defined(__irix__)
f->_file = -1;
return 1;
f->_file = -1;
return 1;
-#
elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__)
/* There may be a better way on FreeBSD:
- we could insert a dummy func in the _close function entry
f->_close = (int (*)(void *)) dummy_close;
*/
f->_file = -1;
return 1;
/* There may be a better way on FreeBSD:
- we could insert a dummy func in the _close function entry
f->_close = (int (*)(void *)) dummy_close;
*/
f->_file = -1;
return 1;
-#
elif defined(__OpenBSD__)
+#elif defined(__OpenBSD__)
/* There may be a better way on OpenBSD:
- we could insert a dummy func in the _close function entry
f->_close = (int (*)(void *)) dummy_close;
*/
f->_file = -1;
return 1;
/* There may be a better way on OpenBSD:
- we could insert a dummy func in the _close function entry
f->_close = (int (*)(void *)) dummy_close;
*/
f->_file = -1;
return 1;
-#
elif defined(__EMX__)
+#elif defined(__EMX__)
/* f->_flags &= ~_IOOPEN; */ /* Will leak stream->_buffer */
f->_handle = -1;
return 1;
/* f->_flags &= ~_IOOPEN; */ /* Will leak stream->_buffer */
f->_handle = -1;
return 1;
-#
elif defined(__CYGWIN__)
+#elif defined(__CYGWIN__)
/* There may be a better way on CYGWIN:
- we could insert a dummy func in the _close function entry
f->_close = (int (*)(void *)) dummy_close;
*/
f->_file = -1;
return 1;
/* There may be a better way on CYGWIN:
- we could insert a dummy func in the _close function entry
f->_close = (int (*)(void *)) dummy_close;
*/
f->_file = -1;
return 1;
-#
elif defined(WIN32)
+#elif defined(WIN32)
PERLIO_FILE_file(f) = -1;
return 1;
PERLIO_FILE_file(f) = -1;
return 1;
-#
else
-#if 0
+#else
+#
if 0
/* Sarathy's code did this - we fall back to a dup/dup2 hack
(which isn't thread safe) instead
*/
# error "Don't know how to set FILE.fileno on your platform"
/* Sarathy's code did this - we fall back to a dup/dup2 hack
(which isn't thread safe) instead
*/
# error "Don't know how to set FILE.fileno on your platform"
-#endif
+#
endif
PERL_UNUSED_ARG(f);
return 0;
PERL_UNUSED_ARG(f);
return 0;
-#
endif
+#endif
}
IV
}
IV
@@
-3261,9
+3248,6
@@
PerlIOStdio_close(pTHX_ PerlIO *f)
IV result = 0;
int dupfd = -1;
dSAVEDERRNO;
IV result = 0;
int dupfd = -1;
dSAVEDERRNO;
-#ifdef USE_ITHREADS
- dVAR;
-#endif
#ifdef SOCKS5_VERSION_NAME
/* Socks lib overrides close() but stdio isn't linked to
that library (though we are) - so we must call close()
#ifdef SOCKS5_VERSION_NAME
/* Socks lib overrides close() but stdio isn't linked to
that library (though we are) - so we must call close()
@@
-3591,7
+3575,7
@@
PerlIOStdio_set_ptrcnt(pTHX_ PerlIO *f, STDCHAR * ptr, SSize_t cnt)
FILE * const stdio = PerlIOSelf(f, PerlIOStdio)->stdio;
PERL_UNUSED_CONTEXT;
if (ptr != NULL) {
FILE * const stdio = PerlIOSelf(f, PerlIOStdio)->stdio;
PERL_UNUSED_CONTEXT;
if (ptr != NULL) {
-#ifdef STDIO_PTR_LVALUE
+#
ifdef STDIO_PTR_LVALUE
/* This is a long-standing infamous mess. The root of the
* problem is that one cannot know the signedness of char, and
* more precisely the signedness of FILE._ptr. The following
/* This is a long-standing infamous mess. The root of the
* problem is that one cannot know the signedness of char, and
* more precisely the signedness of FILE._ptr. The following
@@
-3606,31
+3590,31
@@
PerlIOStdio_set_ptrcnt(pTHX_ PerlIO *f, STDCHAR * ptr, SSize_t cnt)
GCC_DIAG_IGNORE_STMT(-Wpointer-sign);
PerlSIO_set_ptr(stdio, ptr); /* LHS STDCHAR* cast non-portable */
GCC_DIAG_RESTORE_STMT;
GCC_DIAG_IGNORE_STMT(-Wpointer-sign);
PerlSIO_set_ptr(stdio, ptr); /* LHS STDCHAR* cast non-portable */
GCC_DIAG_RESTORE_STMT;
-#ifdef STDIO_PTR_LVAL_SETS_CNT
+#
ifdef STDIO_PTR_LVAL_SETS_CNT
assert(PerlSIO_get_cnt(stdio) == (cnt));
assert(PerlSIO_get_cnt(stdio) == (cnt));
-#endif
-#if (!defined(STDIO_PTR_LVAL_NOCHANGE_CNT))
+#
endif
+#
if (!defined(STDIO_PTR_LVAL_NOCHANGE_CNT))
/*
* Setting ptr _does_ change cnt - we are done
*/
return;
/*
* Setting ptr _does_ change cnt - we are done
*/
return;
-#endif
-#else /* STDIO_PTR_LVALUE */
+#
endif
+#
else /* STDIO_PTR_LVALUE */
PerlProc_abort();
PerlProc_abort();
-#endif /* STDIO_PTR_LVALUE */
+#
endif /* STDIO_PTR_LVALUE */
}
/*
* Now (or only) set cnt
*/
}
/*
* Now (or only) set cnt
*/
-#ifdef STDIO_CNT_LVALUE
+#
ifdef STDIO_CNT_LVALUE
PerlSIO_set_cnt(stdio, cnt);
PerlSIO_set_cnt(stdio, cnt);
-#elif (defined(STDIO_PTR_LVALUE) && defined(STDIO_PTR_LVAL_SETS_CNT))
+#
elif (defined(STDIO_PTR_LVALUE) && defined(STDIO_PTR_LVAL_SETS_CNT))
PerlSIO_set_ptr(stdio,
PerlSIO_get_ptr(stdio) + (PerlSIO_get_cnt(stdio) -
cnt));
PerlSIO_set_ptr(stdio,
PerlSIO_get_ptr(stdio) + (PerlSIO_get_cnt(stdio) -
cnt));
-#else /* STDIO_PTR_LVAL_SETS_CNT */
+#
else /* STDIO_PTR_LVAL_SETS_CNT */
PerlProc_abort();
PerlProc_abort();
-#endif /* STDIO_CNT_LVALUE */
+#
endif /* STDIO_CNT_LVALUE */
}
}
@@
-3666,7
+3650,7
@@
PerlIOStdio_fill(pTHX_ PerlIO *f)
#if (defined(STDIO_PTR_LVALUE) && (defined(STDIO_CNT_LVALUE) || defined(STDIO_PTR_LVAL_SETS_CNT)))
#if (defined(STDIO_PTR_LVALUE) && (defined(STDIO_CNT_LVALUE) || defined(STDIO_PTR_LVAL_SETS_CNT)))
-#ifdef STDIO_BUFFER_WRITABLE
+#
ifdef STDIO_BUFFER_WRITABLE
if (PerlIO_fast_gets(f) && PerlIO_has_base(f)) {
/* Fake ungetc() to the real buffer in case system's ungetc
goes elsewhere
if (PerlIO_fast_gets(f) && PerlIO_has_base(f)) {
/* Fake ungetc() to the real buffer in case system's ungetc
goes elsewhere
@@
-3683,7
+3667,7
@@
PerlIOStdio_fill(pTHX_ PerlIO *f)
}
}
else
}
}
else
-#endif
+#
endif
if (PerlIO_has_cntptr(f)) {
STDCHAR ch = c;
if (PerlIOStdio_unread(aTHX_ f,&ch,1) == 1) {
if (PerlIO_has_cntptr(f)) {
STDCHAR ch = c;
if (PerlIOStdio_unread(aTHX_ f,&ch,1) == 1) {
@@
-5062,7
+5046,7
@@
PerlIO_tmpfile_flags(int imode)
const int fd = win32_tmpfd_mode(imode);
if (fd >= 0)
f = PerlIO_fdopen(fd, "w+b");
const int fd = win32_tmpfd_mode(imode);
if (fd >= 0)
f = PerlIO_fdopen(fd, "w+b");
-#elif ! defined(
VMS) && ! defined(
OS2)
+#elif ! defined(OS2)
int fd = -1;
char tempname[] = "/tmp/PerlIO_XXXXXX";
const char * const tmpdir = TAINTING_get ? NULL : PerlEnv_getenv("TMPDIR");
int fd = -1;
char tempname[] = "/tmp/PerlIO_XXXXXX";
const char * const tmpdir = TAINTING_get ? NULL : PerlEnv_getenv("TMPDIR");
@@
-5073,19
+5057,19
@@
PerlIO_tmpfile_flags(int imode)
/* if TMPDIR is set and not empty, we try that first */
sv = newSVpv(tmpdir, 0);
sv_catpv(sv, tempname + 4);
/* if TMPDIR is set and not empty, we try that first */
sv = newSVpv(tmpdir, 0);
sv_catpv(sv, tempname + 4);
- fd = Perl_my_mkostemp_cloexec(SvPVX(sv), imode);
+ fd = Perl_my_mkostemp_cloexec(SvPVX(sv), imode
| O_VMS_DELETEONCLOSE
);
}
if (fd < 0) {
SvREFCNT_dec(sv);
sv = NULL;
/* else we try /tmp */
}
if (fd < 0) {
SvREFCNT_dec(sv);
sv = NULL;
/* else we try /tmp */
- fd = Perl_my_mkostemp_cloexec(tempname, imode);
+ fd = Perl_my_mkostemp_cloexec(tempname, imode
| O_VMS_DELETEONCLOSE
);
}
if (fd < 0) {
/* Try cwd */
sv = newSVpvs(".");
sv_catpv(sv, tempname + 4);
}
if (fd < 0) {
/* Try cwd */
sv = newSVpvs(".");
sv_catpv(sv, tempname + 4);
- fd = Perl_my_mkostemp_cloexec(SvPVX(sv), imode);
+ fd = Perl_my_mkostemp_cloexec(SvPVX(sv), imode
| O_VMS_DELETEONCLOSE
);
}
umask(old_umask);
if (fd >= 0) {
}
umask(old_umask);
if (fd >= 0) {
@@
-5096,7
+5080,9
@@
PerlIO_tmpfile_flags(int imode)
f = PerlIO_fdopen(fd, mode);
if (f)
PerlIOBase(f)->flags |= PERLIO_F_TEMP;
f = PerlIO_fdopen(fd, mode);
if (f)
PerlIOBase(f)->flags |= PERLIO_F_TEMP;
+# ifndef VMS
PerlLIO_unlink(sv ? SvPVX_const(sv) : tempname);
PerlLIO_unlink(sv ? SvPVX_const(sv) : tempname);
+# endif
}
SvREFCNT_dec(sv);
#else /* !HAS_MKSTEMP, fallback to stdio tmpfile(). */
}
SvREFCNT_dec(sv);
#else /* !HAS_MKSTEMP, fallback to stdio tmpfile(). */
@@
-5178,7
+5164,7
@@
Perl_PerlIO_context_layers(pTHX_ const char *mode)
#ifndef HAS_FSETPOS
#ifndef HAS_FSETPOS
-#undef PerlIO_setpos
+#
undef PerlIO_setpos
int
PerlIO_setpos(PerlIO *f, SV *pos)
{
int
PerlIO_setpos(PerlIO *f, SV *pos)
{
@@
-5195,7
+5181,7
@@
PerlIO_setpos(PerlIO *f, SV *pos)
return -1;
}
#else
return -1;
}
#else
-#undef PerlIO_setpos
+#
undef PerlIO_setpos
int
PerlIO_setpos(PerlIO *f, SV *pos)
{
int
PerlIO_setpos(PerlIO *f, SV *pos)
{
@@
-5205,11
+5191,11
@@
PerlIO_setpos(PerlIO *f, SV *pos)
STRLEN len;
Fpos_t * const fpos = (Fpos_t *) SvPV(pos, len);
if(len == sizeof(Fpos_t))
STRLEN len;
Fpos_t * const fpos = (Fpos_t *) SvPV(pos, len);
if(len == sizeof(Fpos_t))
-#if defined(USE_64_BIT_STDIO) && defined(USE_FSETPOS64)
+#
if defined(USE_64_BIT_STDIO) && defined(USE_FSETPOS64)
return fsetpos64(f, fpos);
return fsetpos64(f, fpos);
-#else
+#
else
return fsetpos(f, fpos);
return fsetpos(f, fpos);
-#endif
+#
endif
}
}
SETERRNO(EINVAL, SS_IVCHAN);
}
}
SETERRNO(EINVAL, SS_IVCHAN);
@@
-5218,7
+5204,7
@@
PerlIO_setpos(PerlIO *f, SV *pos)
#endif
#ifndef HAS_FGETPOS
#endif
#ifndef HAS_FGETPOS
-#undef PerlIO_getpos
+#
undef PerlIO_getpos
int
PerlIO_getpos(PerlIO *f, SV *pos)
{
int
PerlIO_getpos(PerlIO *f, SV *pos)
{
@@
-5228,18
+5214,18
@@
PerlIO_getpos(PerlIO *f, SV *pos)
return (posn == (Off_t) - 1) ? -1 : 0;
}
#else
return (posn == (Off_t) - 1) ? -1 : 0;
}
#else
-#undef PerlIO_getpos
+#
undef PerlIO_getpos
int
PerlIO_getpos(PerlIO *f, SV *pos)
{
dTHX;
Fpos_t fpos;
int code;
int
PerlIO_getpos(PerlIO *f, SV *pos)
{
dTHX;
Fpos_t fpos;
int code;
-#if defined(USE_64_BIT_STDIO) && defined(USE_FSETPOS64)
+#
if defined(USE_64_BIT_STDIO) && defined(USE_FSETPOS64)
code = fgetpos64(f, &fpos);
code = fgetpos64(f, &fpos);
-#else
+#
else
code = fgetpos(f, &fpos);
code = fgetpos(f, &fpos);
-#endif
+#
endif
sv_setpvn(pos, (char *) &fpos, sizeof(fpos));
return code;
}
sv_setpvn(pos, (char *) &fpos, sizeof(fpos));
return code;
}