diff options
| author |   afresh1 <afresh1@openbsd.org> | 2014-11-17 20:52:31 +0000 |
|---|---|---|
| committer | afresh1 <afresh1@openbsd.org> | 2014-11-17 20:52:31 +0000 |
| commit | 6fb12b7054efc6b436584db6cef9c2f85c0d7e27 (patch) | |
| tree | aa09a524574ec7ae2f521a24573deeecb78ff66a /gnu/usr.bin/perl/cygwin/cygwin.c | |
| parent | Add the Cammelia cipher to libcrypto. (diff) | |
| download | wireguard-openbsd-6fb12b7054efc6b436584db6cef9c2f85c0d7e27.tar.xz wireguard-openbsd-6fb12b7054efc6b436584db6cef9c2f85c0d7e27.zip | |
Import perl-5.20.1
Diffstat (limited to 'gnu/usr.bin/perl/cygwin/cygwin.c')
| -rw-r--r-- | gnu/usr.bin/perl/cygwin/cygwin.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gnu/usr.bin/perl/cygwin/cygwin.c b/gnu/usr.bin/perl/cygwin/cygwin.c index 87401d1daba..59aa7304480 100644 --- a/gnu/usr.bin/perl/cygwin/cygwin.c +++ b/gnu/usr.bin/perl/cygwin/cygwin.c @@ -2,6 +2,7 @@ * Cygwin extras */ +#define PERLIO_NOT_STDIO 0 #include "EXTERN.h" #include "perl.h" #undef USE_DYNAMIC_LOADING @@ -156,7 +157,7 @@ wide_to_utf8(const wchar_t *wbuf) char *oldlocale = setlocale(LC_CTYPE, NULL); setlocale(LC_CTYPE, "utf-8"); - /* uvuni_to_utf8(buf, chr) or Encoding::_bytes_to_utf8(sv, "UCS-2BE"); */ + /* uvchr_to_utf8(buf, chr) or Encoding::_bytes_to_utf8(sv, "UCS-2BE"); */ wlen = wcsrtombs(NULL, (const wchar_t **)&wbuf, wlen, NULL); buf = (char *) safemalloc(wlen+1); wcsrtombs(buf, (const wchar_t **)&wbuf, wlen, NULL); @@ -176,7 +177,7 @@ utf8_to_wide(const char *buf) setlocale(LC_CTYPE, "utf-8"); wbuf = (wchar_t *) safemalloc(wlen); - /* utf8_to_uvuni_buf(pathname, pathname + wlen, wpath) or Encoding::_utf8_to_bytes(sv, "UCS-2BE"); */ + /* utf8_to_uvchr_buf(pathname, pathname + wlen, wpath) or Encoding::_utf8_to_bytes(sv, "UCS-2BE"); */ wlen = mbsrtowcs(wbuf, (const char**)&buf, wlen, &mbs); if (oldlocale) setlocale(LC_CTYPE, oldlocale); @@ -199,9 +200,7 @@ XS(Cygwin_cwd) if((cwd = getcwd(NULL, -1))) { ST(0) = sv_2mortal(newSVpv(cwd, 0)); free(cwd); -#ifndef INCOMPLETE_TAINTS SvTAINTED_on(ST(0)); -#endif XSRETURN(1); } XSRETURN_UNDEF; @@ -283,7 +282,7 @@ XS(XS_Cygwin_win_to_posix_path) mbstate_t mbs; char *oldlocale = setlocale(LC_CTYPE, NULL); setlocale(LC_CTYPE, "utf-8"); - /* utf8_to_uvuni_buf(src_path, src_path + wlen, wpath) or Encoding::_utf8_to_bytes(sv, "UCS-2BE"); */ + /* utf8_to_uvchr_buf(src_path, src_path + wlen, wpath) or Encoding::_utf8_to_bytes(sv, "UCS-2BE"); */ wlen = mbsrtowcs(wpath, (const char**)&src_path, wlen, &mbs); if (wlen > 0) err = cygwin_conv_path(what, wpath, wbuf, wlen); @@ -370,7 +369,7 @@ XS(XS_Cygwin_posix_to_win_path) setlocale(LC_CTYPE, "utf-8"); if (!IN_BYTES) { mbstate_t mbs; - /* utf8_to_uvuni_buf(src_path, src_path + wlen, wpath) or Encoding::_utf8_to_bytes(sv, "UCS-2BE"); */ + /* utf8_to_uvchr_buf(src_path, src_path + wlen, wpath) or Encoding::_utf8_to_bytes(sv, "UCS-2BE"); */ wlen = mbsrtowcs(wpath, (const char**)&src_path, wlen, &mbs); if (wlen > 0) err = cygwin_conv_path(what, wpath, wbuf, wlen); |