added patch, made linking with setargv a build option

	Message-ID: <000101bdab59$d9602dc0$a32fa8c0@tau.Active>
	Subject: [PATCH 5.004_71]

p4raw-id: //depot/perl@1416

diff --git a/perl.c b/perl.c
index dd48844..309d75f 100644 (file)
--- a/perl.c
+++ b/perl.c
@@ -1718,6 +1718,9 @@ moreswitches(char *s)
 #ifdef atarist
        printf("atariST series port, ++jrb  bammi@cadence.com\n");
 #endif
+#ifdef BINARY_BUILD_NOTICE
+       BINARY_BUILD_NOTICE;
+#endif
        printf("\n\
 Perl may be copied only under the terms of either the Artistic License or the\n\
 GNU General Public License, which may be found in the Perl 5.0 source kit.\n\n\

diff --git a/pp_sys.c b/pp_sys.c
index 10d02ce..f693959 100644 (file)
--- a/pp_sys.c
+++ b/pp_sys.c
@@ -2694,7 +2694,7 @@ PP(pp_rename)
     char *tmps = SvPV(TOPs, na);
     TAINT_PROPER("rename");
 #ifdef HAS_RENAME
-    anum = rename(tmps, tmps2);
+    anum = PerlLIO_rename(tmps, tmps2);
 #else
     if (!(anum = PerlLIO_stat(tmps, &statbuf))) {
        if (same_dirent(tmps2, tmps))   /* can always rename to same name */

diff --git a/win32/Makefile b/win32/Makefile
index 6eaa3ee..c6ce6b6 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -56,6 +56,15 @@ INST_VER     = \5.00471
 #USE_PERLCRT   = define
 
 #
+# uncomment to enable linking with setargv.obj under the Visual C
+# compiler. Setting this options enables perl to expand wildcards in
+# arguments, but it may be harder to use alternate methods like
+# File::DosGlob that are more powerful.  This option is supported only with
+# Visual C.
+#
+#USE_SETARGV   = define
+
+#
 # if you have the source for des_fcrypt(), uncomment this and make sure the
 # file exists (see README.win32).  File should be located at the perl
 # top level directory.
@@ -448,6 +457,10 @@ PERLEXE_OBJ        = $(PERLEXE_OBJ) $(WIN32_OBJ) $(DLL_OBJ)
 PERL95_OBJ     = $(PERL95_OBJ) DynaLoadmt$(o)
 !ENDIF
 
+!IF "$(USE_SETARGV)" != ""
+SETARGV_OBJ    = setargv$(o)
+!ENDIF
+
 DYNAMIC_EXT    = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B re \
                Data/Dumper
 STATIC_EXT     = DynaLoader
@@ -664,7 +677,7 @@ perlmain$(o) : perlmain.c
 
 $(PERLEXE): $(PERLDLL) $(CONFIGPM) $(PERLEXE_OBJ)
        $(LINK32) -subsystem:console -out:$@ $(LINK_FLAGS) $(LIBFILES) \
-           $(PERLEXE_OBJ) $(PERLIMPLIB) 
+           $(PERLEXE_OBJ) $(SETARGV_OBJ) $(PERLIMPLIB) 
        copy splittree.pl .. 
        $(MINIPERL) -I..\lib ..\splittree.pl "../LIB" $(AUTODIR)
 
@@ -690,7 +703,8 @@ DynaLoadmt$(o) : $(DYNALOADER).c
 
 $(PERL95EXE): $(PERLDLL) $(CONFIGPM) $(PERL95_OBJ)
        $(LINK32) -subsystem:console -nodefaultlib -out:$@ $(LINK_FLAGS) \
-           $(LIBBASEFILES) $(PERL95_OBJ) $(PERLIMPLIB) libcmt.lib
+           $(LIBBASEFILES) $(PERL95_OBJ) $(SETARGV_OBJ) $(PERLIMPLIB) \
+           libcmt.lib
 
 !ENDIF
 

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 46ebccd..dd03ae2 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -63,6 +63,15 @@ CCTYPE               *= BORLAND
 #USE_PERLCRT   *= define
 
 #
+# uncomment to enable linking with setargv.obj under the Visual C
+# compiler. Setting this options enables perl to expand wildcards in
+# arguments, but it may be harder to use alternate methods like
+# File::DosGlob that are more powerful.  This option is supported only with
+# Visual C.
+#
+#USE_SETARGV   *= define
+
+#
 # if you have the source for des_fcrypt(), uncomment this and make sure the
 # file exists (see README.win32).  File should be located at the perl
 # top level directory.
@@ -560,6 +569,10 @@ PERLEXE_OBJ        += $(WIN32_OBJ) $(DLL_OBJ)
 PERL95_OBJ     += DynaLoadmt$(o)
 .ENDIF
 
+.IF "$(USE_SETARGV)" != ""
+SETARGV_OBJ    = setargv$(o)
+.ENDIF
+
 DYNAMIC_EXT    = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B re \
                Data/Dumper
 STATIC_EXT     = DynaLoader
@@ -826,7 +839,7 @@ $(PERLEXE): $(PERLDLL) $(CONFIGPM) $(PERLEXE_OBJ)
            $(PERLEXE_OBJ) $(PERLIMPLIB) $(LIBFILES)
 .ELSE
        $(LINK32) -subsystem:console -out:$@ $(LINK_FLAGS) $(LIBFILES) \
-           $(PERLEXE_OBJ) $(PERLIMPLIB) 
+           $(PERLEXE_OBJ) $(SETARGV_OBJ) $(PERLIMPLIB) 
 .ENDIF
        copy splittree.pl .. 
        $(MINIPERL) -I..\lib ..\splittree.pl "../LIB" $(AUTODIR)
@@ -855,7 +868,8 @@ DynaLoadmt$(o) : $(DYNALOADER).c
 
 $(PERL95EXE): $(PERLDLL) $(CONFIGPM) $(PERL95_OBJ)
        $(LINK32) -subsystem:console -nodefaultlib -out:$@ $(LINK_FLAGS) \
-           $(LIBBASEFILES) $(PERL95_OBJ) $(PERLIMPLIB) libcmt.lib
+           $(LIBBASEFILES) $(PERL95_OBJ) $(SETARGV_OBJ) $(PERLIMPLIB) \
+           libcmt.lib
 
 .ENDIF
 .ENDIF