From 56d68f1e19ff848c889ecfa71d3a06340ff64892 Mon Sep 17 00:00:00 2001
From: afresh1 <afresh1@openbsd.org>
Date: Mon, 1 Mar 2021 23:19:42 +0000
Subject: Fix merge issues, remove excess files - match perl-5.32.1 dist

OK sthen@
---
 gnu/usr.bin/perl/os2/os2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gnu/usr.bin/perl/os2/os2.c')

diff --git a/gnu/usr.bin/perl/os2/os2.c b/gnu/usr.bin/perl/os2/os2.c
index ae987cb06f1..0c9fa17831b 100644
--- a/gnu/usr.bin/perl/os2/os2.c
+++ b/gnu/usr.bin/perl/os2/os2.c
@@ -1400,7 +1400,7 @@ do_spawn3(pTHX_ char *cmd, int execf, int flag)
 	goto doshell;
 
     for (s = cmd; *s; s++) {
-	if (*s != ' ' && !isALPHA(*s) && strchr("$&*(){}[]'\";\\|?<>~`\n",*s)) {
+	if (*s != ' ' && !isALPHA(*s) && memCHRs("$&*(){}[]'\";\\|?<>~`\n",*s)) {
 	    if (*s == '\n' && s[1] == '\0') {
 		*s = '\0';
 		break;
-- 
cgit v1.2.3-59-g8ed1b