diff options
| author |   afresh1 <afresh1@openbsd.org> | 2014-11-17 20:56:47 +0000 |
|---|---|---|
| committer | afresh1 <afresh1@openbsd.org> | 2014-11-17 20:56:47 +0000 |
| commit | e5157e49389faebcb42b7237d55fbf096d9c2523 (patch) | |
| tree | 268e07adf82302172a9a375d4378d98581823a65 /gnu/usr.bin/perl/os2/os2.c | |
| parent | Import perl-5.20.1 (diff) | |
| download | wireguard-openbsd-e5157e49389faebcb42b7237d55fbf096d9c2523.tar.xz wireguard-openbsd-e5157e49389faebcb42b7237d55fbf096d9c2523.zip | |
Fix merge conflicts, remove extra files, match upstream perl-5.20.1
ok deraadt@ sthen@ espie@ miod@
Diffstat (limited to 'gnu/usr.bin/perl/os2/os2.c')
| -rw-r--r-- | gnu/usr.bin/perl/os2/os2.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gnu/usr.bin/perl/os2/os2.c b/gnu/usr.bin/perl/os2/os2.c index 574c5fc2cef..4ae39e7f2d7 100644 --- a/gnu/usr.bin/perl/os2/os2.c +++ b/gnu/usr.bin/perl/os2/os2.c @@ -2011,7 +2011,7 @@ mod2fname(pTHX_ SV *sv) if (SvTYPE(sv) != SVt_PVAV) Perl_croak_nocontext("Not array reference given to mod2fname"); - avlen = av_len((AV*)sv); + avlen = av_tindex((AV*)sv); if (avlen < 0) Perl_croak_nocontext("Empty array reference given to mod2fname"); @@ -3461,9 +3461,7 @@ XS(XS_Cwd_sys_cwd) RETVAL = _getcwd2(p, MAXPATHLEN); ST(0) = sv_newmortal(); sv_setpv(ST(0), RETVAL); -#ifndef INCOMPLETE_TAINTS SvTAINTED_on(ST(0)); -#endif } XSRETURN(1); } @@ -3595,10 +3593,8 @@ XS(XS_Cwd_sys_abspath) *t = 0; SvCUR_set(sv, t - SvPVX(sv)); } -#ifndef INCOMPLETE_TAINTS if (!items) SvTAINTED_on(ST(0)); -#endif } XSRETURN(1); } @@ -4261,7 +4257,7 @@ XS(XS_OS2_pipe) ST(0) = sv_newmortal(); { GV *gv = newGVgen("OS2::pipe"); - if ( do_open(gv, perltype, strlen(perltype), FALSE, 0, 0, perlio) ) + if ( do_open6(gv, perltype, strlen(perltype), perlio, NULL, 0) ) sv_setsv(ST(0), sv_bless(newRV((SV*)gv), gv_stashpv("IO::Handle",1))); else ST(0) = &PL_sv_undef; |