In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/adf4621acac87682086f49be53bd2a451ace02ea?hp=c676c8385f1a2cdaa91d135b8fff4058f49f0e93>
- Log ----------------------------------------------------------------- commit adf4621acac87682086f49be53bd2a451ace02ea Author: Brian Fraser <[email protected]> Date: Thu Sep 5 22:05:38 2013 -0300 Removed the ifdefs for INCOMPLETE_TAINTS This was added in 5.5/5.6 as a backwards-compatibility measure when taint was extended to happen in more places. M cygwin/cygwin.c M dist/Cwd/Cwd.pm M dist/Cwd/Cwd.xs M djgpp/djgpp.c M doio.c M os2/os2.c M pp_ctl.c M pp_sys.c M util.c M win32/wince.c commit 009819bba34f5d921632a25a7dcbb643b435c0e9 Author: Brian Fraser <[email protected]> Date: Sat Sep 21 05:06:59 2013 -0300 Removed the define for ISHISH Each platform defined their own name in ISHISH. However, nothing used it, and the list of platforms was severely lacking. M perl.h commit d7b74b949fdf0128b411a0836841020c328d0070 Author: Brian Fraser <[email protected]> Date: Sat Sep 7 00:31:36 2013 -0300 Removed an ifdef for IS_UTF8_CHAR in utf8.c IS_UTF8_CHAR is defined by utf8.h, so this is always defined. In fact, later in utf8.c we use it again, this time without the ifdef. M utf8.c commit c23583cd92a3cd7faff88e9bad65ed3e253c657b Author: Brian Fraser <[email protected]> Date: Fri Sep 6 14:34:56 2013 -0300 Removed HAS_SOCKET__bad_code_maybe M pp_sys.c commit 72f4c67af3e64b7477b287a4dbb849fc073b9c5e Author: Brian Fraser <[email protected]> Date: Fri Sep 6 10:50:25 2013 -0300 Removed the use of SPARC64_GCC_WORKAROUND As the name implies, this worked around a bug in gcc, particularly, gcc 2.x, in SPARC64. No longer relevant. M regcomp.c commit 61b27c87fc5d47d336dde1f4e42ca84ec42c5110 Author: Brian Fraser <[email protected]> Date: Fri Sep 6 10:38:08 2013 -0300 Replaced the last use of HAS_GNULIBC with __GLIBC__ M util.c commit b232556246c5d4d98797058f8d4e64774c234a69 Author: Brian Fraser <[email protected]> Date: Thu Sep 5 22:32:05 2013 -0300 Removed DUMP_FDS and dump_fds() If perl was compiled with -DDUMP_FDS, it would define dump_fds and add it to the API, although even then nothing used it. dump_fds() itself was buggy, only checking for fds 0 through 32. M embed.fnc M embed.h M proto.h M util.c commit da1c03c4433ea55e5bff07372128bcbb974c03a7 Author: Brian Fraser <[email protected]> Date: Thu Sep 5 22:29:02 2013 -0300 Removed the ifdefs for BUGGY_MSC and BUGGY_MSC6 These are leftovers from the perl 4 era config.h. M perl.h M regcomp.c commit 24d147a6349f969954a198149da3c250a48e8f5b Author: Brian Fraser <[email protected]> Date: Thu Sep 5 22:25:25 2013 -0300 Replaced an ifdef for sv_dup with USE_ITHREADS M perlio.c commit 58ab9e8b69853d478c6a8261b225b5a47d185d45 Author: Brian Fraser <[email protected]> Date: Thu Sep 5 22:24:46 2013 -0300 perl.h: Always unconditionally include sys/types.h M perl.h commit ac98d8db1bcab17d820eb924f5afd41df0a9ce9d Author: Brian Fraser <[email protected]> Date: Thu Sep 5 22:16:50 2013 -0300 Removed OP_IN_REGISTER and related defines. Added as an experiment in 462e5cf6, it never quite worked, and recently wasn't even using registers. M cop.h M embedvar.h M intrpvar.h M perl.h commit 1bf3cddf9666db4bbefdee1aa6f343ff8fb336e1 Author: Brian Fraser <[email protected]> Date: Thu Sep 5 21:59:19 2013 -0300 Removed the ifdefs for __SC__ in toke.c M toke.c commit de54a1f165c533182b1d21240f94f10a5db97f2f Author: Brian Fraser <[email protected]> Date: Thu Sep 5 21:58:06 2013 -0300 Removed the ifdef & define for VDf This remained only for compatibility with CPAN, but nothing there uses it. M perl.h commit f2d27736c7054fb877aa058300a3c5b76d15801c Author: Brian Fraser <[email protected]> Date: Fri Aug 30 22:47:31 2013 -0300 Removed the ifdef for FPUTS_BOTCH This enabled a workaround for fputs on SunOS 4.0.1 and 4.0.2, SunOS 4.1.x and later do not have the problem. M perl.h commit 5617ce2287aaef967c1623b87198200c16172f40 Author: Brian Fraser <[email protected]> Date: Fri Aug 30 22:40:46 2013 -0300 Remove the ifdefs for ULTRIX_STDIO_BOTCH Not only has Ultrix been long out of support, this ifdef was working around a bug particular to Ultrix 1.2. M doio.c commit 5c42443f0f18aa5023877a82cbe784656b3a7b6c Author: Brian Fraser <[email protected]> Date: Fri Aug 30 20:52:21 2013 -0300 Remove an ifdef for the Harris HCX-9 froms sv.c Historical cruft. M sv.c commit 39c0d7ee897c13cceed4e2b5712cd4e88315336a Author: Brian Fraser <[email protected]> Date: Fri Aug 30 20:25:12 2013 -0300 Remove HAS_64K_LIMIT This was only defined for MSDOS if not using DJGPP. We've long since dropped support for that, so this define and related code can go. M dosish.h M malloc.c M sv.c M util.c commit 25d5035bd3a23a0e15661d46ad1adbbd05249de0 Author: Brian Fraser <[email protected]> Date: Sat Sep 7 00:37:19 2013 -0300 Removed an '#ifdef COMMENTARY' in toke.c This was added as a micro-optimiaztion twenty years ago. M toke.c commit d4d17ebefec3e90bcf74282b5dfd54b76ce7fe8e Author: Brian Fraser <[email protected]> Date: Fri Aug 30 18:38:05 2013 -0300 toke.c: Remove a cargo-culted #undef CLINE M toke.c commit 6ded859a3ea84604ca71928690de956f2243571a Author: Brian Fraser <[email protected]> Date: Fri Aug 30 18:02:45 2013 -0300 Remove a '#undef ff_next' remnant from ages past. This was discussed long ago on the list but never actually removed: http://www.nntp.perl.org/group/perl.perl5.porters/2001/01/msg29492.html M perl.h M toke.c commit 44e3dfd23cd50e7576ceabf4b4ac980c81f5c2f6 Author: Brian Fraser <[email protected]> Date: Fri Aug 30 17:37:27 2013 -0300 regcomp.c: Remove the last usage of NO_UNARY_PLUS This was set for some VMS variants in 5.005, but has since been excised from vmsish.h. The ifdef in regcomp was a leftover. M regcomp.c commit baa75e8da2ec8ab2da52f2e7ce49181504887e3d Author: Brian Fraser <[email protected]> Date: Fri Aug 30 17:36:46 2013 -0300 regcomp.c: Remove a cargo-culted #undef SPSTART M regcomp.c commit 08bd596a69dee2b6f6c54ada9652c223a7debff2 Author: Brian Fraser <[email protected]> Date: Fri Aug 30 17:25:10 2013 -0300 regcomp.c: Remove a #undef op M regcomp.c commit 00a8427b4ffda6c2743b030817c14f82288e1a85 Author: Brian Fraser <[email protected]> Date: Fri Aug 30 14:42:40 2013 -0300 regcomp.c: Remove a useless use of I_STDARG M regcomp.c ----------------------------------------------------------------------- Summary of changes: cop.h | 11 --------- cygwin/cygwin.c | 2 -- dist/Cwd/Cwd.pm | 2 +- dist/Cwd/Cwd.xs | 8 ------- djgpp/djgpp.c | 4 ---- doio.c | 12 ---------- dosish.h | 17 -------------- embed.fnc | 3 --- embed.h | 3 --- embedvar.h | 1 - intrpvar.h | 4 ---- malloc.c | 11 +-------- os2/os2.c | 4 ---- perl.h | 69 ++++++--------------------------------------------------- perlio.c | 4 ++-- pp_ctl.c | 2 -- pp_sys.c | 24 -------------------- proto.h | 7 ------ regcomp.c | 58 ++---------------------------------------------- sv.c | 15 ------------- toke.c | 25 ++------------------- utf8.c | 2 -- util.c | 48 +++------------------------------------ win32/wince.c | 2 -- 24 files changed, 18 insertions(+), 320 deletions(-) diff --git a/cop.h b/cop.h index 0741d92..2a976ad 100644 --- a/cop.h +++ b/cop.h @@ -38,14 +38,6 @@ struct jmpenv { typedef struct jmpenv JMPENV; -#ifdef OP_IN_REGISTER -#define OP_REG_TO_MEM PL_opsave = op -#define OP_MEM_TO_REG op = PL_opsave -#else -#define OP_REG_TO_MEM NOOP -#define OP_MEM_TO_REG NOOP -#endif - /* * How to build the first jmpenv. * @@ -107,9 +99,7 @@ typedef struct jmpenv JMPENV; Perl_deb(aTHX_ "JUMPENV_PUSH level=%d at %s:%d\n", \ i, __FILE__, __LINE__);}) \ cur_env.je_prev = PL_top_env; \ - OP_REG_TO_MEM; \ cur_env.je_ret = PerlProc_setjmp(cur_env.je_buf, SCOPE_SAVES_SIGNAL_MASK); \ - OP_MEM_TO_REG; \ PL_top_env = &cur_env; \ cur_env.je_mustcatch = FALSE; \ (v) = cur_env.je_ret; \ @@ -133,7 +123,6 @@ typedef struct jmpenv JMPENV; while (p) { i++; p = p->je_prev; } \ Perl_deb(aTHX_ "JUMPENV_JUMP(%d) level=%d at %s:%d\n", \ (int)v, i, __FILE__, __LINE__);}) \ - OP_REG_TO_MEM; \ if (PL_top_env->je_prev) \ PerlProc_longjmp(PL_top_env->je_buf, (v)); \ if ((v) == 2) \ diff --git a/cygwin/cygwin.c b/cygwin/cygwin.c index e7be5e3..6b31232 100644 --- a/cygwin/cygwin.c +++ b/cygwin/cygwin.c @@ -199,9 +199,7 @@ XS(Cygwin_cwd) if((cwd = getcwd(NULL, -1))) { ST(0) = sv_2mortal(newSVpv(cwd, 0)); free(cwd); -#ifndef INCOMPLETE_TAINTS SvTAINTED_on(ST(0)); -#endif XSRETURN(1); } XSRETURN_UNDEF; diff --git a/dist/Cwd/Cwd.pm b/dist/Cwd/Cwd.pm index bd19ea7..d9de63c 100644 --- a/dist/Cwd/Cwd.pm +++ b/dist/Cwd/Cwd.pm @@ -171,7 +171,7 @@ use strict; use Exporter; use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION); -$VERSION = '3.44'; +$VERSION = '3.45'; my $xs_version = $VERSION; $VERSION =~ tr/_//; diff --git a/dist/Cwd/Cwd.xs b/dist/Cwd/Cwd.xs index dc3da18..4ddbdac 100644 --- a/dist/Cwd/Cwd.xs +++ b/dist/Cwd/Cwd.xs @@ -251,9 +251,7 @@ int Perl_getcwd_sv(pTHX_ SV *sv) { #ifndef PERL_MICRO -#ifndef INCOMPLETE_TAINTS SvTAINTED_on(sv); -#endif #ifdef HAS_GETCWD { @@ -551,9 +549,7 @@ PPCODE: croak_xs_usage(cv, ""); getcwd_sv(TARG); XSprePUSH; PUSHTARG; -#ifndef INCOMPLETE_TAINTS SvTAINTED_on(TARG); -#endif } void @@ -580,9 +576,7 @@ PPCODE: sv_setsv(TARG, &PL_sv_undef); XSprePUSH; PUSHs(TARG); -#ifndef INCOMPLETE_TAINTS SvTAINTED_on(TARG); -#endif } #if defined(WIN32) && !defined(UNDER_CE) @@ -617,9 +611,7 @@ PPCODE: Safefree(dir); XSprePUSH; PUSHs(TARG); -#ifndef INCOMPLETE_TAINTS SvTAINTED_on(TARG); -#endif } #endif diff --git a/djgpp/djgpp.c b/djgpp/djgpp.c index 9370a29..6d136e3 100644 --- a/djgpp/djgpp.c +++ b/djgpp/djgpp.c @@ -352,9 +352,7 @@ XS(dos_GetCwd) ST(0)=sv_newmortal (); if (getcwd (tmp,PATH_MAX+1)!=NULL) sv_setpv ((SV*)ST(0),tmp); -#ifndef INCOMPLETE_TAINTS SvTAINTED_on(ST(0)); -#endif } XSRETURN (1); } @@ -377,9 +375,7 @@ XS(XS_Cwd_sys_cwd) RETVAL = getcwd(p, MAXPATHLEN); ST(0) = sv_newmortal(); sv_setpv((SV*)ST(0), RETVAL); -#ifndef INCOMPLETE_TAINTS SvTAINTED_on(ST(0)); -#endif } XSRETURN(1); } diff --git a/doio.c b/doio.c index f2c3752..50ab24f 100644 --- a/doio.c +++ b/doio.c @@ -1052,10 +1052,6 @@ Perl_do_tell(pTHX_ GV *gv) PERL_ARGS_ASSERT_DO_TELL; if (io && (fp = IoIFP(io))) { -#ifdef ULTRIX_STDIO_BOTCH - if (PerlIO_eof(fp)) - (void)PerlIO_seek(fp, 0L, 2); /* ultrix 1.2 workaround */ -#endif return PerlIO_tell(fp); } report_evil_fh(gv); @@ -1071,10 +1067,6 @@ Perl_do_seek(pTHX_ GV *gv, Off_t pos, int whence) PerlIO *fp; if (io && (fp = IoIFP(io))) { -#ifdef ULTRIX_STDIO_BOTCH - if (PerlIO_eof(fp)) - (void)PerlIO_seek(fp, 0L, 2); /* ultrix 1.2 workaround */ -#endif return PerlIO_seek(fp, pos, whence) >= 0; } report_evil_fh(gv); @@ -2227,10 +2219,8 @@ Perl_do_msgrcv(pTHX_ SV **mark, SV **sp) if (ret >= 0) { SvCUR_set(mstr, sizeof(long)+ret); *SvEND(mstr) = '\0'; -#ifndef INCOMPLETE_TAINTS /* who knows who has been playing with this message? */ SvTAINTED_on(mstr); -#endif } return ret; #else @@ -2337,10 +2327,8 @@ Perl_do_shmio(pTHX_ I32 optype, SV **mark, SV **sp) SvCUR_set(mstr, msize); *SvEND(mstr) = '\0'; SvSETMAGIC(mstr); -#ifndef INCOMPLETE_TAINTS /* who knows who has been playing with this shared memory? */ SvTAINTED_on(mstr); -#endif } else { STRLEN len; diff --git a/dosish.h b/dosish.h index 8c3917b..8b34369 100644 --- a/dosish.h +++ b/dosish.h @@ -58,23 +58,6 @@ #endif #define dXSUB_SYS -/* - * 5.003_07 and earlier keyed on #ifdef MSDOS for determining if we were - * running on DOS, *and* if we had to cope with 16 bit memory addressing - * constraints, *and* we need to have memory allocated as unsigned long. - * - * with the advent of *real* compilers for DOS, they are not locked together. - * MSDOS means "I am running on MSDOS". HAS_64K_LIMIT means "I have - * 16 bit memory addressing constraints". - * - * if you need the last, try #DEFINE MEM_SIZE unsigned long. - */ -#ifdef MSDOS -# ifndef DJGPP -# define HAS_64K_LIMIT -# endif -#endif - /* USEMYBINMODE * This symbol, if defined, indicates that the program should * use the routine my_binmode(FILE *fp, char iotype, int mode) to insure diff --git a/embed.fnc b/embed.fnc index 8f1255d..3f7040b 100644 --- a/embed.fnc +++ b/embed.fnc @@ -421,9 +421,6 @@ ApR |I32 |dowantarray Ap |void |dump_all p |void |dump_all_perl |bool justperl Ap |void |dump_eval -#if defined(DUMP_FDS) -Ap |void |dump_fds |NN char* s -#endif Ap |void |dump_form |NN const GV* gv Ap |void |gv_dump |NN GV* gv Ap |void |op_dump |NN const OP *o diff --git a/embed.h b/embed.h index 937f7ec..eade4a4 100644 --- a/embed.h +++ b/embed.h @@ -758,9 +758,6 @@ #define pad_setsv(a,b) Perl_pad_setsv(aTHX_ a,b) #define pad_sv(a) Perl_pad_sv(aTHX_ a) #endif -#if defined(DUMP_FDS) -#define dump_fds(a) Perl_dump_fds(aTHX_ a) -#endif #if defined(HAS_SIGACTION) && defined(SA_SIGINFO) #define csighandler Perl_csighandler #endif diff --git a/embedvar.h b/embedvar.h index 7c721ed..75a0cc9 100644 --- a/embedvar.h +++ b/embedvar.h @@ -218,7 +218,6 @@ #define PL_op_exec_cnt (vTHX->Iop_exec_cnt) #define PL_op_mask (vTHX->Iop_mask) #define PL_opfreehook (vTHX->Iopfreehook) -#define PL_opsave (vTHX->Iopsave) #define PL_origalen (vTHX->Iorigalen) #define PL_origargc (vTHX->Iorigargc) #define PL_origargv (vTHX->Iorigargv) diff --git a/intrpvar.h b/intrpvar.h index 4ca7000..f4efc32 100644 --- a/intrpvar.h +++ b/intrpvar.h @@ -33,11 +33,7 @@ * Important ones in the first cache line (if alignment is done right) */ PERLVAR(I, stack_sp, SV **) /* top of the stack */ -#ifdef OP_IN_REGISTER -PERLVAR(I, opsave, OP *) -#else PERLVAR(I, op, OP *) /* currently executing op */ -#endif PERLVAR(I, curpad, SV **) /* active pad (lexicals+tmps) */ PERLVAR(I, stack_base, SV **) diff --git a/malloc.c b/malloc.c index a0a762e..79a8c89 100644 --- a/malloc.c +++ b/malloc.c @@ -755,16 +755,7 @@ static const char bucket_of[] = # define POW2_OPTIMIZE_SURPLUS(bucket) 0 #endif /* !TWO_POT_OPTIMIZE */ -#ifdef HAS_64K_LIMIT -# define BARK_64K_LIMIT(what,nbytes,size) \ - if (nbytes > 0xffff) { \ - PerlIO_printf(PerlIO_stderr(), \ - "%s too large: %lx\n", what, size); \ - my_exit(1); \ - } -#else /* !HAS_64K_LIMIT */ -# define BARK_64K_LIMIT(what,nbytes,size) -#endif /* !HAS_64K_LIMIT */ +#define BARK_64K_LIMIT(what,nbytes,size) #ifndef MIN_SBRK # define MIN_SBRK 2048 diff --git a/os2/os2.c b/os2/os2.c index 574c5fc..94b4541 100644 --- a/os2/os2.c +++ b/os2/os2.c @@ -3461,9 +3461,7 @@ XS(XS_Cwd_sys_cwd) RETVAL = _getcwd2(p, MAXPATHLEN); ST(0) = sv_newmortal(); sv_setpv(ST(0), RETVAL); -#ifndef INCOMPLETE_TAINTS SvTAINTED_on(ST(0)); -#endif } XSRETURN(1); } @@ -3595,10 +3593,8 @@ XS(XS_Cwd_sys_abspath) *t = 0; SvCUR_set(sv, t - SvPVX(sv)); } -#ifndef INCOMPLETE_TAINTS if (!items) SvTAINTED_on(ST(0)); -#endif } XSRETURN(1); } diff --git a/perl.h b/perl.h index 1e8e870..1c22586 100644 --- a/perl.h +++ b/perl.h @@ -434,14 +434,6 @@ # endif #endif -#ifdef OP_IN_REGISTER -# ifdef __GNUC__ -# define stringify_immed(s) #s -# define stringify(s) stringify_immed(s) -struct op *Perl_op asm(stringify(OP_IN_REGISTER)); -# endif -#endif - /* gcc (-ansi) -pedantic doesn't allow gcc statement expressions, * g++ allows them but seems to have problems with them * (insane errors ensue). @@ -641,11 +633,7 @@ struct op *Perl_op asm(stringify(OP_IN_REGISTER)); # include <pthread.h> #endif -#ifndef _TYPES_ /* If types.h defines this it's easy. */ -# ifndef major /* Does everyone's types.h define this? */ -# include <sys/types.h> -# endif -#endif +#include <sys/types.h> #ifdef __cplusplus # ifndef I_STDARG @@ -969,9 +957,6 @@ EXTERN_C int usleep(unsigned int); extern int memcmp (char*, char*, int); # endif # endif -# ifdef BUGGY_MSC -# pragma function(memcmp) -# endif #else # ifndef memcmp # define memcmp my_memcmp @@ -1325,13 +1310,6 @@ EXTERN_C char *crypt(const char *, const char *); # endif #endif -#ifdef FPUTS_BOTCH -/* work around botch in SunOS 4.0.1 and 4.0.2 */ -# ifndef fputs -# define fputs(sv,fp) fprintf(fp,"%s",sv) -# endif -#endif - /* * The following gobbledygook brought to you on behalf of __STDC__. * (I could just use #ifndef __STDC__, but this is more bulletproof @@ -1482,10 +1460,6 @@ EXTERN_C char *crypt(const char *, const char *); # define S_IEXEC S_IXUSR #endif -#ifdef ff_next -# undef ff_next -#endif - #if defined(cray) || defined(gould) || defined(i860) || defined(pyr) # define SLOPPYDIVIDE #endif @@ -2448,42 +2422,22 @@ typedef SV PADNAME; # else # include "dosish.h" # endif -# define ISHISH "dos" -#endif - -#if defined(VMS) +#elif defined(VMS) # include "vmsish.h" -# define ISHISH "vms" -#endif - -#if defined(PLAN9) +#elif defined(PLAN9) # include "./plan9/plan9ish.h" -# define ISHISH "plan9" -#endif - -#if defined(__VOS__) +#elif defined(__VOS__) # ifdef __GNUC__ # include "./vos/vosish.h" # else # include "vos/vosish.h" # endif -# define ISHISH "vos" -#endif - -#ifdef __SYMBIAN32__ +#elif defined(__SYMBIAN32__) # include "symbian/symbianish.h" -# define ISHISH "symbian" -#endif - - -#if defined(__HAIKU__) +#elif defined(__HAIKU__) # include "haiku/haikuish.h" -# define ISHISH "haiku" -#endif - -#ifndef ISHISH +#else # include "unixish.h" -# define ISHISH "unix" #endif /* NSIG logic from Configure --> */ @@ -3071,15 +3025,6 @@ typedef pthread_key_t perl_key; #ifdef PERL_CORE /* not used; but needed for backward compatibility with XS code? - RMB */ -# undef VDf -#else -# ifndef VDf -# define VDf "vd" -# endif -#endif - -#ifdef PERL_CORE -/* not used; but needed for backward compatibility with XS code? - RMB */ # undef UVf #else # ifndef UVf diff --git a/perlio.c b/perlio.c index 94b622b..4693366 100644 --- a/perlio.c +++ b/perlio.c @@ -653,7 +653,7 @@ PerlIO_clone_list(pTHX_ PerlIO_list_t *proto, CLONE_PARAMS *param) list = PerlIO_list_alloc(aTHX); for (i=0; i < proto->cur; i++) { SV *arg = proto->array[i].arg; -#ifdef sv_dup +#ifdef USE_ITHREADS if (arg && param) arg = sv_dup(arg, param); #else @@ -2259,7 +2259,7 @@ PerlIO_sv_dup(pTHX_ SV *arg, CLONE_PARAMS *param) { if (!arg) return NULL; -#ifdef sv_dup +#ifdef USE_ITHREADS if (param) { arg = sv_dup(arg, param); SvREFCNT_inc_simple_void_NN(arg); diff --git a/pp_ctl.c b/pp_ctl.c index 63482fd..f258976 100644 --- a/pp_ctl.c +++ b/pp_ctl.c @@ -168,12 +168,10 @@ PP(pp_regcomp) } -#ifndef INCOMPLETE_TAINTS if (TAINTING_get && TAINT_get) { SvTAINTED_on((SV*)new_re); RX_TAINT_on(new_re); } -#endif #if !defined(USE_ITHREADS) /* can't change the optree at runtime either */ diff --git a/pp_sys.c b/pp_sys.c index 7143431..5656e5a 100644 --- a/pp_sys.c +++ b/pp_sys.c @@ -1769,20 +1769,6 @@ PP(pp_sysread) } } else -#ifdef HAS_SOCKET__bad_code_maybe - if (IoTYPE(io) == IoTYPE_SOCKET) { - Sock_size_t bufsize; - char namebuf[MAXPATHLEN]; -#if defined(VMS_DO_SOCKETS) && defined(DECCRTL_SOCKETS) - bufsize = sizeof (struct sockaddr_in); -#else - bufsize = sizeof namebuf; -#endif - count = PerlSock_recvfrom(PerlIO_fileno(IoIFP(io)), buffer, length, 0, - (struct sockaddr *)namebuf, &bufsize); - } - else -#endif { count = PerlIO_read(IoIFP(io), buffer, length); /* PerlIO_read() - like fread() returns 0 on both error and EOF */ @@ -3624,9 +3610,7 @@ PP(pp_readlink) char buf[MAXPATHLEN]; int len; -#ifndef INCOMPLETE_TAINTS TAINT; -#endif tmps = POPpconstx; len = readlink(tmps, buf, sizeof(buf) - 1); if (len < 0) @@ -3855,10 +3839,8 @@ PP(pp_readdir) #else sv = newSVpv(dp->d_name, 0); #endif -#ifndef INCOMPLETE_TAINTS if (!(IoFLAGS(io) & IOf_UNTAINT)) SvTAINTED_on(sv); -#endif mXPUSHs(sv); } while (gimme == G_ARRAY); @@ -5224,11 +5206,9 @@ PP(pp_gpwent) sv_setpv(sv, pwent->pw_passwd); # endif -# ifndef INCOMPLETE_TAINTS /* passwd is tainted because user himself can diddle with it. * admittedly not much and in a very limited way, but nevertheless. */ SvTAINTED_on(sv); -# endif sv_setuid(PUSHmortal, pwent->pw_uid); sv_setgid(PUSHmortal, pwent->pw_gid); @@ -5271,18 +5251,14 @@ PP(pp_gpwent) # else PUSHs(sv = sv_mortalcopy(&PL_sv_no)); # endif -# ifndef INCOMPLETE_TAINTS /* pw_gecos is tainted because user himself can diddle with it. */ SvTAINTED_on(sv); -# endif mPUSHs(newSVpv(pwent->pw_dir, 0)); PUSHs(sv = sv_2mortal(newSVpv(pwent->pw_shell, 0))); -# ifndef INCOMPLETE_TAINTS /* pw_shell is tainted because user himself can diddle with it. */ SvTAINTED_on(sv); -# endif # ifdef PWEXPIRE mPUSHi(pwent->pw_expire); diff --git a/proto.h b/proto.h index a9963fc..3a2d46a 100644 --- a/proto.h +++ b/proto.h @@ -5329,13 +5329,6 @@ PERL_CALLCONV void Perl_dump_sv_child(pTHX_ SV *sv) assert(sv) #endif -#if defined(DUMP_FDS) -PERL_CALLCONV void Perl_dump_fds(pTHX_ char* s) - __attribute__nonnull__(pTHX_1); -#define PERL_ARGS_ASSERT_DUMP_FDS \ - assert(s) - -#endif #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) PERL_CALLCONV I32 Perl_do_ipcctl(pTHX_ I32 optype, SV** mark, SV** sp) __attribute__nonnull__(pTHX_2) diff --git a/regcomp.c b/regcomp.c index 0034298..0e2680e 100644 --- a/regcomp.c +++ b/regcomp.c @@ -95,19 +95,6 @@ extern const struct regexp_engine my_reg_engine; #define IS_NON_FINAL_FOLD(c) _IS_NON_FINAL_FOLD_ONLY_FOR_USE_BY_REGCOMP_DOT_C(c) #define IS_IN_SOME_FOLD_L1(c) _IS_IN_SOME_FOLD_ONLY_FOR_USE_BY_REGCOMP_DOT_C(c) -#ifdef op -#undef op -#endif /* op */ - -#ifdef MSDOS -# if defined(BUGGY_MSC6) - /* MSC 6.00A breaks on op/regexp.t test 85 unless we turn this off */ -# pragma optimize("a",off) - /* But MSC 6.00A is happy with 'w', for aliases only across function calls*/ -# pragma optimize("w",on ) -# endif /* BUGGY_MSC6 */ -#endif /* MSDOS */ - #ifndef STATIC #define STATIC static #endif @@ -219,9 +206,6 @@ typedef struct RExC_state_t { #define ISMULT2(s) ((*s) == '*' || (*s) == '+' || (*s) == '?' || \ ((*s) == '{' && regcurly(s, FALSE))) -#ifdef SPSTART -#undef SPSTART /* dratted cpp namespace... */ -#endif /* * Flags to be passed up and down. */ @@ -398,13 +382,8 @@ static const scan_data_t zero_scan_data = #define SF_FIX_BEFORE_EOL (SF_FIX_BEFORE_SEOL|SF_FIX_BEFORE_MEOL) #define SF_FL_BEFORE_EOL (SF_FL_BEFORE_SEOL|SF_FL_BEFORE_MEOL) -#ifdef NO_UNARY_PLUS -# define SF_FIX_SHIFT_EOL (0+2) -# define SF_FL_SHIFT_EOL (0+4) -#else -# define SF_FIX_SHIFT_EOL (+2) -# define SF_FL_SHIFT_EOL (+4) -#endif +#define SF_FIX_SHIFT_EOL (+2) +#define SF_FL_SHIFT_EOL (+4) #define SF_FIX_BEFORE_SEOL (SF_BEFORE_SEOL << SF_FIX_SHIFT_EOL) #define SF_FIX_BEFORE_MEOL (SF_BEFORE_MEOL << SF_FIX_SHIFT_EOL) @@ -2662,17 +2641,6 @@ S_make_trie_failtable(pTHX_ RExC_state_t *pRExC_state, regnode *source, regnode } -/* - * There are strange code-generation bugs caused on sparc64 by gcc-2.95.2. - * These need to be revisited when a newer toolchain becomes available. - */ -#if defined(__sparc64__) && defined(__GNUC__) -# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96) -# undef SPARC64_GCC_WORKAROUND -# define SPARC64_GCC_WORKAROUND 1 -# endif -#endif - #define DEBUG_PEEP(str,scan,depth) \ DEBUG_OPTIMISE_r({if (scan){ \ SV * const mysv=sv_newmortal(); \ @@ -4099,28 +4067,11 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, int counted = mincount != 0; if (data->last_end > 0 && mincount != 0) { /* Ends with a string. */ -#if defined(SPARC64_GCC_WORKAROUND) - SSize_t b = 0; - STRLEN l = 0; - const char *s = NULL; - SSize_t old = 0; - - if (pos_before >= data->last_start_min) - b = pos_before; - else - b = data->last_start_min; - - l = 0; - s = SvPV_const(data->last_found, l); - old = b - data->last_start_min; - -#else SSize_t b = pos_before >= data->last_start_min ? pos_before : data->last_start_min; STRLEN l; const char * const s = SvPV_const(data->last_found, l); SSize_t old = b - data->last_start_min; -#endif if (UTF) old = utf8_hop((U8*)s, old) - (U8*)s; @@ -15528,12 +15479,7 @@ S_re_croak2(pTHX_ bool utf8, const char* pat1,const char* pat2,...) Copy(pat2, buf + l1, l2 , char); buf[l1 + l2] = '\n'; buf[l1 + l2 + 1] = '\0'; -#ifdef I_STDARG - /* ANSI variant takes additional second argument */ va_start(args, pat2); -#else - va_start(args); -#endif msv = vmess(buf, &args); va_end(args); message = SvPV_const(msv,l1); diff --git a/sv.c b/sv.c index 41f9d17..e6ba4c9 100644 --- a/sv.c +++ b/sv.c @@ -1479,13 +1479,6 @@ Perl_sv_grow(pTHX_ SV *const sv, STRLEN newlen) PERL_ARGS_ASSERT_SV_GROW; -#ifdef HAS_64K_LIMIT - if (newlen >= 0x10000) { - PerlIO_printf(Perl_debug_log, - "Allocation too large: %"UVxf"\n", (UV)newlen); - my_exit(1); - } -#endif /* HAS_64K_LIMIT */ if (SvROK(sv)) sv_unref(sv); if (SvTYPE(sv) < SVt_PV) { @@ -1497,10 +1490,6 @@ Perl_sv_grow(pTHX_ SV *const sv, STRLEN newlen) s = SvPVX_mutable(sv); if (newlen > SvLEN(sv)) newlen += 10 * (newlen - SvCUR(sv)); /* avoid copy each time */ -#ifdef HAS_64K_LIMIT - if (newlen >= 0x10000) - newlen = 0xFFFF; -#endif } else { @@ -2998,10 +2987,6 @@ Perl_sv_2pv_flags(pTHX_ SV *const sv, STRLEN *const lp, const I32 flags) RESTORE_ERRNO; while (*s) s++; } -#ifdef hcx - if (s[-1] == '.') - *--s = '\0'; -#endif } else if (isGV_with_GP(sv)) { GV *const gv = MUTABLE_GV(sv); diff --git a/toke.c b/toke.c index 257d69b..97205a3 100644 --- a/toke.c +++ b/toke.c @@ -182,17 +182,10 @@ static const char* const lex_state_names[] = { }; #endif -#ifdef ff_next -#undef ff_next -#endif - #include "keywords.h" /* CLINE is a macro that ensures PL_copline has a sane value */ -#ifdef CLINE -#undef CLINE -#endif #define CLINE (PL_copline = (CopLINE(PL_curcop) < PL_copline ? CopLINE(PL_curcop) : PL_copline)) #ifdef PERL_MAD @@ -4744,9 +4737,6 @@ S_check_scalar_slice(pTHX_ char *s) */ -#ifdef __SC__ -#pragma segment Perl_yylex -#endif int Perl_yylex(pTHX) { @@ -4777,11 +4767,9 @@ Perl_yylex(pTHX) } ); switch (PL_lex_state) { -#ifdef COMMENTARY - case LEX_NORMAL: /* Some compilers will produce faster */ - case LEX_INTERPNORMAL: /* code if we comment these out. */ + case LEX_NORMAL: + case LEX_INTERPNORMAL: break; -#endif /* when we've already built the next token, just pull it out of the queue */ case LEX_KNOWNEXT: @@ -8960,9 +8948,6 @@ Perl_yylex(pTHX) } }} } -#ifdef __SC__ -#pragma segment Main -#endif /* S_pending_ident @@ -11473,9 +11458,6 @@ Perl_start_subparse(pTHX_ I32 is_format, U32 flags) return oldsavestack_ix; } -#ifdef __SC__ -#pragma segment Perl_yylex -#endif static int S_yywarn(pTHX_ const char *const s, U32 flags) { @@ -11607,9 +11589,6 @@ Perl_yyerror_pvn(pTHX_ const char *const s, STRLEN len, U32 flags) PL_in_my_stash = NULL; return 0; } -#ifdef __SC__ -#pragma segment Main -#endif STATIC char* S_swallow_bom(pTHX_ U8 *s) diff --git a/utf8.c b/utf8.c index f07e8ec..c8bbaea 100644 --- a/utf8.c +++ b/utf8.c @@ -366,10 +366,8 @@ Perl_is_utf8_char_buf(const U8 *buf, const U8* buf_end) len = UTF8SKIP(buf); } -#ifdef IS_UTF8_CHAR if (IS_UTF8_CHAR_FAST(len)) return IS_UTF8_CHAR(buf, len) ? len : 0; -#endif /* #ifdef IS_UTF8_CHAR */ return is_utf8_char_slow(buf, len); } diff --git a/util.c b/util.c index 6227474..f020b4b 100644 --- a/util.c +++ b/util.c @@ -76,13 +76,6 @@ Perl_safesysmalloc(MEM_SIZE size) dTHX; #endif Malloc_t ptr; -#ifdef HAS_64K_LIMIT - if (size > 0xffff) { - PerlIO_printf(Perl_error_log, - "Allocation too large: %lx\n", size) FLUSH; - my_exit(1); - } -#endif /* HAS_64K_LIMIT */ #ifdef PERL_TRACK_MEMPOOL size += sTHX; #endif @@ -143,13 +136,6 @@ Perl_safesysrealloc(Malloc_t where,MEM_SIZE size) Malloc_t PerlMem_realloc(); #endif /* !defined(STANDARD_C) && !defined(HAS_REALLOC_PROTOTYPE) */ -#ifdef HAS_64K_LIMIT - if (size > 0xffff) { - PerlIO_printf(Perl_error_log, - "Reallocation too large: %lx\n", size) FLUSH; - my_exit(1); - } -#endif /* HAS_64K_LIMIT */ if (!size) { safesysfree(where); return NULL; @@ -289,13 +275,13 @@ Perl_safesyscalloc(MEM_SIZE count, MEM_SIZE size) dTHX; #endif Malloc_t ptr; -#if defined(PERL_TRACK_MEMPOOL) || defined(HAS_64K_LIMIT) || defined(DEBUGGING) +#if defined(PERL_TRACK_MEMPOOL) || defined(DEBUGGING) MEM_SIZE total_size = 0; #endif /* Even though calloc() for zero bytes is strange, be robust. */ if (size && (count <= MEM_SIZE_MAX / size)) { -#if defined(PERL_TRACK_MEMPOOL) || defined(HAS_64K_LIMIT) || defined(DEBUGGING) +#if defined(PERL_TRACK_MEMPOOL) || defined(DEBUGGING) total_size = size * count; #endif } @@ -307,13 +293,6 @@ Perl_safesyscalloc(MEM_SIZE count, MEM_SIZE size) else croak_memory_wrap(); #endif -#ifdef HAS_64K_LIMIT - if (total_size > 0xffff) { - PerlIO_printf(Perl_error_log, - "Allocation too large: %lx\n", total_size) FLUSH; - my_exit(1); - } -#endif /* HAS_64K_LIMIT */ #ifdef DEBUGGING if ((SSize_t)size < 0 || (SSize_t)count < 0) Perl_croak_nocontext("panic: calloc, size=%"UVuf", count=%"UVuf, @@ -2528,25 +2507,6 @@ Perl_my_fork(void) #endif /* HAS_FORK */ } -#ifdef DUMP_FDS -void -Perl_dump_fds(pTHX_ const char *const s) -{ - int fd; - Stat_t tmpstatbuf; - - PERL_ARGS_ASSERT_DUMP_FDS; - - PerlIO_printf(Perl_debug_log,"%s", s); - for (fd = 0; fd < 32; fd++) { - if (PerlLIO_fstat(fd,&tmpstatbuf) >= 0) - PerlIO_printf(Perl_debug_log," %d",fd); - } - PerlIO_printf(Perl_debug_log,"\n"); - return; -} -#endif /* DUMP_FDS */ - #ifndef HAS_DUP2 int dup2(int oldfd, int newfd) @@ -3464,7 +3424,7 @@ Perl_report_evil_fh(pTHX_ const GV *gv) * */ -#ifdef HAS_GNULIBC +#ifdef __GLIBC__ # ifndef STRUCT_TM_HASZONE # define STRUCT_TM_HASZONE # endif @@ -3797,9 +3757,7 @@ Perl_getcwd_sv(pTHX_ SV *sv) { #ifndef PERL_MICRO dVAR; -#ifndef INCOMPLETE_TAINTS SvTAINTED_on(sv); -#endif PERL_ARGS_ASSERT_GETCWD_SV; diff --git a/win32/wince.c b/win32/wince.c index a1e810d..15d80f9 100644 --- a/win32/wince.c +++ b/win32/wince.c @@ -2449,9 +2449,7 @@ XS(w32_GetCwd) EXTEND(SP,1); SvPOK_on(sv); ST(0) = sv; -#ifndef INCOMPLETE_TAINTS SvTAINTED_on(ST(0)); -#endif XSRETURN(1); } -- Perl5 Master Repository
