In the UTF-8 branch of crypt() the extra \0 byte is required,

[perl5.git] / run.c

diff --git a/run.c b/run.c
index 811e41a..2a204e9 100644 (file)
--- a/run.c
+++ b/run.c
@@ -1,6 +1,6 @@
 /*    run.c
  *
- *    Copyright (c) 1991-1997, Larry Wall
+ *    Copyright (c) 1991-2001, Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -8,6 +8,7 @@
  */
 
 #include "EXTERN.h"
+#define PERL_IN_RUN_C
 #include "perl.h"
 
 /*
@@ -16,118 +17,14 @@
  * know.  Run now!  Hope is in speed!"  --Gandalf
  */
 
-#ifdef PERL_OBJECT
-#define CALLOP this->*op
-#else
-#define CALLOP *op
-#endif
-
 int
-runops_standard(void) {
-    dTHR;
-
-    while ( op = (CALLOP->op_ppaddr)(ARGS) ) ;
-
-    TAINT_NOT;
-    return 0;
-}
-
-dEXT char **watchaddr = 0;
-dEXT char *watchok;
-
-#ifndef PERL_OBJECT
-static void debprof _((OP*o));
-#endif
-
-int
-runops_debug(void)
+Perl_runops_standard(pTHX)
 {
-#ifdef DEBUGGING
-    dTHR;
-    if (!op) {
-       warn("NULL OP IN RUN");
-       return 0;
+    while ((PL_op = CALL_FPTR(PL_op->op_ppaddr)(aTHX))) {
+       PERL_ASYNC_CHECK();
     }
 
-    do {
-       if (debug) {
-           if (watchaddr != 0 && *watchaddr != watchok)
-               PerlIO_printf(Perl_debug_log, "WARNING: %lx changed from %lx to %lx\n",
-                   (long)watchaddr, (long)watchok, (long)*watchaddr);
-           DEBUG_s(debstack());
-           DEBUG_t(debop(op));
-           DEBUG_P(debprof(op));
-       }
-    } while ( op = (CALLOP->op_ppaddr)(ARGS) );
-
     TAINT_NOT;
     return 0;
-#else
-    return runops_standard();
-#endif /* DEBUGGING */
 }
 
-I32
-debop(OP *o)
-{
-#ifdef DEBUGGING
-    SV *sv;
-    deb("%s", op_name[o->op_type]);
-    switch (o->op_type) {
-    case OP_CONST:
-       PerlIO_printf(Perl_debug_log, "(%s)", SvPEEK(cSVOPo->op_sv));
-       break;
-    case OP_GVSV:
-    case OP_GV:
-       if (cGVOPo->op_gv) {
-           sv = NEWSV(0,0);
-           gv_fullname3(sv, cGVOPo->op_gv, Nullch);
-           PerlIO_printf(Perl_debug_log, "(%s)", SvPV(sv, na));
-           SvREFCNT_dec(sv);
-       }
-       else
-           PerlIO_printf(Perl_debug_log, "(NULL)");
-       break;
-    default:
-       break;
-    }
-    PerlIO_printf(Perl_debug_log, "\n");
-#endif /* DEBUGGING */
-    return 0;
-}
-
-void
-watch(char **addr)
-{
-#ifdef DEBUGGING
-    watchaddr = addr;
-    watchok = *addr;
-    PerlIO_printf(Perl_debug_log, "WATCHING, %lx is currently %lx\n",
-       (long)watchaddr, (long)watchok);
-#endif /* DEBUGGING */
-}
-
-STATIC void
-debprof(OP *o)
-{
-#ifdef DEBUGGING
-    if (!profiledata)
-       New(000, profiledata, MAXO, U32);
-    ++profiledata[o->op_type];
-#endif /* DEBUGGING */
-}
-
-void
-debprofdump(void)
-{
-#ifdef DEBUGGING
-    unsigned i;
-    if (!profiledata)
-       return;
-    for (i = 0; i < MAXO; i++) {
-       if (profiledata[i])
-           PerlIO_printf(Perl_debug_log,
-                         "%u\t%lu\n", i, (unsigned long)profiledata[i]);
-    }
-#endif /* DEBUGGING */
-}