commit: 7ccd41fdb627aabfe125caa8ef436d0a1e90eebf
parent: 952f2c0902741143b3424b41e97563fd47c2cf99
author: Brian Callahan <bcallah@openbsd.org>
date: Sat, 20 Jan 2018 11:18:07 -0500
Update to latest code & new tarball.
3 files changed, 43 insertions(+), 60 deletions(-)
diff --git a/CVS/Entries b/CVS/Entries
@@ -2,45 +2,45 @@
/history.c/1.80/Tue Jan 16 02:21:56 2018//
/emacs.c/1.84/Result of merge//
/main.c/1.89/Result of merge//
-/CONTRIBUTORS/1.10/Sat Jan 20 04:43:43 2018//
-/LEGAL/1.2/Sat Jan 20 04:43:43 2018//
-/Makefile/1.38/Sat Jan 20 05:05:02 2018//
-/NOTES/1.16/Sat Jan 20 04:43:43 2018//
-/PROJECTS/1.9/Sat Jan 20 04:43:43 2018//
-/README/1.16/Sat Jan 20 05:05:02 2018//
-/alloc.c/1.19/Sat Jan 20 04:43:43 2018//
-/c_ksh.c/1.58/Sat Jan 20 04:43:43 2018//
-/c_sh.c/1.62/Sat Jan 20 04:43:43 2018//
-/c_test.c/1.24/Sat Jan 20 04:43:43 2018//
-/c_test.h/1.4/Sat Jan 20 04:43:43 2018//
-/c_ulimit.c/1.26/Sat Jan 20 04:43:43 2018//
-/edit.c/1.63/Sat Jan 20 04:43:43 2018//
-/edit.h/1.11/Sat Jan 20 04:43:43 2018//
-/eval.c/1.59/Sat Jan 20 04:43:43 2018//
-/exec.c/1.72/Sat Jan 20 04:43:43 2018//
-/expand.h/1.15/Sat Jan 20 04:43:43 2018//
-/expr.c/1.32/Sat Jan 20 04:43:43 2018//
-/io.c/1.36/Sat Jan 20 04:43:43 2018//
-/jobs.c/1.59/Sat Jan 20 04:43:43 2018//
-/ksh.1/1.197/Sat Jan 20 04:43:43 2018//
-/lex.c/1.78/Sat Jan 20 04:43:43 2018//
-/lex.h/1.21/Sat Jan 20 04:43:43 2018//
-/mail.c/1.22/Sat Jan 20 04:43:43 2018//
-/misc.c/1.68/Sat Jan 20 04:43:43 2018//
-/path.c/1.22/Sat Jan 20 04:43:43 2018//
-/sh.1/1.146/Sat Jan 20 04:43:43 2018//
-/sh.h/1.71/Sat Jan 20 04:43:43 2018//
-/shf.c/1.32/Sat Jan 20 04:43:43 2018//
-/shf.h/1.8/Sat Jan 20 04:43:43 2018//
-/syn.c/1.38/Sat Jan 20 04:43:43 2018//
-/table.c/1.25/Sat Jan 20 04:43:43 2018//
-/table.h/1.13/Sat Jan 20 04:43:43 2018//
-/trap.c/1.31/Sat Jan 20 04:43:43 2018//
-/tree.c/1.31/Sat Jan 20 04:43:43 2018//
-/tree.h/1.12/Sat Jan 20 04:43:43 2018//
-/tty.c/1.16/Sat Jan 20 04:43:43 2018//
-/tty.h/1.6/Sat Jan 20 04:43:43 2018//
-/var.c/1.65/Sat Jan 20 04:43:43 2018//
-/version.c/1.12/Sat Jan 20 04:43:43 2018//
-/vi.c/1.55/Sat Jan 20 04:43:43 2018//
+/CONTRIBUTORS/1.10/Sat Jan 20 16:15:16 2018//
+/LEGAL/1.2/Sat Jan 20 16:15:16 2018//
+/Makefile/1.38/Sat Jan 20 16:15:49 2018//
+/NOTES/1.16/Sat Jan 20 16:15:16 2018//
+/PROJECTS/1.9/Sat Jan 20 16:15:16 2018//
+/README/1.16/Sat Jan 20 16:17:11 2018//
+/alloc.c/1.19/Sat Jan 20 16:15:16 2018//
+/c_ksh.c/1.58/Sat Jan 20 16:15:16 2018//
+/c_sh.c/1.62/Sat Jan 20 16:15:16 2018//
+/c_test.c/1.24/Sat Jan 20 16:15:16 2018//
+/c_test.h/1.4/Sat Jan 20 16:15:16 2018//
+/c_ulimit.c/1.26/Sat Jan 20 16:15:16 2018//
+/edit.c/1.63/Sat Jan 20 16:15:16 2018//
+/edit.h/1.11/Sat Jan 20 16:15:16 2018//
+/eval.c/1.59/Sat Jan 20 16:15:16 2018//
+/exec.c/1.72/Sat Jan 20 16:15:16 2018//
+/expand.h/1.15/Sat Jan 20 16:15:16 2018//
+/expr.c/1.32/Sat Jan 20 16:15:16 2018//
+/io.c/1.36/Sat Jan 20 16:15:16 2018//
+/jobs.c/1.59/Sat Jan 20 16:15:16 2018//
+/ksh.1/1.197/Sat Jan 20 16:15:16 2018//
+/lex.c/1.78/Sat Jan 20 16:15:16 2018//
+/lex.h/1.21/Sat Jan 20 16:15:16 2018//
+/mail.c/1.22/Sat Jan 20 16:15:16 2018//
+/misc.c/1.68/Sat Jan 20 16:15:16 2018//
+/path.c/1.22/Sat Jan 20 16:15:16 2018//
+/sh.1/1.146/Sat Jan 20 16:15:16 2018//
+/sh.h/1.71/Sat Jan 20 16:15:16 2018//
+/shf.c/1.32/Sat Jan 20 16:15:16 2018//
+/shf.h/1.8/Sat Jan 20 16:15:16 2018//
+/syn.c/1.38/Sat Jan 20 16:15:16 2018//
+/table.c/1.25/Sat Jan 20 16:15:16 2018//
+/table.h/1.13/Sat Jan 20 16:15:16 2018//
+/trap.c/1.31/Sat Jan 20 16:15:16 2018//
+/tree.c/1.32/Sat Jan 20 16:17:11 2018//
+/tree.h/1.12/Sat Jan 20 16:15:16 2018//
+/tty.c/1.16/Sat Jan 20 16:15:16 2018//
+/tty.h/1.6/Sat Jan 20 16:15:16 2018//
+/var.c/1.65/Sat Jan 20 16:15:16 2018//
+/version.c/1.12/Sat Jan 20 16:15:16 2018//
+/vi.c/1.55/Sat Jan 20 16:15:16 2018//
D
diff --git a/README.md b/README.md
@@ -53,4 +53,4 @@ for details.
Get a tarball
-------------
-http://devio.us/~bcallah/oksh/oksh-20180111.tar.gz
+http://devio.us/~bcallah/oksh/oksh-20180120.tar.gz
diff --git a/tree.c b/tree.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tree.c,v 1.31 2018/01/16 22:52:32 jca Exp $ */
+/* $OpenBSD: tree.c,v 1.32 2018/01/20 15:32:20 anton Exp $ */
/*
* command tree climbing
@@ -47,25 +47,8 @@ ptree(struct op *t, int indent, struct shf *shf)
fptreef(shf, indent, "#no-args# ");
break;
case TEXEC:
-#if 0 /* ?not useful - can't be called? */
- /* Print original vars */
- if (t->left->vars)
- for (w = t->left->vars; *w != NULL; )
- fptreef(shf, indent, "%S ", *w++);
- else
- fptreef(shf, indent, "#no-vars# ");
- /* Print expanded vars */
- if (t->args)
- for (w = t->args; *w != NULL; )
- fptreef(shf, indent, "%s ", *w++);
- else
- fptreef(shf, indent, "#no-args# ");
- /* Print original io */
- t = t->left;
-#else
t = t->left;
goto Chain;
-#endif
case TPAREN:
fptreef(shf, indent + 2, "( %T) ", t->left);
break;