Fix dynamic loading (and argv[0]) under AmigaOS

[p5sagit/p5-mst-13.2.git] / mg.c

diff --git a/mg.c b/mg.c
index b4b8e3e..54ca044 100644 (file)
--- a/mg.c
+++ b/mg.c
@@ -20,7 +20,7 @@
 # include <unistd.h>
 #endif
 
-#ifdef HAS_GETGROUPS
+#if defined(HAS_GETGROUPS) || defined(HAS_SETGROUPS)
 #  ifndef NGROUPS
 #    define NGROUPS 32
 #  endif
@@ -307,7 +307,7 @@ MAGIC *mg;
            if (rx->subend && (s = rx->endp[0])) {
                i = rx->subend - s;
                if (i >= 0)
-                   return 0;
+                   return i;
            }
        }
        return 0;
@@ -764,8 +764,11 @@ MAGIC* mg;
            *svp = 0;
     }
     else {
-       if(hints & HINT_STRICT_REFS)
-               die(no_symref,s,"a subroutine");
+       /*
+        * We should warn if HINT_STRICT_REFS, but without
+        * access to a known hint bit in a known OP, we can't
+        * tell whether HINT_STRICT_REFS is in force or not.
+        */
        if (!strchr(s,':') && !strchr(s,'\'')) {
            sprintf(tokenbuf, "main::%s",s);
            sv_setpv(sv,tokenbuf);
@@ -1193,7 +1196,7 @@ SV* sv;
     }
     else {
        AV* av = (AV*)LvTARG(sv);
-       if (LvTARGLEN(sv) < 0 && (I32)LvTARGOFF(sv) > AvFILL(av))
+       if ((I32)LvTARGLEN(sv) < 0 && (I32)LvTARGOFF(sv) > AvFILL(av))
            LvTARG(sv) = Nullsv;        /* array can't be extended */
        else {
            SV** svp = av_fetch(av, LvTARGOFF(sv), TRUE);
@@ -1515,7 +1518,29 @@ MAGIC* mg;
        tainting |= (uid && (euid != uid || egid != gid));
        break;
     case ')':
+#ifdef HAS_SETGROUPS
+       {
+           char *p = SvPV(sv, na);
+           Groups_t gary[NGROUPS];
+
+           SET_NUMERIC_STANDARD();
+           while (isSPACE(*p))
+               ++p;
+           egid = I_V(atof(p));
+           for (i = 0; i < NGROUPS; ++i) {
+               while (*p && !isSPACE(*p))
+                   ++p;
+               while (isSPACE(*p))
+                   ++p;
+               if (!*p)
+                   break;
+               gary[i] = I_V(atof(p));
+           }
+           (void)setgroups(i, gary);
+       }
+#else  /* HAS_SETGROUPS */
        egid = SvIOK(sv) ? SvIVX(sv) : sv_2iv(sv);
+#endif /* HAS_SETGROUPS */
        if (delaymagic) {
            delaymagic |= DM_EGID;
            break;                              /* don't do magic till later */