commit: b4f079f3762b427b2370310de225ea338c0cdf77
parent: e75d5c3fa5bd7751aa727e612744c0bb678ccd3b
author: Brian Callahan <bcallah@posteo.net>
date: Fri, 29 Apr 2022 07:32:18 -0400
Release oksh-7.1
6 files changed, 44 insertions(+), 42 deletions(-)
diff --git a/CVS/Entries b/CVS/Entries
@@ -12,35 +12,35 @@
/emacs.c/1.89/Result of merge//
/exec.c/1.75/Result of merge//
/tty.c/1.19/Result of merge//
-/CONTRIBUTORS/1.11/Sun Feb 20 19:46:57 2022//
-/LEGAL/1.2/Sun Feb 20 19:46:57 2022//
-/Makefile/1.39/Sun Feb 20 19:47:08 2022//
-/NOTES/1.16/Sun Feb 20 19:46:57 2022//
-/PROJECTS/1.9/Sun Feb 20 19:46:57 2022//
-/README/1.16/Sun Feb 20 19:47:08 2022//
-/alloc.c/1.19/Sun Feb 20 19:46:57 2022//
-/c_ksh.c/1.62/Sun Feb 20 19:46:57 2022//
-/c_sh.c/1.64/Sun Feb 20 19:46:57 2022//
-/c_test.h/1.4/Sun Feb 20 19:46:57 2022//
-/c_ulimit.c/1.29/Sun Feb 20 19:46:57 2022//
-/edit.h/1.12/Sun Feb 20 19:46:57 2022//
-/expand.h/1.15/Sun Feb 20 19:46:57 2022//
-/expr.c/1.34/Sun Feb 20 19:46:57 2022//
-/jobs.c/1.62/Sun Feb 20 19:46:57 2022//
-/ksh.1/1.215/Sun Feb 20 19:46:57 2022//
-/lex.c/1.78/Sun Feb 20 19:46:57 2022//
-/lex.h/1.21/Sun Feb 20 19:46:57 2022//
-/mail.c/1.27/Sun Feb 20 19:46:57 2022//
/misc.c/1.78/Result of merge//
-/path.c/1.23/Sun Feb 20 19:46:57 2022//
-/sh.1/1.153/Sun Feb 20 19:46:57 2022//
-/shf.c/1.34/Sun Feb 20 19:46:57 2022//
-/shf.h/1.8/Sun Feb 20 19:46:57 2022//
-/syn.c/1.40/Sun Feb 20 19:46:57 2022//
-/table.c/1.25/Sun Feb 20 19:46:57 2022//
-/table.h/1.15/Sun Feb 20 19:46:57 2022//
-/tree.c/1.34/Sun Feb 20 19:46:57 2022//
-/tree.h/1.12/Sun Feb 20 19:46:57 2022//
-/tty.h/1.6/Sun Feb 20 19:46:57 2022//
-/version.c/1.12/Sun Feb 20 19:46:57 2022//
+/CONTRIBUTORS/1.11/Fri Apr 29 11:30:13 2022//
+/LEGAL/1.2/Fri Apr 29 11:30:13 2022//
+/Makefile/1.39/Fri Apr 29 11:30:22 2022//
+/NOTES/1.16/Fri Apr 29 11:30:13 2022//
+/PROJECTS/1.9/Fri Apr 29 11:30:13 2022//
+/README/1.16/Fri Apr 29 11:30:22 2022//
+/alloc.c/1.19/Fri Apr 29 11:30:13 2022//
+/c_ksh.c/1.62/Fri Apr 29 11:30:13 2022//
+/c_sh.c/1.64/Fri Apr 29 11:30:13 2022//
+/c_test.h/1.4/Fri Apr 29 11:30:13 2022//
+/c_ulimit.c/1.29/Fri Apr 29 11:30:13 2022//
+/edit.h/1.12/Fri Apr 29 11:30:13 2022//
+/expand.h/1.15/Fri Apr 29 11:30:13 2022//
+/expr.c/1.34/Fri Apr 29 11:30:13 2022//
+/jobs.c/1.62/Fri Apr 29 11:30:13 2022//
+/ksh.1/1.216/Fri Apr 29 11:30:23 2022//
+/lex.c/1.78/Fri Apr 29 11:30:13 2022//
+/lex.h/1.21/Fri Apr 29 11:30:13 2022//
+/mail.c/1.27/Fri Apr 29 11:30:13 2022//
+/path.c/1.23/Fri Apr 29 11:30:13 2022//
+/sh.1/1.154/Fri Apr 29 11:30:23 2022//
+/shf.c/1.34/Fri Apr 29 11:30:13 2022//
+/shf.h/1.8/Fri Apr 29 11:30:13 2022//
+/syn.c/1.40/Fri Apr 29 11:30:13 2022//
+/table.c/1.25/Fri Apr 29 11:30:13 2022//
+/table.h/1.15/Fri Apr 29 11:30:13 2022//
+/tree.c/1.34/Fri Apr 29 11:30:13 2022//
+/tree.h/1.12/Fri Apr 29 11:30:13 2022//
+/tty.h/1.6/Fri Apr 29 11:30:13 2022//
+/version.c/1.12/Fri Apr 29 11:30:13 2022//
D
diff --git a/CVS/Entries.Log b/CVS/Entries.Log
@@ -0,0 +1,2 @@
+A D/tests////
+R D/tests////
diff --git a/README.md b/README.md
@@ -138,5 +138,5 @@ for details.
Get a tarball
-------------
-See releases tab. The latest release is oksh-7.0, which matches the ksh(1)
-from OpenBSD 7.0, released October 14, 2021.
+See releases tab. The latest release is oksh-7.1, which matches the ksh(1)
+from OpenBSD 7.1, released April 21, 2022.
diff --git a/ksh.1 b/ksh.1
@@ -1,8 +1,8 @@
-.\" $OpenBSD: ksh.1,v 1.215 2021/05/04 21:03:30 naddy Exp $
+.\" $OpenBSD: ksh.1,v 1.216 2022/03/31 17:27:14 naddy Exp $
.\"
.\" Public Domain
.\"
-.Dd $Mdocdate: May 4 2021 $
+.Dd $Mdocdate: March 31 2022 $
.Dt KSH 1
.Os
.Sh NAME
@@ -4012,7 +4012,7 @@ Times are reported to standard error; the format of the output is:
.Pp
If the
.Fl p
-option is given the output is slightly longer:
+option is given, the output is slightly longer:
.Bd -literal -offset indent
real 0.00
user 0.00
diff --git a/main.c b/main.c
@@ -301,7 +301,7 @@ main(int argc, char *argv[])
setint(global("PPID"), (int64_t) ppid);
/* setstr can't fail here */
setstr(global(version_param), ksh_version, KSH_RETURN_ERROR);
- setstr(global("OKSH_VERSION"), "oksh 7.0", KSH_RETURN_ERROR);
+ setstr(global("OKSH_VERSION"), "oksh 7.1", KSH_RETURN_ERROR);
/* execute initialization statements */
for (wp = (char**) initcoms; *wp != NULL; wp++) {
diff --git a/sh.1 b/sh.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sh.1,v 1.153 2021/05/04 21:03:31 naddy Exp $
+.\" $OpenBSD: sh.1,v 1.154 2022/03/31 17:27:14 naddy Exp $
.\"
.\" Copyright (c) 2015 Jason McIntyre <jmc@openbsd.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: May 4 2021 $
+.Dd $Mdocdate: March 31 2022 $
.Dt SH 1
.Os
.Sh NAME
@@ -1052,9 +1052,9 @@ argument is ignored for the commands
.Ic 0 , ^ , $ ,
and
.Ic c .
-If the motion moves towards the beginning of the line
+If the motion moves towards the beginning of the line,
the character under the cursor is not deleted;
-if it moves towards the end of the line
+if it moves towards the end of the line,
it is deleted.
.It Ic C
Delete the characters between the cursor and the line end,
@@ -1089,7 +1089,7 @@ placing them in the save buffer.
A special motion command,
.Ic d ,
may be used to delete the entire line.
-If the motion moves towards the beginning of the line
+If the motion moves towards the beginning of the line,
the character under the cursor is not deleted.
.It Oo Ar count Oc Ns Ic D
Delete the characters between the cursor and the line end,
@@ -1100,7 +1100,7 @@ placing them in the save buffer.
A special motion command,
.Ic y ,
may be used to yank the entire line.
-If the motion moves towards the beginning of the line
+If the motion moves towards the beginning of the line,
the character under the cursor is not yanked.
.It Oo Ar count Oc Ns Ic Y
Yank (copy) the characters between the cursor and the line end,
