From d5eaec228240ca8b0e978d5ff4742f6feadef98e Mon Sep 17 00:00:00 2001 From: "Craig A. Berry" Date: Sat, 24 Nov 2012 19:06:45 -0600 Subject: [PATCH] Clarify reporting of .DIR extension on VMS. In readdir and start_glob, we were removing the .DIR extension from VMS directory names when reporting results in Unix format, but also when Extended Filename Syntax (EFS) was enabled. The former makes sense, but the latter (by itself) doesn't. --- vms/vms.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vms/vms.c b/vms/vms.c index 3b9b032..15f350b 100644 --- a/vms/vms.c +++ b/vms/vms.c @@ -10153,7 +10153,7 @@ Perl_readdir(pTHX_ DIR *dd) /* In Unix report mode, remove the ".dir;1" from the name */ /* if it is a real directory. */ - if (decc_filename_unix_report || decc_efs_charset) { + if (decc_filename_unix_report && decc_efs_charset) { if (is_dir_ext(e_spec, e_len, vs_spec, vs_len)) { Stat_t statbuf; int ret_sts; @@ -13181,7 +13181,7 @@ Perl_vms_start_glob /* In Unix report mode, remove the ".dir;1" from the name */ /* if it is a real directory */ - if (decc_filename_unix_report || decc_efs_charset) { + if (decc_filename_unix_report && decc_efs_charset) { if (is_dir_ext(e_spec, e_len, vs_spec, vs_len)) { Stat_t statbuf; int ret_sts; -- 2.7.4