Skip to content

Commit 7ee37a3

Browse files
ibaraibara
committed
Release oksh-7.2
1 parent 0fa242b commit 7ee37a3

7 files changed

Lines changed: 54 additions & 50 deletions

File tree

‎CVS/Entries‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -10,37 +10,37 @@
1010
/var.c/1.72/Result of merge//
1111
/vi.c/1.60/Result of merge+Fri Mar 12 03:48:27 2021//
1212
/emacs.c/1.89/Result of merge//
13-
/exec.c/1.75/Result of merge//
1413
/tty.c/1.19/Result of merge//
1514
/misc.c/1.78/Result of merge//
16-
/CONTRIBUTORS/1.11/Fri Apr 29 11:30:13 2022//
17-
/LEGAL/1.2/Fri Apr 29 11:30:13 2022//
18-
/Makefile/1.39/Fri Apr 29 11:30:22 2022//
19-
/NOTES/1.16/Fri Apr 29 11:30:13 2022//
20-
/PROJECTS/1.9/Fri Apr 29 11:30:13 2022//
21-
/README/1.16/Fri Apr 29 11:30:22 2022//
22-
/alloc.c/1.19/Fri Apr 29 11:30:13 2022//
23-
/c_ksh.c/1.62/Fri Apr 29 11:30:13 2022//
24-
/c_sh.c/1.64/Fri Apr 29 11:30:13 2022//
25-
/c_test.h/1.4/Fri Apr 29 11:30:13 2022//
26-
/c_ulimit.c/1.29/Fri Apr 29 11:30:13 2022//
27-
/edit.h/1.12/Fri Apr 29 11:30:13 2022//
28-
/expand.h/1.15/Fri Apr 29 11:30:13 2022//
29-
/expr.c/1.34/Fri Apr 29 11:30:13 2022//
30-
/jobs.c/1.62/Fri Apr 29 11:30:13 2022//
31-
/ksh.1/1.216/Fri Apr 29 11:30:23 2022//
32-
/lex.c/1.78/Fri Apr 29 11:30:13 2022//
33-
/lex.h/1.21/Fri Apr 29 11:30:13 2022//
34-
/mail.c/1.27/Fri Apr 29 11:30:13 2022//
35-
/path.c/1.23/Fri Apr 29 11:30:13 2022//
36-
/sh.1/1.154/Fri Apr 29 11:30:23 2022//
37-
/shf.c/1.34/Fri Apr 29 11:30:13 2022//
38-
/shf.h/1.8/Fri Apr 29 11:30:13 2022//
39-
/syn.c/1.40/Fri Apr 29 11:30:13 2022//
40-
/table.c/1.25/Fri Apr 29 11:30:13 2022//
41-
/table.h/1.15/Fri Apr 29 11:30:13 2022//
42-
/tree.c/1.34/Fri Apr 29 11:30:13 2022//
43-
/tree.h/1.12/Fri Apr 29 11:30:13 2022//
44-
/tty.h/1.6/Fri Apr 29 11:30:13 2022//
45-
/version.c/1.12/Fri Apr 29 11:30:13 2022//
15+
/CONTRIBUTORS/1.11/Wed Oct 26 01:59:06 2022//
16+
/LEGAL/1.2/Wed Oct 26 01:59:06 2022//
17+
/Makefile/1.39/Fri Oct 28 20:30:03 2022//
18+
/NOTES/1.16/Wed Oct 26 01:59:06 2022//
19+
/PROJECTS/1.9/Wed Oct 26 01:59:06 2022//
20+
/README/1.16/Fri Oct 28 20:30:03 2022//
21+
/alloc.c/1.19/Wed Oct 26 01:59:06 2022//
22+
/c_ksh.c/1.62/Wed Oct 26 01:59:06 2022//
23+
/c_sh.c/1.64/Wed Oct 26 01:59:06 2022//
24+
/c_test.h/1.4/Wed Oct 26 01:59:06 2022//
25+
/c_ulimit.c/1.29/Wed Oct 26 01:59:06 2022//
26+
/edit.h/1.12/Wed Oct 26 01:59:06 2022//
27+
/exec.c/1.76/Result of merge//
28+
/expand.h/1.15/Wed Oct 26 01:59:06 2022//
29+
/expr.c/1.34/Wed Oct 26 01:59:06 2022//
30+
/jobs.c/1.62/Wed Oct 26 01:59:06 2022//
31+
/ksh.1/1.217/Fri Oct 28 20:30:03 2022//
32+
/lex.c/1.78/Wed Oct 26 01:59:06 2022//
33+
/lex.h/1.21/Wed Oct 26 01:59:06 2022//
34+
/mail.c/1.27/Wed Oct 26 01:59:06 2022//
35+
/path.c/1.23/Wed Oct 26 01:59:06 2022//
36+
/sh.1/1.155/Fri Oct 28 20:30:03 2022//
37+
/shf.c/1.34/Wed Oct 26 01:59:06 2022//
38+
/shf.h/1.8/Wed Oct 26 01:59:06 2022//
39+
/syn.c/1.40/Wed Oct 26 01:59:06 2022//
40+
/table.c/1.25/Wed Oct 26 01:59:06 2022//
41+
/table.h/1.15/Wed Oct 26 01:59:06 2022//
42+
/tree.c/1.34/Wed Oct 26 01:59:06 2022//
43+
/tree.h/1.12/Wed Oct 26 01:59:06 2022//
44+
/tty.h/1.6/Wed Oct 26 01:59:06 2022//
45+
/version.c/1.12/Wed Oct 26 01:59:06 2022//
4646
D

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,5 +139,5 @@ for details.
139139

140140
Get a tarball
141141
-------------
142-
See releases tab. The latest release is oksh-7.1, which matches the ksh(1)
143-
from OpenBSD 7.1, released April 21, 2022.
142+
See releases tab. The latest release is oksh-7.2, which matches the ksh(1)
143+
from OpenBSD 7.2, released October 20, 2022.

‎exec.c‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $OpenBSD: exec.c,v 1.75 2021/10/24 21:24:21 deraadt Exp $ */
1+
/* $OpenBSD: exec.c,v 1.76 2022/10/10 14:57:48 kn Exp $ */
22

33
/*
44
* execute command tree
@@ -114,10 +114,12 @@ execute(struct op *volatile t,
114114
for (iowp = t->ioact; *iowp != NULL; iowp++) {
115115
if (iosetup(*iowp, tp) < 0) {
116116
exstat = rv = 1;
117-
/* Redirection failures for special commands
117+
/* Except in the permanent case (exec 2>afile),
118+
* redirection failures for special commands
118119
* cause (non-interactive) shell to exit.
119120
*/
120-
if (tp && tp->type == CSHELL &&
121+
if (tp && tp->val.f != c_exec &&
122+
tp->type == CSHELL &&
121123
(tp->flag & SPEC_BI))
122124
errorf(NULL);
123125
/* Deal with FERREXIT, quitenv(), etc. */

‎ksh.1‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
.\" $OpenBSD: ksh.1,v 1.216 2022/03/31 17:27:14 naddy Exp $
1+
.\" $OpenBSD: ksh.1,v 1.217 2022/09/13 20:26:26 kn Exp $
22
.\"
33
.\" Public Domain
44
.\"
5-
.Dd $Mdocdate: March 31 2022 $
5+
.Dd $Mdocdate: September 13 2022 $
66
.Dt KSH 1
77
.Os
88
.Sh NAME
@@ -745,9 +745,10 @@ Operators (e.g.\&
745745
must be unquoted.
746746
.It
747747
The second operand of the
748-
.Sq !=
748+
.Sq = ,
749+
.Sq ==
749750
and
750-
.Sq =
751+
.Sq !=
751752
expressions are patterns (e.g. the comparison
752753
.Ic [[ foobar = f*r ]]
753754
succeeds).

‎main.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ main(int argc, char *argv[])
301301
setint(global("PPID"), (int64_t) ppid);
302302
/* setstr can't fail here */
303303
setstr(global(version_param), ksh_version, KSH_RETURN_ERROR);
304-
setstr(global("OKSH_VERSION"), "oksh 7.1", KSH_RETURN_ERROR);
304+
setstr(global("OKSH_VERSION"), "oksh 7.2", KSH_RETURN_ERROR);
305305

306306
/* execute initialization statements */
307307
for (wp = (char**) initcoms; *wp != NULL; wp++) {

‎oksh.1‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
.\" $OpenBSD: ksh.1,v 1.215 2021/05/04 21:03:30 naddy Exp $
1+
.\" $OpenBSD: ksh.1,v 1.217 2022/09/13 20:26:26 kn Exp $
22
.\"
33
.\" Public Domain
44
.\"
5-
.Dd $Mdocdate: May 4 2021 $
5+
.Dd $Mdocdate: September 13 2022 $
66
.Dt OKSH 1
77
.Os
88
.Sh NAME
@@ -745,9 +745,10 @@ Operators (e.g.\&
745745
must be unquoted.
746746
.It
747747
The second operand of the
748-
.Sq !=
748+
.Sq = ,
749+
.Sq ==
749750
and
750-
.Sq =
751+
.Sq !=
751752
expressions are patterns (e.g. the comparison
752753
.Ic [[ foobar = f*r ]]
753754
succeeds).
@@ -4012,7 +4013,7 @@ Times are reported to standard error; the format of the output is:
40124013
.Pp
40134014
If the
40144015
.Fl p
4015-
option is given the output is slightly longer:
4016+
option is given, the output is slightly longer:
40164017
.Bd -literal -offset indent
40174018
real 0.00
40184019
user 0.00

‎sh.1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.\" $OpenBSD: sh.1,v 1.154 2022/03/31 17:27:14 naddy Exp $
1+
.\" $OpenBSD: sh.1,v 1.155 2022/08/31 22:27:14 jmc Exp $
22
.\"
33
.\" Copyright (c) 2015 Jason McIntyre <jmc@openbsd.org>
44
.\"
@@ -14,7 +14,7 @@
1414
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
1515
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1616
.\"
17-
.Dd $Mdocdate: March 31 2022 $
17+
.Dd $Mdocdate: August 31 2022 $
1818
.Dt SH 1
1919
.Os
2020
.Sh NAME
@@ -752,9 +752,9 @@ parameter 2 takes
752752
and so on.
753753
Parameters
754754
.Sq #
755-
to
755+
down to
756756
.Sq Po #\(mi Ns Ar n Pc Ns +1
757-
and downwards are unset and
757+
are unset and
758758
.Sq #
759759
is updated to the new number of positional parameters.
760760
If

0 commit comments

Comments
 (0)