diff options
| author |   afresh1 <afresh1@openbsd.org> | 2021-03-01 23:19:42 +0000 |
|---|---|---|
| committer | afresh1 <afresh1@openbsd.org> | 2021-03-01 23:19:42 +0000 |
| commit | 56d68f1e19ff848c889ecfa71d3a06340ff64892 (patch) | |
| tree | 272372e9e82dd675d06054187c7f04b32fe71acc /gnu/usr.bin/perl/cygwin/cygwin.c | |
| parent | Import perl-5.32.1 (diff) | |
| download | wireguard-openbsd-56d68f1e19ff848c889ecfa71d3a06340ff64892.tar.xz wireguard-openbsd-56d68f1e19ff848c889ecfa71d3a06340ff64892.zip | |
Fix merge issues, remove excess files - match perl-5.32.1 dist
OK sthen@
Diffstat (limited to 'gnu/usr.bin/perl/cygwin/cygwin.c')
| -rw-r--r-- | gnu/usr.bin/perl/cygwin/cygwin.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnu/usr.bin/perl/cygwin/cygwin.c b/gnu/usr.bin/perl/cygwin/cygwin.c index fae90af0001..56094b9b950 100644 --- a/gnu/usr.bin/perl/cygwin/cygwin.c +++ b/gnu/usr.bin/perl/cygwin/cygwin.c @@ -112,8 +112,8 @@ do_spawn (char *cmd) if (strBEGINs (cmd,"exec") && isSPACE (cmd[4])) goto doshell; for (s=cmd; *s && isALPHA (*s); s++) ; /* catch VAR=val gizmo */ - if (*s=='=') - goto doshell; + if (*s=='=') + goto doshell; for (s=cmd; *s; s++) if (strchr (metachars,*s)) @@ -219,7 +219,7 @@ XS(Cygwin_cwd) dXSARGS; char *cwd; - /* See http://rt.perl.org/rt3/Ticket/Display.html?id=38628 + /* See https://github.com/Perl/perl5/issues/8345 There is Cwd->cwd() usage in the wild, and previous versions didn't die. */ if(items > 1) @@ -302,7 +302,7 @@ XS(XS_Cygwin_win_to_posix_path) */ if (isutf8) { int what = absolute_flag ? CCP_WIN_W_TO_POSIX : CCP_WIN_W_TO_POSIX | CCP_RELATIVE; - int wlen = sizeof(wchar_t)*(len + 260 + 1001); + STRLEN wlen = sizeof(wchar_t)*(len + 260 + 1001); wchar_t *wpath = (wchar_t *) safemalloc(sizeof(wchar_t)*len); wchar_t *wbuf = (wchar_t *) safemalloc(wlen); if (!IN_BYTES) { @@ -333,7 +333,7 @@ XS(XS_Cygwin_win_to_posix_path) } /* utf16_to_utf8(*p, *d, bytlen, *newlen) */ posix_path = (char *) safemalloc(wlen*3); - Perl_utf16_to_utf8(aTHX_ (U8*)&wpath, (U8*)posix_path, (I32)wlen*2, (I32*)&len); + Perl_utf16_to_utf8(aTHX_ (U8*)&wpath, (U8*)posix_path, wlen*2, &len); /* wlen = wcsrtombs(NULL, (const wchar_t **)&wbuf, wlen, NULL); posix_path = (char *) safemalloc(wlen+1); |