[src/netbsd-3]: src/usr.bin/vi/ex Pull up following revision(s) (requested by...

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

details:   https://anonhg.NetBSD.org/src/rev/22659d5e44e3
branches:  netbsd-3
changeset: 577391:22659d5e44e3
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Oct 21 13:17:03 2005 +0000

description:
Pull up following revision(s) (requested by aymeric in ticket #898):
        usr.bin/vi/ex/ex_argv.c: revision 1.16
the last revision introduced a bug in the handling of escape characters
while
trying to correct a corner case. I will work on a final solution later.
Thanks to David Brownlee for noticing and notifying me.

diffstat:

 usr.bin/vi/ex/ex_argv.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r 613caae35a74 -r 22659d5e44e3 usr.bin/vi/ex/ex_argv.c
--- a/usr.bin/vi/ex/ex_argv.c   Fri Oct 21 13:15:35 2005 +0000
+++ b/usr.bin/vi/ex/ex_argv.c   Fri Oct 21 13:17:03 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ex_argv.c,v 1.12.2.3 2005/10/15 15:41:50 riz Exp $     */
+/*     $NetBSD: ex_argv.c,v 1.12.2.4 2005/10/21 13:17:03 tron Exp $    */
 
 /*-
  * Copyright (c) 1993, 1994
@@ -16,7 +16,7 @@
 #if 0
 static const char sccsid[] = "@(#)ex_argv.c    10.26 (Berkeley) 9/20/96";
 #else
-__RCSID("$NetBSD: ex_argv.c,v 1.12.2.3 2005/10/15 15:41:50 riz Exp $");
+__RCSID("$NetBSD: ex_argv.c,v 1.12.2.4 2005/10/21 13:17:03 tron Exp $");
 #endif
 #endif /* not lint */
 
@@ -310,8 +310,7 @@
                off = exp->argsoff;
                exp->args[off]->len = len;
                for (p = exp->args[off]->bp; len > 0; --len, *p++ = *ap++)
-                       if ((IS_ESCAPE(sp, excp, *ap) || *ap == '\\') &&
-                           len > 1)
+                       if (IS_ESCAPE(sp, excp, *ap) || *ap == '\\')
                                ++ap;
                *p = '\0';
        }