This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
more taint fallout from change 24943
[perl5.git] / universal.c
index 829952a..507ab14 100644 (file)
@@ -1,7 +1,7 @@
 /*    universal.c
  *
  *    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- *    by Larry Wall and others
+ *    2005, by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -40,13 +40,16 @@ S_isa_lookup(pTHX_ HV *stash, const char *name, HV* name_stash,
     GV** gvp;
     HV* hv = Nullhv;
     SV* subgen = Nullsv;
+    const char *hvname;
 
     /* A stash/class can go by many names (ie. User == main::User), so 
        we compare the stash itself just in case */
     if (name_stash && (stash == name_stash))
         return &PL_sv_yes;
 
-    if (strEQ(HvNAME(stash), name))
+    hvname = HvNAME_get(stash);
+
+    if (strEQ(hvname, name))
        return &PL_sv_yes;
 
     if (strEQ(name, "UNIVERSAL"))
@@ -54,7 +57,7 @@ S_isa_lookup(pTHX_ HV *stash, const char *name, HV* name_stash,
 
     if (level > 100)
        Perl_croak(aTHX_ "Recursive inheritance detected in package '%s'",
-                  HvNAME(stash));
+                  hvname);
 
     gvp = (GV**)hv_fetch(stash, "::ISA::CACHE::", 14, FALSE);
 
@@ -66,13 +69,13 @@ S_isa_lookup(pTHX_ HV *stash, const char *name, HV* name_stash,
            SV** svp = (SV**)hv_fetch(hv, name, len, FALSE);
            if (svp && (sv = *svp) != (SV*)&PL_sv_undef) {
                DEBUG_o( Perl_deb(aTHX_ "Using cached ISA %s for package %s\n",
-                                 name, HvNAME(stash)) );
+                                 name, hvname) );
                return sv;
            }
        }
        else {
            DEBUG_o( Perl_deb(aTHX_ "ISA Cache in package %s is stale\n",
-                             HvNAME(stash)) );
+                             hvname) );
            hv_clear(hv);
            sv_setiv(subgen, PL_sub_generation);
        }
@@ -106,8 +109,8 @@ S_isa_lookup(pTHX_ HV *stash, const char *name, HV* name_stash,
                if (!basestash) {
                    if (ckWARN(WARN_MISC))
                        Perl_warner(aTHX_ packWARN(WARN_SYNTAX),
-                            "Can't locate package %"SVf" for @%s::ISA",
-                           sv, HvNAME(stash));
+                                   "Can't locate package %"SVf" for @%s::ISA",
+                                   sv, hvname);
                    continue;
                }
                if (&PL_sv_yes == isa_lookup(basestash, name, name_stash, 
@@ -137,13 +140,10 @@ for class names as well as for objects.
 bool
 Perl_sv_derived_from(pTHX_ SV *sv, const char *name)
 {
-    char *type;
-    HV *stash;
+    const char *type = Nullch;
+    HV *stash = Nullhv;
     HV *name_stash;
 
-    stash = Nullhv;
-    type = Nullch;
-
     if (SvGMAGICAL(sv))
         mg_get(sv) ;
 
@@ -168,15 +168,20 @@ Perl_sv_derived_from(pTHX_ SV *sv, const char *name)
 
 #include "XSUB.h"
 
-void XS_UNIVERSAL_isa(pTHX_ CV *cv);
-void XS_UNIVERSAL_can(pTHX_ CV *cv);
-void XS_UNIVERSAL_VERSION(pTHX_ CV *cv);
+PERL_XS_EXPORT_C void XS_UNIVERSAL_isa(pTHX_ CV *cv);
+PERL_XS_EXPORT_C void XS_UNIVERSAL_can(pTHX_ CV *cv);
+PERL_XS_EXPORT_C void XS_UNIVERSAL_VERSION(pTHX_ CV *cv);
 XS(XS_version_new);
 XS(XS_version_stringify);
 XS(XS_version_numify);
+XS(XS_version_normal);
 XS(XS_version_vcmp);
 XS(XS_version_boolean);
+#ifdef HASATTRIBUTE_NORETURN
+XS(XS_version_noop) __attribute__noreturn__;
+#else
 XS(XS_version_noop);
+#endif
 XS(XS_version_is_alpha);
 XS(XS_version_qv);
 XS(XS_utf8_is_utf8);
@@ -199,7 +204,7 @@ XS(XS_Internals_HvREHASH);
 void
 Perl_boot_core_UNIVERSAL(pTHX)
 {
-    char *file = __FILE__;
+    const char file[] = __FILE__;
 
     newXS("UNIVERSAL::isa",             XS_UNIVERSAL_isa,         file);
     newXS("UNIVERSAL::can",             XS_UNIVERSAL_can,         file);
@@ -214,6 +219,7 @@ Perl_boot_core_UNIVERSAL(pTHX)
        newXS("version::stringify", XS_version_stringify, file);
        newXS("version::(0+", XS_version_numify, file);
        newXS("version::numify", XS_version_numify, file);
+       newXS("version::normal", XS_version_normal, file);
        newXS("version::(cmp", XS_version_vcmp, file);
        newXS("version::(<=>", XS_version_vcmp, file);
        newXS("version::vcmp", XS_version_vcmp, file);
@@ -249,8 +255,7 @@ XS(XS_UNIVERSAL_isa)
 {
     dXSARGS;
     SV *sv;
-    char *name;
-    STRLEN n_a;
+    const char *name;
 
     if (items != 2)
        Perl_croak(aTHX_ "Usage: UNIVERSAL::isa(reference, kind)");
@@ -264,7 +269,7 @@ XS(XS_UNIVERSAL_isa)
                || (SvGMAGICAL(sv) && SvPOKp(sv) && SvCUR(sv))))
        XSRETURN_UNDEF;
 
-    name = (char *)SvPV(ST(1),n_a);
+    name = SvPV_nolen_const(ST(1));
 
     ST(0) = boolSV(sv_derived_from(sv, name));
     XSRETURN(1);
@@ -274,10 +279,9 @@ XS(XS_UNIVERSAL_can)
 {
     dXSARGS;
     SV   *sv;
-    char *name;
+    const char *name;
     SV   *rv;
     HV   *pkg = NULL;
-    STRLEN n_a;
 
     if (items != 2)
        Perl_croak(aTHX_ "Usage: UNIVERSAL::can(object-ref, method)");
@@ -291,7 +295,7 @@ XS(XS_UNIVERSAL_can)
                || (SvGMAGICAL(sv) && SvPOKp(sv) && SvCUR(sv))))
        XSRETURN_UNDEF;
 
-    name = (char *)SvPV(ST(1),n_a);
+    name = SvPV_nolen_const(ST(1));
     rv = &PL_sv_undef;
 
     if (SvROK(sv)) {
@@ -320,7 +324,7 @@ XS(XS_UNIVERSAL_VERSION)
     GV **gvp;
     GV *gv;
     SV *sv;
-    char *undef;
+    const char *undef;
 
     if (SvROK(ST(0))) {
         sv = (SV*)SvRV(ST(0));
@@ -348,19 +352,18 @@ XS(XS_UNIVERSAL_VERSION)
     }
 
     if (items > 1) {
-       STRLEN len;
        SV *req = ST(1);
 
        if (undef) {
-            if (pkg)
-                 Perl_croak(aTHX_
-                            "%s does not define $%s::VERSION--version check failed",
-                            HvNAME(pkg), HvNAME(pkg));
-            else {
-                 char *str = SvPVx(ST(0), len);
-
-                 Perl_croak(aTHX_
-                            "%s defines neither package nor VERSION--version check failed", str);
+           if (pkg) {
+               const char *name = HvNAME_get(pkg);
+               Perl_croak(aTHX_
+                          "%s does not define $%s::VERSION--version check failed",
+                          name, name);
+           } else {
+               Perl_croak(aTHX_
+                            "%s defines neither package nor VERSION--version check failed",
+                            SvPVx_nolen_const(ST(0)) );
             }
        }
 
@@ -374,7 +377,7 @@ XS(XS_UNIVERSAL_VERSION)
 
        if ( vcmp( req, sv ) > 0 )
            Perl_croak(aTHX_ "%s version %"SVf" (%"SVf") required--"
-                   "this is only version %"SVf" (%"SVf")", HvNAME(pkg),
+                   "this is only version %"SVf" (%"SVf")", HvNAME_get(pkg),
                    vnumify(req),vnormal(req),vnumify(sv),vnormal(sv));
     }
 
@@ -394,18 +397,38 @@ XS(XS_version_new)
        Perl_croak(aTHX_ "Usage: version::new(class, version)");
     SP -= items;
     {
-       char *  class = (char *)SvPV_nolen(ST(0));
         SV *vs = ST(1);
        SV *rv;
-       if (items == 3 )
-       {
-           vs = sv_newmortal(); 
-           Perl_sv_setpvf(aTHX_ vs,"v%s",SvPV_nolen(ST(2)));
+       const char *classname;
+
+       /* get the class if called as an object method */
+       if ( sv_isobject(ST(0)) ) {
+           classname = HvNAME(SvSTASH(SvRV(ST(0))));
+       }
+       else {
+           classname = (char *)SvPV_nolen(ST(0));
+       }
+
+       if ( items == 1 ) {
+           /* no parameter provided */
+           if ( sv_isobject(ST(0)) ) {
+               /* copy existing object */
+               vs = ST(0);
+           }
+           else {
+               /* create empty object */
+               vs = sv_newmortal();
+               sv_setpvn(vs,"",0);
+           }
+       }
+       else if ( items == 3 ) {
+           vs = sv_newmortal();
+           Perl_sv_setpvf(aTHX_ vs,"v%s",SvPV_nolen_const(ST(2)));
        }
 
        rv = new_version(vs);
-       if ( strcmp(class,"version") != 0 ) /* inherited new() */
-           sv_bless(rv, gv_stashpv(class,TRUE));
+       if ( strcmp(classname,"version") != 0 ) /* inherited new() */
+           sv_bless(rv, gv_stashpv(classname,TRUE));
 
        PUSHs(sv_2mortal(rv));
        PUTBACK;
@@ -420,11 +443,10 @@ XS(XS_version_stringify)
          Perl_croak(aTHX_ "Usage: version::stringify(lobj, ...)");
      SP -= items;
      {
-         SV *  lobj;
+         SV *  lobj = Nullsv;
 
          if (sv_derived_from(ST(0), "version")) {
-              SV *tmp = SvRV(ST(0));
-              lobj = tmp;
+              lobj = SvRV(ST(0));
          }
          else
               Perl_croak(aTHX_ "lobj is not of type version");
@@ -443,11 +465,10 @@ XS(XS_version_numify)
          Perl_croak(aTHX_ "Usage: version::numify(lobj, ...)");
      SP -= items;
      {
-         SV *  lobj;
+         SV *  lobj = Nullsv;
 
          if (sv_derived_from(ST(0), "version")) {
-              SV *tmp = SvRV(ST(0));
-              lobj = tmp;
+              lobj = SvRV(ST(0));
          }
          else
               Perl_croak(aTHX_ "lobj is not of type version");
@@ -459,6 +480,28 @@ XS(XS_version_numify)
      }
 }
 
+XS(XS_version_normal)
+{
+     dXSARGS;
+     if (items < 1)
+         Perl_croak(aTHX_ "Usage: version::normal(lobj, ...)");
+     SP -= items;
+     {
+         SV *  lobj = Nullsv;
+
+         if (sv_derived_from(ST(0), "version")) {
+              lobj = SvRV(ST(0));
+         }
+         else
+              Perl_croak(aTHX_ "lobj is not of type version");
+
+         PUSHs(sv_2mortal(vnormal(lobj)));
+
+         PUTBACK;
+         return;
+     }
+}
+
 XS(XS_version_vcmp)
 {
      dXSARGS;
@@ -466,11 +509,10 @@ XS(XS_version_vcmp)
          Perl_croak(aTHX_ "Usage: version::vcmp(lobj, ...)");
      SP -= items;
      {
-         SV *  lobj;
+         SV *  lobj = Nullsv;
 
          if (sv_derived_from(ST(0), "version")) {
-              SV *tmp = SvRV(ST(0));
-              lobj = tmp;
+              lobj = SvRV(ST(0));
          }
          else
               Perl_croak(aTHX_ "lobj is not of type version");
@@ -511,11 +553,10 @@ XS(XS_version_boolean)
          Perl_croak(aTHX_ "Usage: version::boolean(lobj, ...)");
      SP -= items;
      {
-         SV *  lobj;
+         SV *  lobj = Nullsv;
 
          if (sv_derived_from(ST(0), "version")) {
-              SV *tmp = SvRV(ST(0));
-              lobj = tmp;
+              lobj = SvRV(ST(0));
          }
          else
               Perl_croak(aTHX_ "lobj is not of type version");
@@ -533,25 +574,16 @@ XS(XS_version_boolean)
 
 XS(XS_version_noop)
 {
-     dXSARGS;
-     if (items < 1)
-         Perl_croak(aTHX_ "Usage: version::noop(lobj, ...)");
-     {
-         SV *  lobj;
-
-         if (sv_derived_from(ST(0), "version")) {
-              SV *tmp = SvRV(ST(0));
-              lobj = tmp;
-         }
-         else
-              Perl_croak(aTHX_ "lobj is not of type version");
-
-         {
-              Perl_croak(aTHX_ "operation not supported with version object");
-         }
-
-     }
-     XSRETURN_EMPTY;
+    dXSARGS;
+    if (items < 1)
+       Perl_croak(aTHX_ "Usage: version::noop(lobj, ...)");
+    if (sv_derived_from(ST(0), "version"))
+       Perl_croak(aTHX_ "operation not supported with version object");
+    else
+       Perl_croak(aTHX_ "lobj is not of type version");
+#ifndef HASATTRIBUTE_NORETURN
+    XSRETURN_EMPTY;
+#endif
 }
 
 XS(XS_version_is_alpha)
@@ -561,18 +593,14 @@ XS(XS_version_is_alpha)
        Perl_croak(aTHX_ "Usage: version::is_alpha(lobj)");
     SP -= items;
     {
-       SV *lobj;
+       SV * lobj = Nullsv;
 
-        if (sv_derived_from(ST(0), "version")) {
-                SV *tmp = SvRV(ST(0));
-               lobj = tmp;
-        }
+        if (sv_derived_from(ST(0), "version"))
+               lobj = ST(0);
         else
                 Perl_croak(aTHX_ "lobj is not of type version");
 {
-    I32 len = av_len((AV *)lobj);
-    I32 digit = SvIVX(*av_fetch((AV *)lobj, len, 0));
-    if ( digit < 0 )
+    if ( hv_exists((HV*)SvRV(lobj), "alpha", 5 ) )
        XSRETURN_YES;
     else
        XSRETURN_NO;
@@ -625,7 +653,7 @@ XS(XS_utf8_is_utf8)
      if (items != 1)
          Perl_croak(aTHX_ "Usage: utf8::is_utf8(sv)");
      {
-         SV *  sv = ST(0);
+          const SV *sv = ST(0);
          {
               if (SvUTF8(sv))
                    XSRETURN_YES;
@@ -645,8 +673,8 @@ XS(XS_utf8_valid)
          SV *  sv = ST(0);
          {
               STRLEN len;
-              char *s = SvPV(sv,len);
-              if (!SvUTF8(sv) || is_utf8_string((U8*)s,len))
+              const char *s = SvPV_const(sv,len);
+              if (!SvUTF8(sv) || is_utf8_string((const U8*)s,len))
                    XSRETURN_YES;
               else
                    XSRETURN_NO;
@@ -675,9 +703,7 @@ XS(XS_utf8_decode)
        Perl_croak(aTHX_ "Usage: utf8::decode(sv)");
     {
        SV *    sv = ST(0);
-       bool    RETVAL;
-
-       RETVAL = sv_utf8_decode(sv);
+       const bool RETVAL = sv_utf8_decode(sv);
        ST(0) = boolSV(RETVAL);
        sv_2mortal(ST(0));
     }
@@ -707,16 +733,9 @@ XS(XS_utf8_downgrade)
        Perl_croak(aTHX_ "Usage: utf8::downgrade(sv, failok=0)");
     {
        SV *    sv = ST(0);
-       bool    failok;
-       bool    RETVAL;
+        const bool failok = (items < 2) ? 0 : (int)SvIV(ST(1));
+        const bool RETVAL = sv_utf8_downgrade(sv, failok);
 
-       if (items < 2)
-           failok = 0;
-       else {
-           failok = (int)SvIV(ST(1));
-       }
-
-       RETVAL = sv_utf8_downgrade(sv, failok);
        ST(0) = boolSV(RETVAL);
        sv_2mortal(ST(0));
     }
@@ -726,7 +745,7 @@ XS(XS_utf8_downgrade)
 XS(XS_utf8_native_to_unicode)
 {
  dXSARGS;
- UV uv = SvUV(ST(0));
const UV uv = SvUV(ST(0));
 
  if (items > 1)
      Perl_croak(aTHX_ "Usage: utf8::native_to_unicode(sv)");
@@ -738,7 +757,7 @@ XS(XS_utf8_native_to_unicode)
 XS(XS_utf8_unicode_to_native)
 {
  dXSARGS;
- UV uv = SvUV(ST(0));
const UV uv = SvUV(ST(0));
 
  if (items > 1)
      Perl_croak(aTHX_ "Usage: utf8::unicode_to_native(sv)");
@@ -751,6 +770,7 @@ XS(XS_Internals_SvREADONLY) /* This is dangerous stuff. */
 {
     dXSARGS;
     SV *sv = SvRV(ST(0));
+
     if (items == 1) {
         if (SvREADONLY(sv))
             XSRETURN_YES;
@@ -775,6 +795,7 @@ XS(XS_Internals_SvREFCNT)   /* This is dangerous stuff. */
 {
     dXSARGS;
     SV *sv = SvRV(ST(0));
+
     if (items == 1)
         XSRETURN_IV(SvREFCNT(sv) - 1); /* Minus the ref created for us. */
     else if (items == 2) {
@@ -789,6 +810,7 @@ XS(XS_Internals_hv_clear_placehold)
 {
     dXSARGS;
     HV *hv = (HV *) SvRV(ST(0));
+
     if (items != 1)
        Perl_croak(aTHX_ "Usage: UNIVERSAL::hv_clear_placeholders(hv)");
     hv_clear_placeholders(hv);
@@ -797,7 +819,7 @@ XS(XS_Internals_hv_clear_placehold)
 
 XS(XS_Regexp_DESTROY)
 {
-
+    PERL_UNUSED_ARG(cv);
 }
 
 XS(XS_PerlIO_get_layers)
@@ -820,7 +842,7 @@ XS(XS_PerlIO_get_layers)
                  SV **varp = svp;
                  SV **valp = svp + 1;
                  STRLEN klen;
-                 char *key = SvPV(*varp, klen);
+                  const char *key = SvPV_const(*varp, klen);
 
                  switch (*key) {
                  case 'i':
@@ -885,10 +907,12 @@ XS(XS_PerlIO_get_layers)
                  flgok = flgsvp && *flgsvp && SvIOK(*flgsvp);
 
                  if (details) {
-                      XPUSHs(namok ?
-                            newSVpv(SvPVX(*namsvp), 0) : &PL_sv_undef);
-                      XPUSHs(argok ?
-                            newSVpv(SvPVX(*argsvp), 0) : &PL_sv_undef);
+                      XPUSHs(namok
+                             ? newSVpvn(SvPVX_const(*namsvp), SvCUR(*namsvp))
+                             : &PL_sv_undef);
+                      XPUSHs(argok
+                             ? newSVpvn(SvPVX_const(*argsvp), SvCUR(*argsvp))
+                             : &PL_sv_undef);
                       if (flgok)
                            XPUSHi(SvIVX(*flgsvp));
                       else
@@ -929,7 +953,9 @@ XS(XS_Internals_hash_seed)
 {
     /* Using dXSARGS would also have dITEM and dSP,
      * which define 2 unused local variables.  */
-    dMARK; dAX;
+    dAXMARK;
+    PERL_UNUSED_ARG(cv);
+    PERL_UNUSED_VAR(mark);
     XSRETURN_UV(PERL_HASH_SEED);
 }
 
@@ -937,7 +963,9 @@ XS(XS_Internals_rehash_seed)
 {
     /* Using dXSARGS would also have dITEM and dSP,
      * which define 2 unused local variables.  */
-    dMARK; dAX;
+    dAXMARK;
+    PERL_UNUSED_ARG(cv);
+    PERL_UNUSED_VAR(mark);
     XSRETURN_UV(PL_rehash_seed);
 }
 
@@ -945,7 +973,7 @@ XS(XS_Internals_HvREHASH)   /* Subject to change  */
 {
     dXSARGS;
     if (SvROK(ST(0))) {
-       HV *hv = (HV *) SvRV(ST(0));
+       const HV *hv = (HV *) SvRV(ST(0));
        if (items == 1 && SvTYPE(hv) == SVt_PVHV) {
            if (HvREHASH(hv))
                XSRETURN_YES;
@@ -955,3 +983,13 @@ XS(XS_Internals_HvREHASH)  /* Subject to change  */
     }
     Perl_croak(aTHX_ "Internals::HvREHASH $hashref");
 }
+
+/*
+ * Local variables:
+ * c-indentation-style: bsd
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ *
+ * ex: set ts=8 sts=4 sw=4 noet:
+ */