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
More symbol scan logic from Alan Burlison.
[perl5.git]
/
doio.c
diff --git
a/doio.c
b/doio.c
index
1495ff5
..
1135a62
100644
(file)
--- a/
doio.c
+++ b/
doio.c
@@
-1,6
+1,7
@@
/* doio.c
*
/* doio.c
*
- * Copyright (c) 1991-2002, Larry Wall
+ * Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ * 2000, 2001, 2002, 2003, by Larry Wall and others
*
* You may distribute under the terms of either the GNU General Public
* License or the Artistic License, as specified in the README file.
*
* You may distribute under the terms of either the GNU General Public
* License or the Artistic License, as specified in the README file.
@@
-213,6
+214,15
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
if (num_svs) {
/* New style explict name, type is just mode and discipline/layer info */
STRLEN l = 0;
if (num_svs) {
/* New style explict name, type is just mode and discipline/layer info */
STRLEN l = 0;
+#ifdef USE_STDIO
+ if (SvROK(*svp) && !strchr(name,'&')) {
+ if (ckWARN(WARN_IO))
+ Perl_warner(aTHX_ packWARN(WARN_IO),
+ "Can't open a reference");
+ SETERRNO(EINVAL, LIB_INVARG);
+ goto say_false;
+ }
+#endif /* USE_STDIO */
name = SvOK(*svp) ? SvPV(*svp, l) : "";
len = (I32)l;
name = savepvn(name, len);
name = SvOK(*svp) ? SvPV(*svp, l) : "";
len = (I32)l;
name = savepvn(name, len);
@@
-272,6
+282,13
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
else {
fp = PerlProc_popen(name,mode);
}
else {
fp = PerlProc_popen(name,mode);
}
+ if (num_svs) {
+ if (*type) {
+ if (PerlIO_apply_layers(aTHX_ fp, mode, type) != 0) {
+ goto say_false;
+ }
+ }
+ }
}
else if (*type == IoTYPE_WRONLY) {
TAINT_PROPER("open");
}
else if (*type == IoTYPE_WRONLY) {
TAINT_PROPER("open");
@@
-307,12
+324,13
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
if (num_svs > 1) {
Perl_croak(aTHX_ "More than one argument to '%c&' open",IoTYPE(io));
}
if (num_svs > 1) {
Perl_croak(aTHX_ "More than one argument to '%c&' open",IoTYPE(io));
}
- if (num_svs && SvIOK(*svp)) {
+ /*SUPPRESS 530*/
+ for (; isSPACE(*type); type++) ;
+ if (num_svs && (SvIOK(*svp) || (SvPOK(*svp) && looks_like_number(*svp)))) {
fd = SvUV(*svp);
fd = SvUV(*svp);
+ num_svs = 0;
}
else if (isDIGIT(*type)) {
}
else if (isDIGIT(*type)) {
- /*SUPPRESS 530*/
- for (; isSPACE(*type); type++) ;
fd = atoi(type);
}
else {
fd = atoi(type);
}
else {
@@
-322,14
+340,12
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
}
else {
GV *thatgv;
}
else {
GV *thatgv;
- /*SUPPRESS 530*/
- for (; isSPACE(*type); type++) ;
thatgv = gv_fetchpv(type,FALSE,SVt_PVIO);
thatio = GvIO(thatgv);
}
if (!thatio) {
#ifdef EINVAL
thatgv = gv_fetchpv(type,FALSE,SVt_PVIO);
thatio = GvIO(thatgv);
}
if (!thatio) {
#ifdef EINVAL
- SETERRNO(EINVAL,SS
$
_IVCHAN);
+ SETERRNO(EINVAL,SS_IVCHAN);
#endif
goto say_false;
}
#endif
goto say_false;
}
@@
-474,6
+490,14
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
fp = PerlProc_popen(name,mode);
}
IoTYPE(io) = IoTYPE_PIPE;
fp = PerlProc_popen(name,mode);
}
IoTYPE(io) = IoTYPE_PIPE;
+ if (num_svs) {
+ for (; isSPACE(*type); type++) ;
+ if (*type) {
+ if (PerlIO_apply_layers(aTHX_ fp, mode, type) != 0) {
+ goto say_false;
+ }
+ }
+ }
}
else {
if (num_svs)
}
else {
if (num_svs)
@@
-512,18
+536,20
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
if ((IoTYPE(io) == IoTYPE_RDONLY) &&
(fp == PerlIO_stdout() || fp == PerlIO_stderr())) {
Perl_warner(aTHX_ packWARN(WARN_IO),
if ((IoTYPE(io) == IoTYPE_RDONLY) &&
(fp == PerlIO_stdout() || fp == PerlIO_stderr())) {
Perl_warner(aTHX_ packWARN(WARN_IO),
- "Filehandle STD%s opened only for input",
- (fp == PerlIO_stdout()) ? "OUT" : "ERR");
+ "Filehandle STD%s reopened as %s only for input",
+ ((fp == PerlIO_stdout()) ? "OUT" : "ERR"),
+ GvENAME(gv));
}
else if ((IoTYPE(io) == IoTYPE_WRONLY) && fp == PerlIO_stdin()) {
Perl_warner(aTHX_ packWARN(WARN_IO),
}
else if ((IoTYPE(io) == IoTYPE_WRONLY) && fp == PerlIO_stdin()) {
Perl_warner(aTHX_ packWARN(WARN_IO),
- "Filehandle STDIN opened only for output");
+ "Filehandle STDIN reopened as %s only for output",
+ GvENAME(gv));
}
}
fd = PerlIO_fileno(fp);
}
}
fd = PerlIO_fileno(fp);
- /* If there is no fd (e.g. PerlIO::
S
calar) assume it isn't a
- * socket - this covers PerlIO::
S
calar - otherwise unless we "know" the
+ /* If there is no fd (e.g. PerlIO::
s
calar) assume it isn't a
+ * socket - this covers PerlIO::
s
calar - otherwise unless we "know" the
* type probe for socket-ness.
*/
if (IoTYPE(io) && IoTYPE(io) != IoTYPE_PIPE && IoTYPE(io) != IoTYPE_STD && fd >= 0) {
* type probe for socket-ness.
*/
if (IoTYPE(io) && IoTYPE(io) != IoTYPE_PIPE && IoTYPE(io) != IoTYPE_STD && fd >= 0) {
@@
-572,7
+598,7
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
}
}
if (savefd != fd) {
}
}
if (savefd != fd) {
- /* Still a small can-of-worms here if (say) PerlIO::
S
calar
+ /* Still a small can-of-worms here if (say) PerlIO::
s
calar
is assigned to (say) STDOUT - for now let dup2() fail
and provide the error
*/
is assigned to (say) STDOUT - for now let dup2() fail
and provide the error
*/
@@
-615,8
+641,16
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
/* need to close fp without closing underlying fd */
int ofd = PerlIO_fileno(fp);
int dupfd = PerlLIO_dup(ofd);
/* need to close fp without closing underlying fd */
int ofd = PerlIO_fileno(fp);
int dupfd = PerlLIO_dup(ofd);
+#if defined(HAS_FCNTL) && defined(F_SETFD)
+ /* Assume if we have F_SETFD we have F_GETFD */
+ int coe = fcntl(ofd,F_GETFD);
+#endif
PerlIO_close(fp);
PerlLIO_dup2(dupfd,ofd);
PerlIO_close(fp);
PerlLIO_dup2(dupfd,ofd);
+#if defined(HAS_FCNTL) && defined(F_SETFD)
+ /* The dup trick has lost close-on-exec on ofd */
+ fcntl(ofd,F_SETFD, coe);
+#endif
PerlLIO_close(dupfd);
}
else
PerlLIO_close(dupfd);
}
else
@@
-639,8
+673,11
@@
Perl_do_openn(pTHX_ GV *gv, register char *name, I32 len, int as_raw,
if (writing) {
if (IoTYPE(io) == IoTYPE_SOCKET
|| (IoTYPE(io) == IoTYPE_WRONLY && fd >= 0 && S_ISCHR(PL_statbuf.st_mode)) ) {
if (writing) {
if (IoTYPE(io) == IoTYPE_SOCKET
|| (IoTYPE(io) == IoTYPE_WRONLY && fd >= 0 && S_ISCHR(PL_statbuf.st_mode)) ) {
- mode[0] = 'w';
- if (!(IoOFP(io) = PerlIO_openn(aTHX_ type,mode,fd,0,0,NULL,0,svp))) {
+ char *s = mode;
+ if (*s == 'I' || *s == '#')
+ s++;
+ *s = 'w';
+ if (!(IoOFP(io) = PerlIO_openn(aTHX_ type,s,fd,0,0,NULL,0,svp))) {
PerlIO_close(fp);
IoIFP(io) = Nullfp;
goto say_false;
PerlIO_close(fp);
IoIFP(io) = Nullfp;
goto say_false;
@@
-689,6
+726,8
@@
Perl_nextargv(pTHX_ register GV *gv)
#endif
}
PL_filemode = 0;
#endif
}
PL_filemode = 0;
+ if (!GvAV(gv))
+ return Nullfp;
while (av_len(GvAV(gv)) >= 0) {
STRLEN oldlen;
sv = av_shift(GvAV(gv));
while (av_len(GvAV(gv)) >= 0) {
STRLEN oldlen;
sv = av_shift(GvAV(gv));
@@
-745,8
+784,8
@@
Perl_nextargv(pTHX_ register GV *gv)
{
if (ckWARN_d(WARN_INPLACE))
Perl_warner(aTHX_ packWARN(WARN_INPLACE),
{
if (ckWARN_d(WARN_INPLACE))
Perl_warner(aTHX_ packWARN(WARN_INPLACE),
- "Can't do inplace edit: %
s
would not be unique",
-
SvPVX(sv)
);
+ "Can't do inplace edit: %
"SVf"
would not be unique",
+
sv
);
do_close(gv,FALSE);
continue;
}
do_close(gv,FALSE);
continue;
}
@@
-756,8
+795,8
@@
Perl_nextargv(pTHX_ register GV *gv)
if (PerlLIO_rename(PL_oldname,SvPVX(sv)) < 0) {
if (ckWARN_d(WARN_INPLACE))
Perl_warner(aTHX_ packWARN(WARN_INPLACE),
if (PerlLIO_rename(PL_oldname,SvPVX(sv)) < 0) {
if (ckWARN_d(WARN_INPLACE))
Perl_warner(aTHX_ packWARN(WARN_INPLACE),
- "Can't rename %s to %
s
: %s, skipping file",
- PL_oldname,
SvPVX(sv)
, Strerror(errno) );
+ "Can't rename %s to %
"SVf"
: %s, skipping file",
+ PL_oldname,
sv
, Strerror(errno) );
do_close(gv,FALSE);
continue;
}
do_close(gv,FALSE);
continue;
}
@@
-772,8
+811,8
@@
Perl_nextargv(pTHX_ register GV *gv)
if (link(PL_oldname,SvPVX(sv)) < 0) {
if (ckWARN_d(WARN_INPLACE))
Perl_warner(aTHX_ packWARN(WARN_INPLACE),
if (link(PL_oldname,SvPVX(sv)) < 0) {
if (ckWARN_d(WARN_INPLACE))
Perl_warner(aTHX_ packWARN(WARN_INPLACE),
- "Can't rename %s to %
s
: %s, skipping file",
- PL_oldname,
SvPVX(sv)
, Strerror(errno) );
+ "Can't rename %s to %
"SVf"
: %s, skipping file",
+ PL_oldname,
sv
, Strerror(errno) );
do_close(gv,FALSE);
continue;
}
do_close(gv,FALSE);
continue;
}
@@
-893,8
+932,9
@@
Perl_do_pipe(pTHX_ SV *sv, GV *rgv, GV *wgv)
if (PerlProc_pipe(fd) < 0)
goto badexit;
if (PerlProc_pipe(fd) < 0)
goto badexit;
- IoIFP(rstio) = PerlIO_fdopen(fd[0], "r");
- IoOFP(wstio) = PerlIO_fdopen(fd[1], "w");
+ IoIFP(rstio) = PerlIO_fdopen(fd[0], "r"PIPESOCK_MODE);
+ IoOFP(wstio) = PerlIO_fdopen(fd[1], "w"PIPESOCK_MODE);
+ IoOFP(rstio) = IoIFP(rstio);
IoIFP(wstio) = IoOFP(wstio);
IoTYPE(rstio) = IoTYPE_RDONLY;
IoTYPE(wstio) = IoTYPE_WRONLY;
IoIFP(wstio) = IoOFP(wstio);
IoTYPE(rstio) = IoTYPE_RDONLY;
IoTYPE(wstio) = IoTYPE_WRONLY;
@@
-926,7
+966,7
@@
Perl_do_close(pTHX_ GV *gv, bool not_implicit)
gv = PL_argvgv;
if (!gv || SvTYPE(gv) != SVt_PVGV) {
if (not_implicit)
gv = PL_argvgv;
if (!gv || SvTYPE(gv) != SVt_PVGV) {
if (not_implicit)
- SETERRNO(EBADF,SS
$
_IVCHAN);
+ SETERRNO(EBADF,SS_IVCHAN);
return FALSE;
}
io = GvIO(gv);
return FALSE;
}
io = GvIO(gv);
@@
-934,7
+974,7
@@
Perl_do_close(pTHX_ GV *gv, bool not_implicit)
if (not_implicit) {
if (ckWARN(WARN_UNOPENED)) /* no check for closed here */
report_evil_fh(gv, io, PL_op->op_type);
if (not_implicit) {
if (ckWARN(WARN_UNOPENED)) /* no check for closed here */
report_evil_fh(gv, io, PL_op->op_type);
- SETERRNO(EBADF,SS
$
_IVCHAN);
+ SETERRNO(EBADF,SS_IVCHAN);
}
return FALSE;
}
}
return FALSE;
}
@@
-978,7
+1018,7
@@
Perl_io_close(pTHX_ IO *io, bool not_implicit)
IoOFP(io) = IoIFP(io) = Nullfp;
}
else if (not_implicit) {
IoOFP(io) = IoIFP(io) = Nullfp;
}
else if (not_implicit) {
- SETERRNO(EBADF,SS
$
_IVCHAN);
+ SETERRNO(EBADF,SS_IVCHAN);
}
return retval;
}
return retval;
@@
-998,17
+1038,21
@@
Perl_do_eof(pTHX_ GV *gv)
report_evil_fh(gv, io, OP_phoney_OUTPUT_ONLY);
while (IoIFP(io)) {
report_evil_fh(gv, io, OP_phoney_OUTPUT_ONLY);
while (IoIFP(io)) {
+ int saverrno;
if (PerlIO_has_cntptr(IoIFP(io))) { /* (the code works without this) */
if (PerlIO_get_cnt(IoIFP(io)) > 0) /* cheat a little, since */
return FALSE; /* this is the most usual case */
}
if (PerlIO_has_cntptr(IoIFP(io))) { /* (the code works without this) */
if (PerlIO_get_cnt(IoIFP(io)) > 0) /* cheat a little, since */
return FALSE; /* this is the most usual case */
}
+ saverrno = errno; /* getc and ungetc can stomp on errno */
ch = PerlIO_getc(IoIFP(io));
if (ch != EOF) {
(void)PerlIO_ungetc(IoIFP(io),ch);
ch = PerlIO_getc(IoIFP(io));
if (ch != EOF) {
(void)PerlIO_ungetc(IoIFP(io),ch);
+ errno = saverrno;
return FALSE;
}
return FALSE;
}
+ errno = saverrno;
if (PerlIO_has_cntptr(IoIFP(io)) && PerlIO_canset_cnt(IoIFP(io))) {
if (PerlIO_get_cnt(IoIFP(io)) < -1)
if (PerlIO_has_cntptr(IoIFP(io)) && PerlIO_canset_cnt(IoIFP(io))) {
if (PerlIO_get_cnt(IoIFP(io)) < -1)
@@
-1039,7
+1083,7
@@
Perl_do_tell(pTHX_ GV *gv)
}
if (ckWARN2(WARN_UNOPENED,WARN_CLOSED))
report_evil_fh(gv, io, PL_op->op_type);
}
if (ckWARN2(WARN_UNOPENED,WARN_CLOSED))
report_evil_fh(gv, io, PL_op->op_type);
- SETERRNO(EBADF,RMS
$
_IFI);
+ SETERRNO(EBADF,RMS_IFI);
return (Off_t)-1;
}
return (Off_t)-1;
}
@@
-1058,7
+1102,7
@@
Perl_do_seek(pTHX_ GV *gv, Off_t pos, int whence)
}
if (ckWARN2(WARN_UNOPENED,WARN_CLOSED))
report_evil_fh(gv, io, PL_op->op_type);
}
if (ckWARN2(WARN_UNOPENED,WARN_CLOSED))
report_evil_fh(gv, io, PL_op->op_type);
- SETERRNO(EBADF,RMS
$
_IFI);
+ SETERRNO(EBADF,RMS_IFI);
return FALSE;
}
return FALSE;
}
@@
-1072,7
+1116,7
@@
Perl_do_sysseek(pTHX_ GV *gv, Off_t pos, int whence)
return PerlLIO_lseek(PerlIO_fileno(fp), pos, whence);
if (ckWARN2(WARN_UNOPENED,WARN_CLOSED))
report_evil_fh(gv, io, PL_op->op_type);
return PerlLIO_lseek(PerlIO_fileno(fp), pos, whence);
if (ckWARN2(WARN_UNOPENED,WARN_CLOSED))
report_evil_fh(gv, io, PL_op->op_type);
- SETERRNO(EBADF,RMS
$
_IFI);
+ SETERRNO(EBADF,RMS_IFI);
return (Off_t)-1;
}
return (Off_t)-1;
}
@@
-1154,7
+1198,7
@@
I32 fd; /* file descriptor */
Off_t length; /* length to set file to */
{
struct flock fl;
Off_t length; /* length to set file to */
{
struct flock fl;
-
struct sta
t filebuf;
+
Stat_
t filebuf;
if (PerlLIO_fstat(fd, &filebuf) < 0)
return -1;
if (PerlLIO_fstat(fd, &filebuf) < 0)
return -1;
@@
-1237,7
+1281,8
@@
Perl_do_print(pTHX_ register SV *sv, PerlIO *fp)
default:
if (PerlIO_isutf8(fp)) {
if (!SvUTF8(sv))
default:
if (PerlIO_isutf8(fp)) {
if (!SvUTF8(sv))
- sv_utf8_upgrade(sv = sv_mortalcopy(sv));
+ sv_utf8_upgrade_flags(sv = sv_mortalcopy(sv),
+ SV_GMAGIC|SV_UTF8_NO_ENCODING);
}
else if (DO_UTF8(sv)) {
if (!sv_utf8_downgrade((sv = sv_mortalcopy(sv)), TRUE)
}
else if (DO_UTF8(sv)) {
if (!sv_utf8_downgrade((sv = sv_mortalcopy(sv)), TRUE)
@@
-1291,7
+1336,7
@@
Perl_my_stat(pTHX)
else {
SV* sv = POPs;
char *s;
else {
SV* sv = POPs;
char *s;
- STRLEN
n_a
;
+ STRLEN
len
;
PUTBACK;
if (SvTYPE(sv) == SVt_PVGV) {
gv = (GV*)sv;
PUTBACK;
if (SvTYPE(sv) == SVt_PVGV) {
gv = (GV*)sv;
@@
-1302,9
+1347,10
@@
Perl_my_stat(pTHX)
goto do_fstat;
}
goto do_fstat;
}
- s = SvPV(sv,
n_a
);
+ s = SvPV(sv,
len
);
PL_statgv = Nullgv;
PL_statgv = Nullgv;
- sv_setpv(PL_statname, s);
+ sv_setpvn(PL_statname, s, len);
+ s = SvPVX(PL_statname); /* s now NUL-terminated */
PL_laststype = OP_STAT;
PL_laststatval = PerlLIO_stat(s, &PL_statcache);
if (PL_laststatval < 0 && ckWARN(WARN_NEWLINE) && strchr(s, '\n'))
PL_laststype = OP_STAT;
PL_laststatval = PerlLIO_stat(s, &PL_statcache);
if (PL_laststatval < 0 && ckWARN(WARN_NEWLINE) && strchr(s, '\n'))
@@
-1611,10
+1657,10
@@
nothing in the core.
if (mark == sp)
break;
s = SvPVx(*++mark, n_a);
if (mark == sp)
break;
s = SvPVx(*++mark, n_a);
- if (is
UPPER
(*s)) {
+ if (is
ALPHA
(*s)) {
if (*s == 'S' && s[1] == 'I' && s[2] == 'G')
s += 3;
if (*s == 'S' && s[1] == 'I' && s[2] == 'G')
s += 3;
- if (
!(val = whichsig(s))
)
+ if (
(val = whichsig(s)) < 0
)
Perl_croak(aTHX_ "Unrecognized signal name \"%s\"",s);
}
else
Perl_croak(aTHX_ "Unrecognized signal name \"%s\"",s);
}
else
@@
-1714,22
+1760,23
@@
nothing in the core.
SV* modified = *++mark;
void * utbufp = &utbuf;
SV* modified = *++mark;
void * utbufp = &utbuf;
- /*
b
e like C, and if both times are undefined, let the C
-
library figure out what to do. This usually means
-
"current time"
*/
+ /*
B
e like C, and if both times are undefined, let the C
+
*
library figure out what to do. This usually means
+
* "current time".
*/
if ( accessed == &PL_sv_undef && modified == &PL_sv_undef )
if ( accessed == &PL_sv_undef && modified == &PL_sv_undef )
- utbufp = NULL;
-
- Zero(&utbuf, sizeof utbuf, char);
+
utbufp = NULL;
+ else {
+
Zero(&utbuf, sizeof utbuf, char);
#ifdef BIG_TIME
#ifdef BIG_TIME
-
utbuf.actime = (Time_t)SvNVx(accessed);
/* time accessed */
-
utbuf.modtime = (Time_t)SvNVx(modified);
/* time modified */
+
utbuf.actime = (Time_t)SvNVx(accessed);
/* time accessed */
+
utbuf.modtime = (Time_t)SvNVx(modified);
/* time modified */
#else
#else
-
utbuf.actime = (Time_t)SvIVx(accessed);
/* time accessed */
-
utbuf.modtime = (Time_t)SvIVx(modified);
/* time modified */
+
utbuf.actime = (Time_t)SvIVx(accessed);
/* time accessed */
+
utbuf.modtime = (Time_t)SvIVx(modified);
/* time modified */
#endif
#endif
- APPLY_TAINT_PROPER();
+ }
+ APPLY_TAINT_PROPER();
tot = sp - mark;
while (++mark <= sp) {
char *name = SvPVx(*mark, n_a);
tot = sp - mark;
while (++mark <= sp) {
char *name = SvPVx(*mark, n_a);
@@
-2061,7
+2108,7
@@
Perl_do_semop(pTHX_ SV **mark, SV **sp)
opbuf = SvPV(opstr, opsize);
if (opsize < 3 * SHORTSIZE
|| (opsize % (3 * SHORTSIZE))) {
opbuf = SvPV(opstr, opsize);
if (opsize < 3 * SHORTSIZE
|| (opsize % (3 * SHORTSIZE))) {
- SETERRNO(EINVAL,LIB
$
_INVARG);
+ SETERRNO(EINVAL,LIB_INVARG);
return -1;
}
SETERRNO(0,0);
return -1;
}
SETERRNO(0,0);
@@
-2118,7
+2165,7
@@
Perl_do_shmio(pTHX_ I32 optype, SV **mark, SV **sp)
if (shmctl(id, IPC_STAT, &shmds) == -1)
return -1;
if (mpos < 0 || msize < 0 || mpos + msize > shmds.shm_segsz) {
if (shmctl(id, IPC_STAT, &shmds) == -1)
return -1;
if (mpos < 0 || msize < 0 || mpos + msize > shmds.shm_segsz) {
- SETERRNO(EFAULT,SS
$_ACCVIO);
/* can't do as caller requested */
+ SETERRNO(EFAULT,SS
_ACCVIO);
/* can't do as caller requested */
return -1;
}
shm = (char *)shmat(id, (char*)NULL, (optype == OP_SHMREAD) ? SHM_RDONLY : 0);
return -1;
}
shm = (char *)shmat(id, (char*)NULL, (optype == OP_SHMREAD) ? SHM_RDONLY : 0);
@@
-2245,7
+2292,7
@@
Perl_start_glob (pTHX_ SV *tmpglob, IO *io)
}
if (cxt) (void)lib$find_file_end(&cxt);
if (ok && sts != RMS$_NMF &&
}
if (cxt) (void)lib$find_file_end(&cxt);
if (ok && sts != RMS$_NMF &&
- sts != RMS$_DNF && sts != RMS
$
_FNF) ok = 0;
+ sts != RMS$_DNF && sts != RMS_FNF) ok = 0;
if (!ok) {
if (!(sts & 1)) {
SETERRNO((sts == RMS$_SYN ? EINVAL : EVMSERR),sts);
if (!ok) {
if (!(sts & 1)) {
SETERRNO((sts == RMS$_SYN ? EINVAL : EVMSERR),sts);