From ad2d99e390e75f36bbfc104614c4b9e4c22fe450 Mon Sep 17 00:00:00 2001 From: Father Chrysostomos Date: Sat, 14 Jan 2012 00:23:23 -0800 Subject: -T "unreadable file" should set stat info consistently This was mentioned in ticket #77388. It turns out to be related to #4253. If the file cannot be opened, -T and -B on filenames set the last han- dle to null and set the last stat type to stat, but leave the actual stat buffer and success status as they were. That means that stat(_) will continue to return the previous buffer, but lstat(_) will no longer work. This is another of those inconsistent cases where the internal stat info is only partially set. Originally, this code would set PL_laststatval (the success status) to -1. Commit 25988e07 (the patch in ticket #4253) intentionally changed this to make -T _ less suprising on read-only files. But the patch ended up affecting -T with an explicit file name, too. It also only partially fixed things for -T _, because the last stat type *was* still being set. This commit changes it to set all the stat info, for explicit file names, or no stat info, for _ (if the previous stat was with a file name). --- pp_sys.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pp_sys.c') diff --git a/pp_sys.c b/pp_sys.c index 88e2f4e298..d748693aaf 100644 --- a/pp_sys.c +++ b/pp_sys.c @@ -3372,13 +3372,17 @@ PP(pp_fttext) sv_setpv(PL_statname, SvPV_nomg_const_nolen(sv)); really_filename: PL_statgv = NULL; - PL_laststype = OP_STAT; if (!(fp = PerlIO_open(SvPVX_const(PL_statname), "r"))) { + if (!gv) { + PL_laststatval = -1; + PL_laststype = OP_STAT; + } if (ckWARN(WARN_NEWLINE) && strchr(SvPV_nolen_const(PL_statname), '\n')) Perl_warner(aTHX_ packWARN(WARN_NEWLINE), PL_warn_nl, "open"); RETPUSHUNDEF; } + PL_laststype = OP_STAT; PL_laststatval = PerlLIO_fstat(PerlIO_fileno(fp), &PL_statcache); if (PL_laststatval < 0) { (void)PerlIO_close(fp); -- cgit v1.2.1