oasis

commit: b016650a305a38a6ba1d99df22bbae383e714a3d
parent a7a39db9f366a1d5e2b4b4cad20d52ecd7b65b9b
Author: Michael Forney <mforney@mforney.org>
Date:   Thu, 14 Dec 2017 21:20:36 -0800

loksh: Update to 6.2

Diffstat:
M
.gitmodules
1
-
M
pkg/loksh/gen.lua
10
++++++----
M
pkg/loksh/rev
2
+-
M
pkg/openbsd/gen.lua
2
+-
M
pkg/openbsd/include/sys/time.h
9
+++++++++

5 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -122,7 +122,6 @@
 [submodule "pkg/loksh/src"]
 	path = pkg/loksh/src
 	url = https://github.com/dimkr/loksh
-	ignore = all
 [submodule "pkg/make/src"]
 	path = pkg/make/src
 	url = git://git.sv.gnu.org/make.git
diff --git a/pkg/loksh/gen.lua b/pkg/loksh/gen.lua
@@ -1,10 +1,11 @@
 cflags{
 	'-D _GNU_SOURCE',
-	'-I include',
-	'-idirafter pkg/openbsd/src/sys',
+	'-D EMACS',
+	'-D VI',
+	'-I pkg/openbsd/include',
+	'-idirafter $srcdir',  -- for vis.h
 }
 
-cc('emacs.c', {'pkg/openbsd/fetch'})
 exe('ksh', {
 	'alloc.c',
 	'c_ksh.c',
@@ -12,7 +13,7 @@ exe('ksh', {
 	'c_test.c',
 	'c_ulimit.c',
 	'edit.c',
-	'emacs.c.o',
+	'emacs.c',
 	'eval.c',
 	'exec.c',
 	'expr.c',
@@ -33,6 +34,7 @@ exe('ksh', {
 	'var.c',
 	'version.c',
 	'vi.c',
+	'$builddir/pkg/openbsd/libbsd.a',
 })
 file('bin/ksh', '755', '$outdir/ksh')
 sym('bin/sh', 'ksh')
diff --git a/pkg/loksh/rev b/pkg/loksh/rev
@@ -1 +1 @@
-5
+6
diff --git a/pkg/openbsd/gen.lua b/pkg/openbsd/gen.lua
@@ -30,7 +30,7 @@ cc('$outdir/lib/libc/crypt/arc4random.c', {
 lib('libbsd.a', {paths[[
 	lib/libc/(
 		crypt/(arc4random.c.o arc4random_uniform.c)
-		gen/(fts.c getprogname.c pwcache.c readpassphrase.c setprogname.c vis.c warnc.c vwarnc.c)
+		gen/(fts.c getprogname.c pwcache.c readpassphrase.c setprogname.c unvis.c vis.c warnc.c vwarnc.c)
 		net/base64.c
 		stdlib/(freezero.c reallocarray.c recallocarray.c strtonum.c)
 		string/(explicit_bzero.c strmode.c timingsafe_memcmp.c)
diff --git a/pkg/openbsd/include/sys/time.h b/pkg/openbsd/include/sys/time.h
@@ -3,3 +3,12 @@
 	(((tsp)->tv_sec == (usp)->tv_sec) ?				\
 	    ((tsp)->tv_nsec cmp (usp)->tv_nsec) :			\
 	    ((tsp)->tv_sec cmp (usp)->tv_sec))
+#define	timespecsub(tsp, usp, vsp)					\
+	do {								\
+		(vsp)->tv_sec = (tsp)->tv_sec - (usp)->tv_sec;		\
+		(vsp)->tv_nsec = (tsp)->tv_nsec - (usp)->tv_nsec;	\
+		if ((vsp)->tv_nsec < 0) {				\
+			(vsp)->tv_sec--;				\
+			(vsp)->tv_nsec += 1000000000L;			\
+		}							\
+	} while (0)