STRLEN len;
const char *p = NULL, *r = SvPV_const(sv, len);
+ if (len >= 1 && *r == '$') {
+ ++r;
+ --len;
+ s = strchr(s, '$');
+ if (!s)
+ return NULL;
+ }
+
p = strstr(s, r);
while (p) {
p += len;
const char *stash = HvNAME_get(PL_curstash);
STRLEN stashlen = HvNAMELEN_get(PL_curstash);
- if ((len < stashlen + 2) || name != strstr(name, stash)) {
+ if ((len < stashlen + 2) || strnNE(name, stash, stashlen)
+ || name[stashlen] != ':' || name[stashlen+1] != ':') {
/* Failed again ? Try to remove main */
stash = "main";
stashlen = 4;
- if ((len < stashlen + 2) || name != strstr(name, stash))
+ if ((len < stashlen + 2) || strnNE(name, stash, stashlen)
+ || name[stashlen] != ':' || name[stashlen+1] != ':')
goto done;
}
- if (name[stashlen] != ':' || name[stashlen+1] != ':')
- goto done;
sv_setpvn(sv, "$", 1);
stashlen += 2;
const char *s = PL_parser->oldbufptr, *t = PL_parser->bufptr - 1;
while (s < t && isSPACE(*s)) ++s;
- while (t > s && isSPACE(*t)) --t;
- sv = sv_2mortal(newSVpvn(s, t - s + 1));
-
- indirect_map_store(o, s, sv);
+ if (*s == '$' && ++s <= t) {
+ while (s < t && isSPACE(*s)) ++s;
+ while (s < t && isSPACE(*t)) --t;
+ sv = sv_2mortal(newSVpvn("$", 1));
+ sv_catpvn_nomg(sv, s, t - s + 1);
+ indirect_map_store(o, s, sv);
+ }
}
return o;