Merging in 2.0.2.

userland/lib/Makefile

@@ -8,6 +8,6 @@
 TOP=../..
 .include "$(TOP)/mk/os161.config.mk"
 
-SUBDIRS=crt0 libc libtest libtest161 hostcompat
+SUBDIRS=crt0 libc libtest hostcompat
 
 .include "$(TOP)/mk/os161.subdir.mk"

userland/lib/hostcompat/Makefile

@@ -22,11 +22,6 @@ TOP=../../..
 LIB=hostcompat
 SRCS=err.c ntohll.c time.c hostcompat.c
 
-# printf
-COMMON=$(TOP)/common/libc
-SRCS+=\
-	$(COMMON)/printf/tprintf.c
-
 HOST_CFLAGS+=$(COMPAT_CFLAGS)
 
 MKDIRS=$(INSTALLTOP)/hostinclude

userland/lib/hostcompat/hostcompat.h

@@ -35,11 +35,6 @@ void hostcompat_init(int argc, char **argv);
 
 time_t __time(time_t *secs, unsigned long *nsecs);
 
-/* Automated testing extensions. */
-
-int tprintf(const char *fmt, ...);
-int nprintf(const char *fmt, ...);
-
 #ifdef DECLARE_NTOHLL
 uint64_t ntohll(uint64_t);
 #define htonll(x) (ntohll(x))

userland/lib/libc/Makefile

@@ -10,8 +10,7 @@ COMMON=$(TOP)/common/libc
 # printf
 SRCS+=\
 	$(COMMON)/printf/__printf.c \
-	$(COMMON)/printf/snprintf.c \
-	$(COMMON)/printf/tprintf.c
+	$(COMMON)/printf/snprintf.c
 
 # stdio
 SRCS+=\

userland/lib/libc/stdio/printf.c

@@ -31,8 +31,6 @@
 #include <stdarg.h>
 #include <unistd.h>
 #include <errno.h>
-#include <string.h>
-#include <kern/secret.h>
 
 /*
  * printf - C standard I/O function.

userland/lib/libc/unix/err.c

@@ -139,7 +139,6 @@ verr(int exitcode, const char *fmt, va_list ap)
 {
 	__printerr(1, fmt, ap);
 	exit(exitcode);
-	// exit() didn't work.
 }
 
 /* errx/verrx: don't use errno, but do then exit */
@@ -148,7 +147,6 @@ verrx(int exitcode, const char *fmt, va_list ap)
 {
 	__printerr(0, fmt, ap);
 	exit(exitcode);
-	// exit() didn't work.
 }
 
 /*