summaryrefslogtreecommitdiff
path: root/doio.c
diff options
context:
space:
mode:
authorTony Cook <tony@develop-help.com>2017-12-01 14:36:52 +1100
committerTony Cook <tony@develop-help.com>2017-12-01 14:37:18 +1100
commit3c67ad9b9e6d659feb76f3acfc9f81cfe59e3660 (patch)
treebf4f7ea811cfb646585a60f8d75bdd2605a9e004 /doio.c
parent7b9d2ba3d09352167d77ea97c7857509f147ef49 (diff)
downloadperl-3c67ad9b9e6d659feb76f3acfc9f81cfe59e3660.tar.gz
(perl #132506) finish the correction to dir_unchanged()
and adjust the error message for renaming the work file
Diffstat (limited to 'doio.c')
-rw-r--r--doio.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/doio.c b/doio.c
index 9f76c10ea4..9b713e1507 100644
--- a/doio.c
+++ b/doio.c
@@ -1266,7 +1266,7 @@ S_dir_unchanged(pTHX_ const char *orig_pv, MAGIC *mg) {
*/
if (!PERL_FILE_IS_ABSOLUTE(orig_pv)
&& PerlLIO_stat(SvPVX(*temp_psv), &statbuf) < 0) {
- Perl_croak(aTHX_ "Cannot complete in-place edit of %" SVf ": %s",
+ Perl_croak(aTHX_ "Cannot complete in-place edit of %s: %s",
orig_pv,
"Work file is missing - did you change directory?");
}
@@ -1443,8 +1443,9 @@ Perl_do_close(pTHX_ GV *gv, bool not_implicit)
#else
UNLINK(SvPVX(*temp_psv));
#endif
- Perl_croak(aTHX_ "Can't rename in-place work file '%s' to '%s': %s\n",
- SvPVX(*temp_psv), SvPVX(*orig_psv), Strerror(errno));
+ /* diag_listed_as: Cannot complete in-place edit of %s: %s */
+ Perl_croak(aTHX_ "Cannot complete in-place edit of %s: failed to rename work file '%s' to '%s': %s",
+ orig_pv, SvPVX(*temp_psv), orig_pv, Strerror(errno));
}
abort_inplace:
UNLINK(SvPVX_const(*temp_psv));