[src/netbsd-8]: src/bin/sh Pull up following revision(s) (requested by kre in...

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

details:   https://anonhg.NetBSD.org/src/rev/da883cf8d5f1
branches:  netbsd-8
changeset: 362018:da883cf8d5f1
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Feb 24 10:07:46 2022 +0000

description:
Pull up following revision(s) (requested by kre in ticket #1736):

        bin/sh/histedit.c: revision 1.60

After (a few days short of) 21 years, revert 1.25, which did nothing except
make the -e option to "fc" fail to work (the commit message was about some
other changes entirely, so I an only assume this was committed by mistake).

It says a lot about the use of the fc command that no-one noticed that
this did not work properly for all this time.

Internally in sh, it is possible for built in commands to use either
getopt(3) (from libc) or the much simpler internal shell nextopt() routine
for option (flag) parsing.    However it makes no sense to use getopt()
and then access a global variable set only by nextopt() instead of the
one getopt() sets (which is what the code had used previously, forever).

Use the correct variable again.

XXX pullup -9 -8  (-7 -6 -5 ...)

diffstat:

 bin/sh/histedit.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 5489a78b952a -r da883cf8d5f1 bin/sh/histedit.c
--- a/bin/sh/histedit.c Thu Feb 03 14:22:17 2022 +0000
+++ b/bin/sh/histedit.c Thu Feb 24 10:07:46 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: histedit.c,v 1.48.8.2 2018/08/25 14:45:37 martin Exp $ */
+/*     $NetBSD: histedit.c,v 1.48.8.3 2022/02/24 10:07:46 martin Exp $ */
 
 /*-
  * Copyright (c) 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)histedit.c 8.2 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: histedit.c,v 1.48.8.2 2018/08/25 14:45:37 martin Exp $");
+__RCSID("$NetBSD: histedit.c,v 1.48.8.3 2022/02/24 10:07:46 martin Exp $");
 #endif
 #endif /* not lint */
 
@@ -283,7 +283,7 @@
              (ch = getopt(argc, argv, ":e:lnrs")) != -1)
                switch ((char)ch) {
                case 'e':
-                       editor = optionarg;
+                       editor = optarg;
                        break;
                case 'l':
                        lflg = 1;