Integrate:

[ 23071]
Subject: [PATCH] prime_env_iter and zero-length values on VMS
From: "Craig A. Berry" <craigberry@mac.com>
Message-ID: <40EE1CB9.8030407@mac.com>
p4raw-link: @23071 on //depot/perl: ff79d39dc75833c4d7014282008680632389529f

p4raw-id: //depot/maint-5.8/perl@23110
p4raw-integrated: from //depot/perl@23087 'merge in' vms/vms.c
	(@22544..)

1 files changed, 15 insertions, 1 deletions

diff --git a/vms/vms.c b/vms/vms.c
index b11e7e6d47..3f9df66e5f 100644
--- a/vms/vms.c
+++ b/vms/vms.c
@@ -695,7 +695,21 @@ prime_env_iter(void)
         continue;
       }
       PERL_HASH(hash,key,keylen);
-      sv = newSVpvn(cp2,cp1 - cp2 + 1);
+
+      if (cp1 == cp2 && *cp2 == '.') {
+        /* A single dot usually means an unprintable character, such as a null
+         * to indicate a zero-length value.  Get the actual value to make sure.
+         */
+        char lnm[LNM$C_NAMLENGTH+1];
+        char eqv[LNM$C_NAMLENGTH+1];
+        strncpy(lnm, key, keylen);
+        int trnlen = vmstrnenv(lnm, eqv, 0, fildev, 0);
+        sv = newSVpvn(eqv, strlen(eqv));
+      }
+      else {
+        sv = newSVpvn(cp2,cp1 - cp2 + 1);
+      }
+
       SvTAINTED_on(sv);
       hv_store(envhv,key,keylen,sv,hash);
       hv_store(seenhv,key,keylen,&PL_sv_yes,hash);