Integrate mainline @ 18:15 CST 31 Oct 1997

p4raw-id: //depot/ansiperl@199

diff --cc doop.c
index 5042e3c,0be09ac..93b618c
--- 1/doop.c
--- 2/doop.c
+++ b/doop.c
@@@ -242,8 -254,10 +242,9 @@@ do_chop(register SV *astr, register SV 
  } 
  
  I32
 -do_chomp(sv)
 -register SV *sv;
 +do_chomp(register SV *sv)
  {
+     dTHR;
      register I32 count;
      STRLEN len;
      char *s;
@@@ -315,8 -329,13 +316,9 @@@
  } 
  
  void
 -do_vop(optype,sv,left,right)
 -I32 optype;
 -SV *sv;
 -SV *left;
 -SV *right;
 +do_vop(I32 optype, SV *sv, SV *left, SV *right)
  {
+     dTHR;     /* just for taint */
  #ifdef LIBERAL
      register long *dl;
      register long *ll;

diff --cc embed.h
Simple merge

diff --cc ext/Thread/Thread.xs
Simple merge

diff --cc global.sym
Simple merge

diff --cc gv.c
Simple merge

diff --cc hv.c
Simple merge

diff --cc mg.c
index ea46b68,47e05a1..0699b47
--- 1/mg.c
--- 2/mg.c
+++ b/mg.c
@@@ -245,8 -260,11 +245,9 @@@ mg_free(SV *sv
  #endif
  
  U32
 -magic_len(sv, mg)
 -SV *sv;
 -MAGIC *mg;
 +magic_len(SV *sv, MAGIC *mg)
  {
+     dTHR;
      register I32 paren;
      register char *s;
      register I32 i;
@@@ -308,8 -326,11 +309,9 @@@
  }
  
  int
 -magic_get(sv, mg)
 -SV *sv;
 -MAGIC *mg;
 +magic_get(SV *sv, MAGIC *mg)
  {
+     dTHR;
      register I32 paren;
      register char *s;
      register I32 i;
@@@ -1100,8 -1183,11 +1110,9 @@@ magic_setsubstr(SV *sv, MAGIC *mg
  }
  
  int
 -magic_gettaint(sv,mg)
 -SV* sv;
 -MAGIC* mg;
 +magic_gettaint(SV *sv, MAGIC *mg)
  {
+     dTHR;
      TAINT_IF((mg->mg_len & 1) ||
             (mg->mg_len & 2) && mg->mg_obj == sv);     /* kludge */
      return 0;

diff --cc op.c
Simple merge

diff --cc perl.c
index a7ff240,17403fb..0500164
--- 1/perl.c
--- 2/perl.c
+++ b/perl.c
@@@ -104,11 -104,15 +104,14 @@@ perl_alloc(void
  }
  
  void
 -perl_construct( sv_interp )
 -register PerlInterpreter *sv_interp;
 +perl_construct(register PerlInterpreter *sv_interp)
  {
- #if defined(USE_THREADS) && !defined(FAKE_THREADS)
+ #ifdef USE_THREADS
+     int i;
+ #ifndef FAKE_THREADS
      struct thread *thr;
- #endif
+ #endif /* FAKE_THREADS */
+ #endif /* USE_THREADS */
      
      if (!(curinterp = sv_interp))
        return;
@@@ -2556,8 -2580,12 +2552,9 @@@ init_predump_symbols(void
  }
  
  static void
 -init_postdump_symbols(argc,argv,env)
 -register int argc;
 -register char **argv;
 -register char **env;
 +init_postdump_symbols(register int argc, register char **argv, register char **env)
  {
+     dTHR;
      char *s;
      SV *sv;
      GV* tmpgv;

diff --cc perl.h
Simple merge

diff --cc pp.c
Simple merge

diff --cc pp_ctl.c
Simple merge

diff --cc pp_sys.c
Simple merge

diff --cc sv.c
index 02ea7ca,13bad80..bcb87c2
--- 1/sv.c
--- 2/sv.c
+++ b/sv.c
@@@ -1082,8 -1101,11 +1082,9 @@@ sv_grow(SV* sv, unsigned long newlen
  }
  
  void
 -sv_setiv(sv,i)
 -register SV *sv;
 -IV i;
 +sv_setiv(register SV *sv, IV i)
  {
+     dTHR;     /* just for taint */
      sv_check_thinkfirst(sv);
      switch (SvTYPE(sv)) {
      case SVt_NULL:
@@@ -1129,8 -1153,11 +1130,9 @@@ sv_setuv(register SV *sv, UV u
  }
  
  void
 -sv_setnv(sv,num)
 -register SV *sv;
 -double num;
 +sv_setnv(register SV *sv, double num)
  {
+     dTHR;     /* just for taint */
      sv_check_thinkfirst(sv);
      switch (SvTYPE(sv)) {
      case SVt_NULL:
@@@ -2144,8 -2183,12 +2146,9 @@@ sv_setsv(SV *dstr, register SV *sstr
  }
  
  void
 -sv_setpvn(sv,ptr,len)
 -register SV *sv;
 -register const char *ptr;
 -register STRLEN len;
 +sv_setpvn(register SV *sv, register const char *ptr, register STRLEN len)
  {
+     dTHR;     /* just for taint */
      assert(len >= 0);  /* STRLEN is probably unsigned, so this may
                          elicit a warning, but it won't hurt. */
      sv_check_thinkfirst(sv);
@@@ -2168,8 -2211,11 +2171,9 @@@
  }
  
  void
 -sv_setpv(sv,ptr)
 -register SV *sv;
 -register const char *ptr;
 +sv_setpv(register SV *sv, register const char *ptr)
  {
+     dTHR;     /* just for taint */
      register STRLEN len;
  
      sv_check_thinkfirst(sv);
@@@ -2192,8 -2238,12 +2196,9 @@@
  }
  
  void
 -sv_usepvn(sv,ptr,len)
 -register SV *sv;
 -register char *ptr;
 -register STRLEN len;
 +sv_usepvn(register SV *sv, register char *ptr, register STRLEN len)
  {
+     dTHR;     /* just for taint */
      sv_check_thinkfirst(sv);
      if (!SvUPGRADE(sv, SVt_PV))
        return;
@@@ -2252,8 -2303,12 +2257,9 @@@ sv_chop(register SV *sv, register char 
  }
  
  void
 -sv_catpvn(sv,ptr,len)
 -register SV *sv;
 -register char *ptr;
 -register STRLEN len;
 +sv_catpvn(register SV *sv, register char *ptr, register STRLEN len)
  {
+     dTHR;     /* just for taint */
      STRLEN tlen;
      char *junk;
  
@@@ -2280,8 -2337,11 +2286,9 @@@ sv_catsv(SV *dstr, register SV *sstr
  }
  
  void
 -sv_catpv(sv,ptr)
 -register SV *sv;
 -register char *ptr;
 +sv_catpv(register SV *sv, register char *ptr)
  {
+     dTHR;     /* just for taint */
      register STRLEN len;
      STRLEN tlen;
      char *junk;
@@@ -2976,8 -3062,12 +2983,9 @@@ sv_collxfrm(SV *sv, STRLEN *nxp
  #endif /* USE_LOCALE_COLLATE */
  
  char *
 -sv_gets(sv,fp,append)
 -register SV *sv;
 -register PerlIO *fp;
 -I32 append;
 +sv_gets(register SV *sv, register FILE *fp, I32 append)
  {
+     dTHR;
      char *rsptr;
      STRLEN rslen;
      register STDCHAR rslast;

diff --cc taint.c
index c8c6800,af943e0..2dc43a4
--- 1/taint.c
--- 2/taint.c
+++ b/taint.c
@@@ -8,8 -8,11 +8,9 @@@
  #include "perl.h"
  
  void
 -taint_proper(f, s)
 -const char *f;
 -char *s;
 +taint_proper(const char *f, char *s)
  {
+     dTHR;     /* just for taint */
      char *ug;
  
      DEBUG_u(PerlIO_printf(Perl_debug_log,

diff --cc thread.h
Simple merge

diff --cc toke.c
Simple merge

diff --cc util.c
Simple merge