shell. The Makefile also has known incompatibilites with the "command.com"
shell that comes with Windows95, so building under Windows95 should
be considered "unsupported". However, there have been reports of successful
-build attempts using 4DOS/NT version 3.00 under Windows95, using dmake, but
+build attempts using 4DOS/NT version 6.01 under Windows95, using dmake, but
your mileage may vary.
The surest way to build it is on WindowsNT, using the cmd shell.
#ifndef __PATCHLEVEL_H_INCLUDED__
#define PATCHLEVEL 5
-#define SUBVERSION 0
+#define SUBVERSION 1
/*
local_patches -- list of locally applied less-than-subversion patches.
Perl has a new Social Contract for contributors. See F<Porting/Contract>.
The license included in much of the Perl documentation has changed.
-See L<perl> and the individual perl man pages listed therein.
+Most of the Perl documentation was previously under the implicit GNU
+General Public License or the Artistic License (at the user's choice).
+Now much of the documentation unambigously states the terms under which
+it may be distributed. Those terms are in general much less restrictive
+than the GNU GPL. See L<perl> and the individual perl man pages listed
+therein.
=head1 Core Changes
=head2 More generous treatment of carriage returns
-Perl used to complain if it encountered carriage returns in scripts. Now
-they are treated like whitespace. Literal carriage returns inside
-string literals and here documents are ignored if they are paired with
-newlines, or treated like newlines if they stand alone. This behavior
-means that literal carriage returns in files should be avoided. You
-can get the older, more compatible (but less generous) behavior by
-defining the preprocessor symbol C<TMP_CRLF_PATCH> when building perl.
+Perl used to complain if it encountered literal carriage returns in
+scripts. Now they are mostly treated like whitespace within program text.
+Inside string literals and here documents, literal carriage returns are
+ignored if they occur paired with newlines, or get interpreted as newlines
+if they stand alone. This behavior means that literal carriage returns
+in files should be avoided. You can get the older, more compatible (but
+less generous) behavior by defining the preprocessor symbol
+C<PERL_STRICT_CR> when building perl. Of course, all this has nothing
+whatever to do with how escapes like C<\r> are handled within strings.
Note that this doesn't somehow magically allow you to keep all text files
in DOS format. The generous treatment only applies to files that perl
* "It all comes from here, the stench and the peril." --Frodo
*/
-#define TMP_CRLF_PATCH
-
#include "EXTERN.h"
#include "perl.h"
}
goto retry;
case '\r':
-#ifndef TMP_CRLF_PATCH
+#ifdef PERL_STRICT_CR
warn("Illegal character \\%03o (carriage return)", '\r');
croak(
"(Maybe you didn't strip carriage returns after a network transfer?)\n");
*d++ = '\n';
*d = '\0';
len = d - PL_tokenbuf;
-#ifdef TMP_CRLF_PATCH
+#ifndef PERL_STRICT_CR
d = strchr(s, '\r');
if (d) {
char *olds = s;
}
PL_curcop->cop_line++;
PL_bufend = SvPVX(PL_linestr) + SvCUR(PL_linestr);
-#ifdef TMP_CRLF_PATCH
+#ifndef PERL_STRICT_CR
if (PL_bufend - PL_linestart >= 2) {
if ((PL_bufend[-2] == '\r' && PL_bufend[-1] == '\n') ||
(PL_bufend[-2] == '\n' && PL_bufend[-1] == '\r'))
if (s < PL_bufend) break; /* handle case where we are done yet :-) */
-#ifdef TMP_CRLF_PATCH
+#ifndef PERL_STRICT_CR
if (to - SvPVX(sv) >= 2) {
if ((to[-2] == '\r' && to[-1] == '\n') ||
(to[-2] == '\n' && to[-1] == '\r'))
# versioned installation can be obtained by setting INST_TOP above to a
# path that includes an arbitrary version string.
#
-INST_VER = \5.005
+INST_VER = \5.00501
#
# uncomment to enable threads-capabilities
* This symbol is the filename expanded version of the BIN symbol, for
* programs that do not want to deal with that at run-time.
*/
-#define BIN "c:\\perl\\5.005\\bin\\MSWin32-x86" /**/
-#define BIN_EXP "c:\\perl\\5.005\\bin\\MSWin32-x86" /**/
+#define BIN "c:\\perl\\5.00501\\bin\\MSWin32-x86" /**/
+#define BIN_EXP "c:\\perl\\5.00501\\bin\\MSWin32-x86" /**/
/* CPPSTDIN:
* This symbol contains the first part of the string which will invoke
* This symbol contains the ~name expanded version of ARCHLIB, to be used
* in programs that are not prepared to deal with ~ expansion at run-time.
*/
-#define ARCHLIB "c:\\perl\\5.005\\lib\\MSWin32-x86" /**/
+#define ARCHLIB "c:\\perl\\5.00501\\lib\\MSWin32-x86" /**/
/*#define ARCHLIB_EXP "" /**/
/* DLSYM_NEEDS_UNDERSCORE:
* This symbol contains the ~name expanded version of PRIVLIB, to be used
* in programs that are not prepared to deal with ~ expansion at run-time.
*/
-#define PRIVLIB "c:\\perl\\5.005\\lib" /**/
-#define PRIVLIB_EXP (win32_get_privlib("5.005")) /**/
+#define PRIVLIB "c:\\perl\\5.00501\\lib" /**/
+#define PRIVLIB_EXP (win32_get_privlib("5.00501")) /**/
/* SITEARCH:
* This symbol contains the name of the private library for this package.
* This symbol contains the ~name expanded version of SITEARCH, to be used
* in programs that are not prepared to deal with ~ expansion at run-time.
*/
-#define SITEARCH "c:\\perl\\site\\5.005\\lib\\MSWin32-x86" /**/
+#define SITEARCH "c:\\perl\\site\\5.00501\\lib\\MSWin32-x86" /**/
/*#define SITEARCH_EXP "" /**/
/* SITELIB:
* This symbol contains the ~name expanded version of SITELIB, to be used
* in programs that are not prepared to deal with ~ expansion at run-time.
*/
-#define SITELIB "c:\\perl\\site\\5.005\\lib" /**/
-#define SITELIB_EXP (win32_get_sitelib("5.005")) /**/
+#define SITELIB "c:\\perl\\site\\5.00501\\lib" /**/
+#define SITELIB_EXP (win32_get_sitelib("5.00501")) /**/
/* STARTPERL:
* This variable contains the string to put in front of a perl
* This symbol is the filename expanded version of the BIN symbol, for
* programs that do not want to deal with that at run-time.
*/
-#define BIN "c:\\perl\\5.005\\bin\\MSWin32-x86" /**/
-#define BIN_EXP "c:\\perl\\5.005\\bin\\MSWin32-x86" /**/
+#define BIN "c:\\perl\\5.00501\\bin\\MSWin32-x86" /**/
+#define BIN_EXP "c:\\perl\\5.00501\\bin\\MSWin32-x86" /**/
/* CPPSTDIN:
* This symbol contains the first part of the string which will invoke
* This symbol contains the ~name expanded version of ARCHLIB, to be used
* in programs that are not prepared to deal with ~ expansion at run-time.
*/
-#define ARCHLIB "c:\\perl\\5.005\\lib\\MSWin32-x86" /**/
+#define ARCHLIB "c:\\perl\\5.00501\\lib\\MSWin32-x86" /**/
/*#define ARCHLIB_EXP "" /**/
/* DLSYM_NEEDS_UNDERSCORE:
* This symbol contains the ~name expanded version of PRIVLIB, to be used
* in programs that are not prepared to deal with ~ expansion at run-time.
*/
-#define PRIVLIB "c:\\perl\\5.005\\lib" /**/
-#define PRIVLIB_EXP (win32_get_privlib("5.005")) /**/
+#define PRIVLIB "c:\\perl\\5.00501\\lib" /**/
+#define PRIVLIB_EXP (win32_get_privlib("5.00501")) /**/
/* SITEARCH:
* This symbol contains the name of the private library for this package.
* This symbol contains the ~name expanded version of SITEARCH, to be used
* in programs that are not prepared to deal with ~ expansion at run-time.
*/
-#define SITEARCH "c:\\perl\\site\\5.005\\lib\\MSWin32-x86" /**/
+#define SITEARCH "c:\\perl\\site\\5.00501\\lib\\MSWin32-x86" /**/
/*#define SITEARCH_EXP "" /**/
/* SITELIB:
* This symbol contains the ~name expanded version of SITELIB, to be used
* in programs that are not prepared to deal with ~ expansion at run-time.
*/
-#define SITELIB "c:\\perl\\site\\5.005\\lib" /**/
-#define SITELIB_EXP (win32_get_sitelib("5.005")) /**/
+#define SITELIB "c:\\perl\\site\\5.00501\\lib" /**/
+#define SITELIB_EXP (win32_get_sitelib("5.00501")) /**/
/* STARTPERL:
* This variable contains the string to put in front of a perl
* This symbol is the filename expanded version of the BIN symbol, for
* programs that do not want to deal with that at run-time.
*/
-#define BIN "c:\\perl\\5.005\\bin\\MSWin32-x86" /**/
-#define BIN_EXP "c:\\perl\\5.005\\bin\\MSWin32-x86" /**/
+#define BIN "c:\\perl\\5.00501\\bin\\MSWin32-x86" /**/
+#define BIN_EXP "c:\\perl\\5.00501\\bin\\MSWin32-x86" /**/
/* CPPSTDIN:
* This symbol contains the first part of the string which will invoke
* This symbol contains the ~name expanded version of ARCHLIB, to be used
* in programs that are not prepared to deal with ~ expansion at run-time.
*/
-#define ARCHLIB "c:\\perl\\5.005\\lib\\MSWin32-x86" /**/
+#define ARCHLIB "c:\\perl\\5.00501\\lib\\MSWin32-x86" /**/
/*#define ARCHLIB_EXP "" /**/
/* DLSYM_NEEDS_UNDERSCORE:
* This symbol contains the ~name expanded version of PRIVLIB, to be used
* in programs that are not prepared to deal with ~ expansion at run-time.
*/
-#define PRIVLIB "c:\\perl\\5.005\\lib" /**/
-#define PRIVLIB_EXP (win32_get_privlib("5.005")) /**/
+#define PRIVLIB "c:\\perl\\5.00501\\lib" /**/
+#define PRIVLIB_EXP (win32_get_privlib("5.00501")) /**/
/* SITEARCH:
* This symbol contains the name of the private library for this package.
* This symbol contains the ~name expanded version of SITEARCH, to be used
* in programs that are not prepared to deal with ~ expansion at run-time.
*/
-#define SITEARCH "c:\\perl\\site\\5.005\\lib\\MSWin32-x86" /**/
+#define SITEARCH "c:\\perl\\site\\5.00501\\lib\\MSWin32-x86" /**/
/*#define SITEARCH_EXP "" /**/
/* SITELIB:
* This symbol contains the ~name expanded version of SITELIB, to be used
* in programs that are not prepared to deal with ~ expansion at run-time.
*/
-#define SITELIB "c:\\perl\\site\\5.005\\lib" /**/
-#define SITELIB_EXP (win32_get_sitelib("5.005")) /**/
+#define SITELIB "c:\\perl\\site\\5.00501\\lib" /**/
+#define SITELIB_EXP (win32_get_sitelib("5.00501")) /**/
/* STARTPERL:
* This variable contains the string to put in front of a perl
# versioned installation can be obtained by setting INST_TOP above to a
# path that includes an arbitrary version string.
#
-INST_VER *= \5.005
+INST_VER *= \5.00501
#
# uncomment to enable threads-capabilities
return des_fcrypt(crypt_buffer, txt, salt);
#else
die("The crypt() function is unimplemented due to excessive paranoia.");
+ return Nullch;
#endif
}
#endif