diff options
author | Karl Williamson <khw@cpan.org> | 2017-04-24 20:39:02 -0600 |
---|---|---|
committer | Karl Williamson <khw@cpan.org> | 2017-11-06 12:50:06 -0700 |
commit | b80f8424dac589b620a81c0f35c30e0cf981c3ae (patch) | |
tree | 5dd3d843ac0f7918a1b139990228193f8789a92c /pp_ctl.c | |
parent | de62715824b6848c0aabf63dab4e7bcdc9945f9f (diff) | |
download | perl-b80f8424dac589b620a81c0f35c30e0cf981c3ae.tar.gz |
Add memENDPs and use it in core
This corresponds to memBEGINPs
Diffstat (limited to 'pp_ctl.c')
-rw-r--r-- | pp_ctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -3614,7 +3614,7 @@ S_doopen_pm(pTHX_ SV *name) if (!IS_SAFE_PATHNAME(p, namelen, "require")) return NULL; - if (namelen > 3 && memEQs(p + namelen - 3, 3, ".pm")) { + if (memENDPs(p, namelen, ".pm")) { SV *const pmcsv = sv_newmortal(); PerlIO * pmcio; @@ -4133,12 +4133,12 @@ S_require_file(pTHX_ SV *sv) SSize_t i; SV *const msg = newSVpvs_flags("", SVs_TEMP); SV *const inc = newSVpvs_flags("", SVs_TEMP); - const char *e = name + len - 3; /* possible .pm */ for (i = 0; i <= AvFILL(ar); i++) { sv_catpvs(inc, " "); sv_catsv(inc, *av_fetch(ar, i, TRUE)); } - if (e > name && _memEQs(e, ".pm")) { + if (memENDPs(name, len, ".pm")) { + const char *e = name + len - (sizeof(".pm") - 1); const char *c; bool utf8 = cBOOL(SvUTF8(sv)); |