[src/trunk]: src/bin/csh undo previous for 'r' and 'e' modifiers; they should...

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

details:   https://anonhg.NetBSD.org/src/rev/76bd56e463f5
branches:  trunk
changeset: 944521:76bd56e463f5
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Oct 02 17:33:13 2020 +0000

description:
undo previous for 'r' and 'e' modifiers; they should no go further than
the last '/'.

diffstat:

 bin/csh/lex.c |  23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diffs (51 lines):

diff -r 20d2df22c10b -r 76bd56e463f5 bin/csh/lex.c
--- a/bin/csh/lex.c     Fri Oct 02 17:27:12 2020 +0000
+++ b/bin/csh/lex.c     Fri Oct 02 17:33:13 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lex.c,v 1.37 2020/09/30 17:51:10 christos Exp $ */
+/* $NetBSD: lex.c,v 1.38 2020/10/02 17:33:13 christos Exp $ */
 
 /*-
  * Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)lex.c      8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: lex.c,v 1.37 2020/09/30 17:51:10 christos Exp $");
+__RCSID("$NetBSD: lex.c,v 1.38 2020/10/02 17:33:13 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -996,6 +996,7 @@
            if ((c != ' ' && c != '\t') || type == 'q')
                *xp |= QUOTE;
        return (wp);
+
     case 'h':
     case 't':
        wp = Strrchr(cp, '/');
@@ -1009,14 +1010,16 @@
 
     case 'e':
     case 'r':
-       wp = Strrchr(cp, '.');
-       if (wp == NULL)
-           return Strsave(type == 'r' ? cp : STRNULL);
-       if (type == 'e')
-           xp = Strsave(wp + 1);
-       else
-           xp = Strsave(cp), xp[wp - cp] = 0;
-       return (xp);
+       wp = Strend(cp);
+       for (wp--; wp >= cp && *wp != '/'; wp--)
+           if (*wp == '.') {
+               if (type == 'e')
+                   xp = Strsave(wp + 1);
+               else
+                   xp = Strsave(cp), xp[wp - cp] = 0;
+               return (xp);
+           }
+       return (Strsave(type == 'e' ? STRNULL : cp));
 
     default:
        break;