[src/netbsd-9]: src/external/bsd/nvi/dist/common Pull up following revision(s...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ef1a7c0eab1b
branches:  netbsd-9
changeset: 373695:ef1a7c0eab1b
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Feb 24 13:06:48 2023 +0000

description:
Pull up following revision(s) (requested by gutteridge in ticket #1606):

        external/bsd/nvi/dist/common/search.c: revision 1.5

search.c: correctly handle escaped backslashes

Addresses PR bin/57106 from Bosco G. G., who supplied the patch.

(This was also committed in the nvi2 sources:
https://github.com/lichray/nvi2/commit/e7054267a371d5caa81edb218f5c8388e11b5197)

diffstat:

 external/bsd/nvi/dist/common/search.c |  15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diffs (36 lines):

diff -r 8e3185e3239b -r ef1a7c0eab1b external/bsd/nvi/dist/common/search.c
--- a/external/bsd/nvi/dist/common/search.c     Wed Feb 22 19:57:11 2023 +0000
+++ b/external/bsd/nvi/dist/common/search.c     Fri Feb 24 13:06:48 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: search.c,v 1.4 2017/11/22 16:17:30 rin Exp $ */
+/*     $NetBSD: search.c,v 1.4.6.1 2023/02/24 13:06:48 martin Exp $ */
 /*-
  * Copyright (c) 1992, 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
@@ -16,7 +16,7 @@
 static const char sccsid[] = "Id: search.c,v 10.31 2001/06/25 15:19:12 skimo Exp  (Berkeley) Date: 2001/06/25 15:19:12 ";
 #endif /* not lint */
 #else
-__RCSID("$NetBSD: search.c,v 1.4 2017/11/22 16:17:30 rin Exp $");
+__RCSID("$NetBSD: search.c,v 1.4.6.1 2023/02/24 13:06:48 martin Exp $");
 #endif
 
 #include <sys/types.h>
@@ -110,9 +110,14 @@
                                        ++p;
                                break;
                        }
-                       if (plen > 1 && p[0] == '\\' && p[1] == delim) {
-                               ++p;
-                               --plen;
+                       if (plen > 1 && p[0] == '\\') {
+                               if(p[1] == delim) {
+                                       ++p;
+                                       --plen;
+                               } else if(p[1] == '\\') {
+                                       *t++ = *p++;
+                                       --plen;
+                               }
                        }
                }
                if (epp != NULL)