Date: Tue, 01 Dec 1998 00:07:33 +0100

Message-ID: <366921b5.14512598@smtp1.ibm.net>
Subject: Re: 5.005_03-MAINT-TRIAL1, [PATCH] to compile on Win32

From: jan.dubois@ibm.net (Jan Dubois)
Date: Wed, 02 Dec 1998 00:24:54 +0100
Message-ID: <366a77bb.19498126@smtp1.ibm.net>
Subject: Re: 5.005_03-MAINT-TRIAL1, [PATCH] spaces in filenames support

p4raw-id: //depot/maint-5.005/perl@2511

diff --git a/perl.h b/perl.h
index 9f17fd5..7d27840 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -250,7 +250,7 @@ register struct op *op asm(stringify(OP_IN_REGISTER));
 #define TAINT_NOT      (PL_tainted = FALSE)
 #define TAINT_IF(c)    if (c) { PL_tainted = TRUE; }
 #define TAINT_ENV()    if (PL_tainting) { taint_env(); }
-#define TAINT_PROPER(s)        if (PL_tainting) { taint_proper(no_security, s); }
+#define TAINT_PROPER(s)        if (PL_tainting) { taint_proper(Nullch, s); }
 
 /* XXX All process group stuff is handled in pp_sys.c.  Should these 
    defines move there?  If so, I could simplify this a lot. --AD  9/96.

diff --git a/proto.h b/proto.h
index 79aaa89..4545b55 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -687,7 +687,7 @@ void qsortsv _((SV ** array, size_t num_elts, SVCOMPARE f));
 I32 sortcv _((SV *a, SV *b));
 void save_magic _((MGS *mgs, SV *sv));
 int magic_methpack _((SV *sv, MAGIC *mg, char *meth));
-int magic_methcall _((MAGIC *mg, char *meth, I32 flags, int n, SV *val));
+int magic_methcall _((SV *sv, MAGIC *mg, char *meth, I32 flags, int n, SV *val));
 OP * doform _((CV *cv, GV *gv, OP *retop));
 void doencodes _((SV* sv, char* s, I32 len));
 SV* refto _((SV* sv));
@@ -758,7 +758,7 @@ OP *scalarboolean _((OP *o));
 OP *too_few_arguments _((OP *o, char* name));
 OP *too_many_arguments _((OP *o, char* name));
 void null _((OP* o));
-PADOFFSET pad_findlex _((char* name, PADOFFSET newoff, U32 seq, CV* startcv, I32 cx_ix));
+PADOFFSET pad_findlex _((char* name, PADOFFSET newoff, U32 seq, CV* startcv, I32 cx_ix, I32 saweval));
 OP *newDEFSVOP _((void));
 char* gv_ename _((GV *gv));
 CV *cv_clone2 _((CV *proto, CV *outside));

diff --git a/taint.c b/taint.c
index 4c031de..6bb9aa7 100644 (file)
--- a/taint.c
+++ b/taint.c
@@ -17,6 +17,8 @@ taint_proper(const char *f, char *s)
             "%s %d %d %d\n", s, PL_tainted, PL_uid, PL_euid));
 
     if (PL_tainted) {
+       if (!f)
+           f = no_security;
        if (PL_euid != PL_uid)
            ug = " while running setuid";
        else if (PL_egid != PL_gid)

diff --git a/win32/GenCAPI.pl b/win32/GenCAPI.pl
index 33ffe94..eee46a5 100644 (file)
--- a/win32/GenCAPI.pl
+++ b/win32/GenCAPI.pl
@@ -422,6 +422,7 @@ mess_sv
 ors
 opsave
 eval_mutex
+strtab_mutex
 orslen
 ofmt
 modcount

diff --git a/win32/Makefile b/win32/Makefile
index 9633037..3e95724 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -115,8 +115,8 @@ INST_VER    = \5.00503
 #
 #CCHOME                = f:\msvc20
 CCHOME         = $(MSVCDIR)
-CCINCDIR       = $(CCHOME)\include
-CCLIBDIR       = $(CCHOME)\lib
+CCINCDIR       = '$(CCHOME)\include'
+CCLIBDIR       = '$(CCHOME)\lib'
 
 #
 # specify space-separated list of extra directories to look for libraries

diff --git a/win32/config.bc b/win32/config.bc
index 95a5da0..251c56c 100644 (file)
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -496,7 +496,8 @@ shrpenv=''
 shsharp='true'
 sig_name='ZERO NUM01 INT QUIT ILL NUM05 NUM06 NUM07 FPE KILL NUM10 SEGV NUM12 PIPE ALRM TERM USR1 USR2 CHLD NUM19 USR3 BREAK ABRT STOP NUM24 CONT CLD'
 sig_name_init='"ZERO", "NUM01", "INT", "QUIT", "ILL", "NUM05", "NUM06", "NUM07", "FPE", "KILL", "NUM10", "SEGV", "NUM12", "PIPE", "ALRM", "TERM", "USR1", "USR2", "CHLD", "NUM19", "USR3", "BREAK", "ABRT", "STOP", "NUM24", "CONT", "CLD", 0'
-sig_num='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 18, 0'
+sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 20 0'
+sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 20, 0'
 signal_t='void'
 sitearch='~INST_TOP~\site~INST_VER~\lib\~archname~'
 sitearchexp='~INST_TOP~\site~INST_VER~\lib\~archname~'

diff --git a/win32/config.gc b/win32/config.gc
index 0e6d1e7..b43c511 100644 (file)
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -496,7 +496,8 @@ shrpenv=''
 shsharp='true'
 sig_name='ZERO NUM01 INT QUIT ILL NUM05 NUM06 NUM07 FPE KILL NUM10 SEGV NUM12 PIPE ALRM TERM NUM16 NUM17 NUM18 NUM19 CHLD BREAK ABRT STOP NUM24 CONT CLD'
 sig_name_init='"ZERO", "NUM01", "INT", "QUIT", "ILL", "NUM05", "NUM06", "NUM07", "FPE", "KILL", "NUM10", "SEGV", "NUM12", "PIPE", "ALRM", "TERM", "NUM16", "NUM17", "NUM18", "NUM19", "CHLD", "BREAK", "ABRT", "STOP", "NUM24", "CONT", "CLD", 0'
-sig_num='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 20, 0'
+sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 20 0'
+sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 20, 0'
 signal_t='void'
 sitearch='~INST_TOP~\site~INST_VER~\lib\~archname~'
 sitearchexp='~INST_TOP~\site~INST_VER~\lib\~archname~'

diff --git a/win32/config.vc b/win32/config.vc
index 41c713b..df6e0e0 100644 (file)
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -496,7 +496,8 @@ shrpenv=''
 shsharp='true'
 sig_name='ZERO NUM01 INT QUIT ILL NUM05 NUM06 NUM07 FPE KILL NUM10 SEGV NUM12 PIPE ALRM TERM NUM16 NUM17 NUM18 NUM19 CHLD BREAK ABRT STOP NUM24 CONT CLD'
 sig_name_init='"ZERO", "NUM01", "INT", "QUIT", "ILL", "NUM05", "NUM06", "NUM07", "FPE", "KILL", "NUM10", "SEGV", "NUM12", "PIPE", "ALRM", "TERM", "NUM16", "NUM17", "NUM18", "NUM19", "CHLD", "BREAK", "ABRT", "STOP", "NUM24", "CONT", "CLD", 0'
-sig_num='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 20, 0'
+sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 20 0'
+sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 20, 0'
 signal_t='void'
 sitearch='~INST_TOP~\site~INST_VER~\lib\~archname~'
 sitearchexp='~INST_TOP~\site~INST_VER~\lib\~archname~'

diff --git a/win32/config_sh.PL b/win32/config_sh.PL
index 59e64f9..3a8cac0 100644 (file)
--- a/win32/config_sh.PL
+++ b/win32/config_sh.PL
@@ -17,6 +17,9 @@ $opt{'cf_email'} = $opt{'cf_by'} . '@' . (gethostbyname('localhost'))[0]
        unless $opt{'cf_email'};
 $opt{'usemymalloc'} = 'y' if $opt{'d_mymalloc'} eq 'define';
 
+$opt{libpth} =~ s/'/"/g if exists $opt{libpth};
+$opt{incpth} =~ s/'/"/g if exists $opt{incpth};
+
 while (<>)
  {
   s/~([\w_]+)~/$opt{$1}/g;

diff --git a/win32/makedef.pl b/win32/makedef.pl
index f860291..6336c0c 100644 (file)
--- a/win32/makedef.pl
+++ b/win32/makedef.pl
@@ -216,6 +216,7 @@ unless ($define{'USE_THREADS'})
   skip_symbols [qw(
 PL_thr_key
 PL_sv_mutex
+PL_strtab_mutex
 PL_svref_mutex
 PL_malloc_mutex
 PL_eval_mutex