Integrate:

[ 18280]
Integrate from the maint-5.8/ branch :
changes 18219, 18236, 18242-3, 18247-8,
18253-5, 18257, 18273-6

[ 18740]
Re: -Os for Darwin why?
From: schwern@pobox.com
Date: tis feb 18, 2003  04:14:03 Europe/Stockholm
Message-Id: <20030217191403.A17553@ttul.org>

[ 18737]
Subject: [PATCH] Re: [perl #21261] B::Terse not outputting correct constants or variable names
From: Stephen McCamant <smcc@mit.edu>
Date: Mon, 17 Feb 2003 19:34:36 -0500
Date: Mon, 17 Feb 2003 19:34:36 -0500
Message-ID: <15953.32668.277063.470885@syllepsis.MIT.EDU>

[ 18723]
Subject: Re: [perl #20798] foo(eval {}) crashes Perl 5.8
From: Enache Adrian <enache@rdslink.ro>
Date: Sun, 16 Feb 2003 00:05:10 +0200
Message-ID: <20030215220510.GB893@ratsnest.hole>

[ 18722]
outdent else-if chain in scope()

[ 18721]
Subject: [PATCH] arcane tainting bug in vms.c
From: "Craig A. Berry" <craigberry@mac.com>
Date: Sat, 15 Feb 2003 12:29:03 -0600
Message-ID: <3E4E86EF.8090609@mac.com>

[ 18720]
restrict PERL_PRESERVE_IVUV to things that should really give an
integer, but extend to runtime. Based on:
Subject: Re: [perl #20827] Unexpected scientific notation.
From: hv@crypt.org
Date: Wed, 12 Feb 2003 03:12:43 +0000
Message-Id: <200302120312.h1C3ChS02613@crypt.compulink.co.uk>

[ 18708]
Subject: Re: [perl #20912] UTF8 related glitch + fix
From: Enache Adrian <enache@rdslink.ro>
Date: Sat, 15 Feb 2003 00:37:40 +0200
Message-ID: <20030214223740.GA13575@ratsnest.hole>

[ 18707]
Subject: [doc patch] ext/threads/shared/shared.pm
From: Stas Bekman <stas@stason.org>
Date: Fri, 14 Feb 2003 11:12:39 +1100
Message-ID: <3E4C3477.7030306@stason.org>

[ 18706]
Subject: Re: perlvar phrasing clarification for $^S
From: "Iain 'Spoon' Truskett" <perl@dellah.anu.edu.au>
Date: Fri, 14 Feb 2003 10:12:00 +1100
Message-ID: <20030213231200.GE16300@ouroboros.anu.edu.au>

[ 18705]
Subject: Re: [perl #20933] \substr reuses lvalues (sometimes)
From: Dave Mitchell <davem@fdgroup.com>
Date: Fri, 14 Feb 2003 22:48:27 +0000
Message-ID: <20030214224827.B6783@fdgroup.com>

with tests:
From: Slaven Rezic <slaven@rezic.de>
Date: 14 Feb 2003 20:23:20 +0100
Message-ID: <87bs1e4qfr.fsf@vran.herceg.de>

[ 18704]
Subject: Re: overriding builtins quirk
From: Jerrad Pierce <belg4mit@MIT.EDU>
Date: Fri, 14 Feb 2003 09:28:13 -0500
Message-Id: <200302141428.JAA25752@cathedral-seven.mit.edu>

[ 18703]
Subject: Re: trying to fix #20154, #20357
From: Enache Adrian <enache@rdslink.ro>
Date: Sat, 8 Feb 2003 21:05:14 +0200
Message-ID: <20030208190514.GA866@ratsnest.hole>
(fixes #19061 as well)
p4raw-link: @18740 on //depot/perl: 14c260282869b514252d84245cb9a2c34eb7d421
p4raw-link: @18737 on //depot/perl: 31b49ad407e88940fdaef710e5f6a42665a067d8
p4raw-link: @18723 on //depot/perl: 4927db4444d4255bf5c9a54ba1d153bb533bd274
p4raw-link: @18722 on //depot/perl: fdb2241864c257e44490544064b09a293414e55f
p4raw-link: @18721 on //depot/perl: ec618cdf8cd188a382b8a5ab7751b8c7e9ef80c2
p4raw-link: @18720 on //depot/perl: 52a96ae66a5b0cd12cd52516c48cc6bf774e2038
p4raw-link: @18708 on //depot/perl: 3b0d546b549c81b8fd7281af083002e289e306d6
p4raw-link: @18707 on //depot/perl: 72ac79b36fc2613b9b03b8424fe60fdaa5759b16
p4raw-link: @18706 on //depot/perl: fa05a9fd14fa1e936b4708399d5cb3873024a775
p4raw-link: @18705 on //depot/perl: 24aef97f7fec4668a5731fc6d5179ebebd43f183
p4raw-link: @18704 on //depot/perl: 163e3a99f83605ff107fb86a86c7dd9dc9dece8f
p4raw-link: @18703 on //depot/perl: 33d34e4c563f3e0b3627fb43d2e2a2ef278a273a
p4raw-link: @18280 on //depot/perl: 3a2263fe90d1c0e6c8f9368f10e6672379a975a2

p4raw-id: //depot/maint-5.8/perl@18744
p4raw-integrated: from //depot/perl@18743 'copy in' t/op/substr.t
	(@9270..) t/op/goto.t (@10643..) ext/B/B/Terse.pm (@13034..)
	ext/B/B/Bblock.pm (@13697..) t/op/vec.t (@14887..)
	ext/B/t/terse.t (@16882..) pod/perlsub.pod (@17220..)
	ext/threads/shared/shared.pm (@17810..) t/op/lc.t (@18266..)
	t/op/split.t (@18280..) 'edit in' pp.c (@18708..) 'merge in'
	vms/vms.c (@18030..) ext/B/B.xs (@18220..) hints/darwin.sh
	(@18406..) ext/B/B/Concise.pm (@18694..)
p4raw-integrated: from //depot/perl@18723 'edit in' op.c (@18722..)
p4raw-integrated: from //depot/perl@18706 'merge in' pod/perlvar.pod
	(@18490..)
p4raw-integrated: from //depot/perl@18703 'merge in' pp_ctl.c
	(@18688..)

1 files changed, 10 insertions, 6 deletions

diff --git a/vms/vms.c b/vms/vms.c
index 27880dd101..a975608e6e 100644
--- a/vms/vms.c
+++ b/vms/vms.c
@@ -4479,15 +4479,19 @@ vms_image_init(int *argcp, char ***argvp)
    * hasn't been allocated when vms_image_init() is called.
    */
   if (will_taint) {
-    char ***newap;
-    New(1320,newap,*argcp+2,char **);
-    newap[0] = argvp[0];
-    *newap[1] = "-T";
-    Copy(argvp[1],newap[2],*argcp-1,char **);
+    char **newargv, **oldargv;
+    oldargv = *argvp;
+    New(1320,newargv,(*argcp)+2,char *);
+    newargv[0] = oldargv[0];
+    New(1320,newargv[1],3,char);
+    strcpy(newargv[1], "-T");
+    Copy(&oldargv[1],&newargv[2],(*argcp)-1,char **);
+    (*argcp)++;
+    newargv[*argcp] = NULL;
     /* We orphan the old argv, since we don't know where it's come from,
      * so we don't know how to free it.
      */
-    *argcp++; argvp = newap;
+    *argvp = newargv;
   }
   else {  /* Did user explicitly request tainting? */
     int i;