Put one file per line so it is easier to read diffs against those files.

2 files changed, 653 insertions, 184 deletions

diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
index 0bbbb33..711cbff 100644
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -4,37 +4,144 @@
 # machine-independent gen sources
 .PATH: ${.CURDIR}/${LIBC_ARCH}/gen ${.CURDIR}/gen
 
-SRCS+=  __getosreldate.c __xuname.c \
-	_once_stub.c _pthread_stubs.c _rand48.c _spinlock_stub.c \
+SRCS+=	__getosreldate.c \
+	__xuname.c \
+	_once_stub.c \
+	_pthread_stubs.c \
+	_rand48.c \
+	_spinlock_stub.c \
 	_thread_init.c \
-	alarm.c arc4random.c assert.c auxv.c basename.c check_utility_compat.c \
-	clock.c clock_getcpuclockid.c closedir.c confstr.c \
-	crypt.c ctermid.c daemon.c devname.c dirfd.c dirname.c disklabel.c \
-	dlfcn.c drand48.c elf_utils.c erand48.c err.c errlst.c errno.c \
-	exec.c fdevname.c feature_present.c fmtcheck.c fmtmsg.c fnmatch.c \
-	fpclassify.c frexp.c fstab.c ftok.c fts.c fts-compat.c ftw.c \
-	getbootfile.c getbsize.c \
-	getcap.c getcwd.c getdomainname.c getgrent.c getgrouplist.c \
-	gethostname.c getloadavg.c getlogin.c getmntinfo.c getnetgrent.c \
-	getosreldate.c getpagesize.c getpagesizes.c \
-	getpeereid.c getprogname.c getpwent.c getttyent.c \
-	getusershell.c getutxent.c getvfsbyname.c glob.c \
-	initgroups.c isatty.c isinf.c isnan.c jrand48.c lcong48.c \
+	alarm.c \
+	arc4random.c \
+	assert.c \
+	auxv.c \
+	basename.c \
+	check_utility_compat.c \
+	clock.c \
+	clock_getcpuclockid.c \
+	closedir.c \
+	confstr.c \
+	crypt.c \
+	ctermid.c \
+	daemon.c \
+	devname.c \
+	dirfd.c \
+	dirname.c \
+	disklabel.c \
+	dlfcn.c \
+	drand48.c \
+	elf_utils.c \
+	erand48.c \
+	err.c \
+	errlst.c \
+	errno.c \
+	exec.c \
+	fdevname.c \
+	feature_present.c \
+	fmtcheck.c \
+	fmtmsg.c \
+	fnmatch.c \
+	fpclassify.c \
+	frexp.c \
+	fstab.c \
+	ftok.c \
+	fts.c \
+	fts-compat.c \
+	ftw.c \
+	getbootfile.c \
+	getbsize.c \
+	getcap.c \
+	getcwd.c \
+	getdomainname.c \
+	getgrent.c \
+	getgrouplist.c \
+	gethostname.c \
+	getloadavg.c \
+	getlogin.c \
+	getmntinfo.c \
+	getnetgrent.c \
+	getosreldate.c \
+	getpagesize.c \
+	getpagesizes.c \
+	getpeereid.c \
+	getprogname.c \
+	getpwent.c \
+	getttyent.c \
+	getusershell.c \
+	getutxent.c \
+	getvfsbyname.c \
+	glob.c \
+	initgroups.c \
+	isatty.c \
+	isinf.c \
+	isnan.c \
+	jrand48.c \
+	lcong48.c \
 	libc_dlopen.c \
-	lockf.c lrand48.c mrand48.c nftw.c nice.c \
-	nlist.c nrand48.c opendir.c \
-	pause.c pmadvise.c popen.c posix_spawn.c \
-	psignal.c pututxline.c pw_scan.c \
-	raise.c readdir.c readpassphrase.c rewinddir.c \
-	scandir.c seed48.c seekdir.c semctl.c \
-	setdomainname.c sethostname.c setjmperr.c setmode.c \
-	setproctitle.c setprogname.c siginterrupt.c siglist.c signal.c \
-	sigsetops.c sleep.c srand48.c statvfs.c stringlist.c strtofflags.c \
-	sysconf.c sysctl.c sysctlbyname.c sysctlnametomib.c \
-	syslog.c telldir.c termios.c time.c times.c timezone.c tls.c \
-	ttyname.c ttyslot.c ualarm.c ulimit.c uname.c unvis-compat.c \
-	usleep.c utime.c utxdb.c valloc.c wait.c wait3.c waitpid.c \
-	waitid.c wordexp.c
+	lockf.c \
+	lrand48.c \
+	mrand48.c \
+	nftw.c \
+	nice.c \
+	nlist.c \
+	nrand48.c \
+	opendir.c \
+	pause.c \
+	pmadvise.c \
+	popen.c \
+	posix_spawn.c \
+	psignal.c \
+	pututxline.c \
+	pw_scan.c \
+	raise.c \
+	readdir.c \
+	readpassphrase.c \
+	rewinddir.c \
+	scandir.c \
+	seed48.c \
+	seekdir.c \
+	semctl.c \
+	setdomainname.c \
+	sethostname.c \
+	setjmperr.c \
+	setmode.c \
+	setproctitle.c \
+	setprogname.c \
+	siginterrupt.c \
+	siglist.c \
+	signal.c \
+	sigsetops.c \
+	sleep.c \
+	srand48.c \
+	statvfs.c \
+	stringlist.c \
+	strtofflags.c \
+	sysconf.c \
+	sysctl.c \
+	sysctlbyname.c \
+	sysctlnametomib.c \
+	syslog.c \
+	telldir.c \
+	termios.c \
+	time.c \
+	times.c \
+	timezone.c \
+	tls.c \
+	ttyname.c \
+	ttyslot.c \
+	ualarm.c \
+	ulimit.c \
+	uname.c \
+	unvis-compat.c \
+	usleep.c \
+	utime.c \
+	utxdb.c \
+	valloc.c \
+	wait.c \
+	wait3.c \
+	waitpid.c \
+	waitid.c \
+	wordexp.c
 
 .PATH: ${.CURDIR}/../../contrib/libc-pwcache
 SRCS+=	pwcache.c pwcache.h
@@ -58,101 +165,257 @@ SYM_MAPS+=${.CURDIR}/gen/Symbol.map
 # machine-dependent gen sources
 .sinclude "${.CURDIR}/${LIBC_ARCH}/gen/Makefile.inc"
 
-MAN+=	alarm.3 arc4random.3 \
-	basename.3 check_utility_compat.3 clock.3 clock_getcpuclockid.3 \
-	confstr.3 ctermid.3 daemon.3 devname.3 directory.3 dirname.3 \
-	dl_iterate_phdr.3 dladdr.3 dlinfo.3 dllockinit.3 dlopen.3 \
-	err.3 exec.3 \
-	feature_present.3 fmtcheck.3 fmtmsg.3 fnmatch.3 fpclassify.3 frexp.3 \
-	ftok.3 fts.3 ftw.3 \
-	getbootfile.3 getbsize.3 getcap.3 getcontext.3 getcwd.3 \
-	getdiskbyname.3 getdomainname.3 getfsent.3 \
-	getgrent.3 getgrouplist.3 gethostname.3 getloadavg.3 \
-	getmntinfo.3 getnetgrent.3 getosreldate.3 getpagesize.3 \
-	getpagesizes.3 getpass.3 getpeereid.3 getprogname.3 getpwent.3 \
-	getttyent.3 getusershell.3 getutxent.3 getvfsbyname.3 \
-	glob.3 initgroups.3 isgreater.3 ldexp.3 lockf.3 makecontext.3 \
+MAN+=	alarm.3 \
+	arc4random.3 \
+	basename.3 \
+	check_utility_compat.3 \
+	clock.3 \
+	clock_getcpuclockid.3 \
+	confstr.3 \
+	ctermid.3 \
+	daemon.3 \
+	devname.3 \
+	directory.3 \
+	dirname.3 \
+	dl_iterate_phdr.3 \
+	dladdr.3 \
+	dlinfo.3 \
+	dllockinit.3 \
+	dlopen.3 \
+	err.3 \
+	exec.3 \
+	feature_present.3 \
+	fmtcheck.3 \
+	fmtmsg.3 \
+	fnmatch.3 \
+	fpclassify.3 \
+	frexp.3 \
+	ftok.3 \
+	fts.3 \
+	ftw.3 \
+	getbootfile.3 \
+	getbsize.3 \
+	getcap.3 \
+	getcontext.3 \
+	getcwd.3 \
+	getdiskbyname.3 \
+	getdomainname.3 \
+	getfsent.3 \
+	getgrent.3 \
+	getgrouplist.3 \
+	gethostname.3 \
+	getloadavg.3 \
+	getmntinfo.3 \
+	getnetgrent.3 \
+	getosreldate.3 \
+	getpagesize.3 \
+	getpagesizes.3 \
+	getpass.3 \
+	getpeereid.3 \
+	getprogname.3 \
+	getpwent.3 \
+	getttyent.3 \
+	getusershell.3 \
+	getutxent.3 \
+	getvfsbyname.3 \
+	glob.3 \
+	initgroups.3 \
+	isgreater.3 \
+	ldexp.3 \
+	lockf.3 \
+	makecontext.3 \
 	modf.3 \
-	nice.3 nlist.3 pause.3 popen.3 \
-	posix_spawn.3 posix_spawn_file_actions_addopen.3 \
-	posix_spawn_file_actions_init.3 posix_spawnattr_getflags.3 \
-	posix_spawnattr_getpgroup.3 posix_spawnattr_getschedparam.3 \
-	posix_spawnattr_getschedpolicy.3 posix_spawnattr_init.3 \
-	posix_spawnattr_getsigdefault.3 posix_spawnattr_getsigmask.3 \
-	psignal.3 pwcache.3 \
-	raise.3 rand48.3 readpassphrase.3 rfork_thread.3 \
-	scandir.3 sem_destroy.3 sem_getvalue.3 sem_init.3 \
-	sem_open.3 sem_post.3 sem_timedwait.3 sem_wait.3 \
-	setjmp.3 setmode.3 setproctitle.3 \
-	siginterrupt.3 signal.3 sigsetops.3 sleep.3 \
-	statvfs.3 stringlist.3 \
-	strtofflags.3 sysconf.3 sysctl.3 syslog.3 tcgetpgrp.3 tcgetsid.3 \
-	tcsendbreak.3 tcsetattr.3 tcsetpgrp.3 tcsetsid.3 time.3 times.3 \
-	timezone.3 ttyname.3 tzset.3 ualarm.3 ucontext.3 ulimit.3 uname.3 \
-	unvis.3 usleep.3 utime.3 valloc.3 vis.3 wordexp.3
+	nice.3 \
+	nlist.3 \
+	pause.3 \
+	popen.3 \
+	posix_spawn.3 \
+	posix_spawn_file_actions_addopen.3 \
+	posix_spawn_file_actions_init.3 \
+	posix_spawnattr_getflags.3 \
+	posix_spawnattr_getpgroup.3 \
+	posix_spawnattr_getschedparam.3 \
+	posix_spawnattr_getschedpolicy.3 \
+	posix_spawnattr_init.3 \
+	posix_spawnattr_getsigdefault.3 \
+	posix_spawnattr_getsigmask.3 \
+	psignal.3 \
+	pwcache.3 \
+	raise.3 \
+	rand48.3 \
+	readpassphrase.3 \
+	rfork_thread.3 \
+	scandir.3 \
+	sem_destroy.3 \
+	sem_getvalue.3 \
+	sem_init.3 \
+	sem_open.3 \
+	sem_post.3 \
+	sem_timedwait.3 \
+	sem_wait.3 \
+	setjmp.3 \
+	setmode.3 \
+	setproctitle.3 \
+	siginterrupt.3 \
+	signal.3 \
+	sigsetops.3 \
+	sleep.3 \
+	statvfs.3 \
+	stringlist.3 \
+	strtofflags.3 \
+	sysconf.3 \
+	sysctl.3 \
+	syslog.3 \
+	tcgetpgrp.3 \
+	tcgetsid.3 \
+	tcsendbreak.3 \
+	tcsetattr.3 \
+	tcsetpgrp.3 \
+	tcsetsid.3 \
+	time.3 \
+	times.3 \
+	timezone.3 \
+	ttyname.3 \
+	tzset.3 \
+	ualarm.3 \
+	ucontext.3 \
+	ulimit.3 \
+	uname.3 \
+	unvis.3 \
+	usleep.3 \
+	utime.3 \
+	valloc.3 \
+	vis.3 \
+	wordexp.3
 
-MLINKS+=arc4random.3 arc4random_addrandom.3 arc4random.3 arc4random_stir.3 \
-	arc4random.3 arc4random_buf.3 arc4random.3 arc4random_uniform.3
+MLINKS+=arc4random.3 arc4random_addrandom.3 \
+	arc4random.3 arc4random_stir.3 \
+	arc4random.3 arc4random_buf.3 \
+	arc4random.3 arc4random_uniform.3
 MLINKS+=basename.3 basename_r.3
 MLINKS+=ctermid.3 ctermid_r.3
 MLINKS+=devname.3 devname_r.3
 MLINKS+=devname.3 fdevname.3
 MLINKS+=devname.3 fdevname_r.3
-MLINKS+=directory.3 closedir.3 directory.3 dirfd.3 directory.3 opendir.3 \
+MLINKS+=directory.3 closedir.3 \
+	directory.3 dirfd.3 \
+	directory.3 opendir.3 \
 	directory.3 fdopendir.3 \
-	directory.3 readdir.3 directory.3 readdir_r.3 directory.3 rewinddir.3 \
-	directory.3 seekdir.3 directory.3 telldir.3
-MLINKS+=dlopen.3 fdlopen.3 dlopen.3 dlclose.3 dlopen.3 dlerror.3 \
-	dlopen.3 dlfunc.3 dlopen.3 dlsym.3
-MLINKS+=err.3 err_set_exit.3 err.3 err_set_file.3 err.3 errc.3 err.3 errx.3 \
-	err.3 verr.3 err.3 verrc.3 err.3 verrx.3 err.3 vwarn.3 err.3 vwarnc.3 \
-	err.3 vwarnx.3 err.3 warnc.3 err.3 warn.3 err.3 warnx.3
-MLINKS+=exec.3 execl.3 exec.3 execle.3 exec.3 execlp.3 exec.3 exect.3 \
-	exec.3 execv.3 exec.3 execvP.3 exec.3 execvp.3
-MLINKS+=fpclassify.3 finite.3 fpclassify.3 finitef.3 \
-	fpclassify.3 isfinite.3 fpclassify.3 isinf.3 fpclassify.3 isnan.3 \
+	directory.3 readdir.3 \
+	directory.3 readdir_r.3 \
+	directory.3 rewinddir.3 \
+	directory.3 seekdir.3 \
+	directory.3 telldir.3
+MLINKS+=dlopen.3 fdlopen.3 \
+	dlopen.3 dlclose.3 \
+	dlopen.3 dlerror.3 \
+	dlopen.3 dlfunc.3 \
+	dlopen.3 dlsym.3
+MLINKS+=err.3 err_set_exit.3 \
+	err.3 err_set_file.3 \
+	err.3 errc.3 \
+	err.3 errx.3 \
+	err.3 verr.3 \
+	err.3 verrc.3 \
+	err.3 verrx.3 \
+	err.3 vwarn.3 \
+	err.3 vwarnc.3 \
+	err.3 vwarnx.3 \
+	err.3 warnc.3 \
+	err.3 warn.3 \
+	err.3 warnx.3
+MLINKS+=exec.3 execl.3 \
+	exec.3 execle.3 \
+	exec.3 execlp.3 \
+	exec.3 exect.3 \
+	exec.3 execv.3 \
+	exec.3 execvP.3 \
+	exec.3 execvp.3
+MLINKS+=fpclassify.3 finite.3 \
+	fpclassify.3 finitef.3 \
+	fpclassify.3 isfinite.3 \
+	fpclassify.3 isinf.3 \
+	fpclassify.3 isnan.3 \
 	fpclassify.3 isnormal.3
-MLINKS+=frexp.3 frexpf.3 frexp.3 frexpl.3
-MLINKS+=fts.3 fts_children.3 fts.3 fts_close.3 fts.3 fts_open.3 \
-	fts.3 fts_read.3 fts.3 fts_set.3 fts.3 fts_set_clientptr.3 \
-	fts.3 fts_get_clientptr.3 fts.3 fts_get_stream.3
+MLINKS+=frexp.3 frexpf.3 \
+	frexp.3 frexpl.3
+MLINKS+=fts.3 fts_children.3 \
+	fts.3 fts_close.3 \
+	fts.3 fts_open.3 \
+	fts.3 fts_read.3 \
+	fts.3 fts_set.3 \
+	fts.3 fts_set_clientptr.3 \
+	fts.3 fts_get_clientptr.3 \
+	fts.3 fts_get_stream.3
 MLINKS+=ftw.3 nftw.3
-MLINKS+=getcap.3 cgetcap.3 getcap.3 cgetclose.3 getcap.3 cgetent.3 \
-	getcap.3 cgetfirst.3 getcap.3 cgetmatch.3 getcap.3 cgetnext.3 \
-	getcap.3 cgetnum.3 getcap.3 cgetset.3 getcap.3 cgetstr.3 \
+MLINKS+=getcap.3 cgetcap.3 \
+	getcap.3 cgetclose.3 \
+	getcap.3 cgetent.3 \
+	getcap.3 cgetfirst.3 \
+	getcap.3 cgetmatch.3 \
+	getcap.3 cgetnext.3 \
+	getcap.3 cgetnum.3 \
+	getcap.3 cgetset.3 \
+	getcap.3 cgetstr.3 \
 	getcap.3 cgetustr.3
 MLINKS+=getcwd.3 getwd.3
 MLINKS+=getcontext.3 setcontext.3
 MLINKS+=getdomainname.3 setdomainname.3
-MLINKS+=getfsent.3 endfsent.3 getfsent.3 getfsfile.3 getfsent.3 getfsspec.3 \
-	getfsent.3 getfstype.3 getfsent.3 setfsent.3 \
-	getfsent.3 setfstab.3 getfsent.3 getfstab.3
-MLINKS+=getgrent.3 endgrent.3 getgrent.3 getgrgid.3 getgrent.3 getgrnam.3 \
-	getgrent.3 setgrent.3 getgrent.3 setgroupent.3 \
-	getgrent.3 getgrent_r.3 getgrent.3 getgrnam_r.3 getgrent.3 getgrgid_r.3
+MLINKS+=getfsent.3 endfsent.3 \
+	getfsent.3 getfsfile.3 \
+	getfsent.3 getfsspec.3 \
+	getfsent.3 getfstype.3 \
+	getfsent.3 setfsent.3 \
+	getfsent.3 setfstab.3 \
+	getfsent.3 getfstab.3
+MLINKS+=getgrent.3 endgrent.3 \
+	getgrent.3 getgrgid.3 \
+	getgrent.3 getgrnam.3 \
+	getgrent.3 setgrent.3 \
+	getgrent.3 setgroupent.3 \
+	getgrent.3 getgrent_r.3 \
+	getgrent.3 getgrnam_r.3 \
+	getgrent.3 getgrgid_r.3
 MLINKS+=gethostname.3 sethostname.3
-MLINKS+=getnetgrent.3 endnetgrent.3 getnetgrent.3 innetgr.3 \
+MLINKS+=getnetgrent.3 endnetgrent.3 \
+	getnetgrent.3 innetgr.3 \
 	getnetgrent.3 setnetgrent.3
 MLINKS+=getprogname.3 setprogname.3
-MLINKS+=getpwent.3 endpwent.3 getpwent.3 getpwnam.3 getpwent.3 getpwuid.3 \
-	getpwent.3 setpassent.3 getpwent.3 setpwent.3 getpwent.3 setpwfile.3 \
-	getpwent.3 getpwent_r.3 getpwent.3 getpwnam_r.3 \
+MLINKS+=getpwent.3 endpwent.3 \
+	getpwent.3 getpwnam.3 \
+	getpwent.3 getpwuid.3 \
+	getpwent.3 setpassent.3 \
+	getpwent.3 setpwent.3 \
+	getpwent.3 setpwfile.3 \
+	getpwent.3 getpwent_r.3 \
+	getpwent.3 getpwnam_r.3 \
 	getpwent.3 getpwuid_r.3
-MLINKS+=getttyent.3 endttyent.3 getttyent.3 getttynam.3 \
-	getttyent.3 isdialuptty.3 getttyent.3 isnettty.3 \
+MLINKS+=getttyent.3 endttyent.3 \
+	getttyent.3 getttynam.3 \
+	getttyent.3 isdialuptty.3 \
+	getttyent.3 isnettty.3 \
 	getttyent.3 setttyent.3
-MLINKS+=getusershell.3 endusershell.3 getusershell.3 setusershell.3
-MLINKS+=getutxent.3 endutxent.3 getutxent.3 getutxid.3 \
-	getutxent.3 getutxline.3 getutxent.3 getutxuser.3 \
-	getutxent.3 pututxline.3 getutxent.3 setutxdb.3 \
-	getutxent.3 setutxent.3 getutxent.3 utmpx.3
+MLINKS+=getusershell.3 endusershell.3 \
+	getusershell.3 setusershell.3
+MLINKS+=getutxent.3 endutxent.3 \
+	getutxent.3 getutxid.3 \
+	getutxent.3 getutxline.3 \
+	getutxent.3 getutxuser.3 \
+	getutxent.3 pututxline.3 \
+	getutxent.3 setutxdb.3 \
+	getutxent.3 setutxent.3 \
+	getutxent.3 utmpx.3
 MLINKS+=glob.3 globfree.3
-MLINKS+=isgreater.3 isgreaterequal.3 isgreater.3 isless.3 \
-	isgreater.3 islessequal.3 isgreater.3 islessgreater.3 \
+MLINKS+=isgreater.3 isgreaterequal.3 \
+	isgreater.3 isless.3 \
+	isgreater.3 islessequal.3 \
+	isgreater.3 islessgreater.3 \
 	isgreater.3 isunordered.3
-MLINKS+=ldexp.3 ldexpf.3 ldexp.3 ldexpl.3
+MLINKS+=ldexp.3 ldexpf.3 \
+	ldexp.3 ldexpl.3
 MLINKS+=makecontext.3 swapcontext.3
-MLINKS+=modf.3 modff.3 modf.3 modfl.3
+MLINKS+=modf.3 modff.3 \
+	modf.3 modfl.3
 MLINKS+=popen.3 pclose.3
 MLINKS+=posix_spawn.3 posix_spawnp.3 \
 	posix_spawn_file_actions_addopen.3 posix_spawn_file_actions_addclose.3 \
@@ -165,36 +428,66 @@ MLINKS+=posix_spawn.3 posix_spawnp.3 \
 	posix_spawnattr_getsigdefault.3 posix_spawnattr_setsigdefault.3 \
 	posix_spawnattr_getsigmask.3 posix_spawnattr_setsigmask.3 \
 	posix_spawnattr_init.3 posix_spawnattr_destroy.3
-MLINKS+=psignal.3 strsignal.3 psignal.3 sys_siglist.3 psignal.3 sys_signame.3
-MLINKS+=pwcache.3 group_from_gid.3 pwcache.3 user_from_uid.3
-MLINKS+=rand48.3 _rand48.3 rand48.3 drand48.3 rand48.3 erand48.3 \
-	rand48.3 jrand48.3 rand48.3 lcong48.3 rand48.3 lrand48.3 \
-	rand48.3 mrand48.3 rand48.3 nrand48.3 rand48.3 seed48.3 \
+MLINKS+=psignal.3 strsignal.3 \
+	psignal.3 sys_siglist.3 \
+	psignal.3 sys_signame.3
+MLINKS+=pwcache.3 group_from_gid.3 \
+	pwcache.3 user_from_uid.3
+MLINKS+=rand48.3 _rand48.3 \
+	rand48.3 drand48.3 \
+	rand48.3 erand48.3 \
+	rand48.3 jrand48.3 \
+	rand48.3 lcong48.3 \
+	rand48.3 lrand48.3 \
+	rand48.3 mrand48.3 \
+	rand48.3 nrand48.3 \
+	rand48.3 seed48.3 \
 	rand48.3 srand48.3
 MLINKS+=scandir.3 alphasort.3
-MLINKS+=sem_open.3 sem_close.3 sem_open.3 sem_unlink.3
+MLINKS+=sem_open.3 sem_close.3 \
+	sem_open.3 sem_unlink.3
 MLINKS+=sem_wait.3 sem_trywait.3
-MLINKS+=setjmp.3 _longjmp.3 setjmp.3 _setjmp.3 setjmp.3 longjmp.3 \
-	setjmp.3 longjmperr.3 setjmp.3 longjmperror.3 \
-	setjmp.3 siglongjmp.3 setjmp.3 sigsetjmp.3
+MLINKS+=setjmp.3 _longjmp.3 \
+	setjmp.3 _setjmp.3 \
+	setjmp.3 longjmp.3 \
+	setjmp.3 longjmperr.3 \
+	setjmp.3 longjmperror.3 \
+	setjmp.3 siglongjmp.3 \
+	setjmp.3 sigsetjmp.3
 MLINKS+=setmode.3 getmode.3
-MLINKS+=sigsetops.3 sigaddset.3 sigsetops.3 sigdelset.3 \
-	sigsetops.3 sigemptyset.3 sigsetops.3 sigfillset.3 \
+MLINKS+=sigsetops.3 sigaddset.3 \
+	sigsetops.3 sigdelset.3 \
+	sigsetops.3 sigemptyset.3 \
+	sigsetops.3 sigfillset.3 \
 	sigsetops.3 sigismember.3
 MLINKS+=statvfs.3 fstatvfs.3
-MLINKS+=stringlist.3 sl_add.3 stringlist.3 sl_find.3 \
-	stringlist.3 sl_free.3 stringlist.3 sl_init.3
+MLINKS+=stringlist.3 sl_add.3 \
+	stringlist.3 sl_find.3 \
+	stringlist.3 sl_free.3 \
+	stringlist.3 sl_init.3
 MLINKS+=strtofflags.3 fflagstostr.3
-MLINKS+=sysctl.3 sysctlbyname.3 sysctl.3 sysctlnametomib.3
-MLINKS+=syslog.3 closelog.3 syslog.3 openlog.3 syslog.3 setlogmask.3 \
+MLINKS+=sysctl.3 sysctlbyname.3 \
+	sysctl.3 sysctlnametomib.3
+MLINKS+=syslog.3 closelog.3 \
+	syslog.3 openlog.3 \
+	syslog.3 setlogmask.3 \
 	syslog.3 vsyslog.3
-MLINKS+=tcsendbreak.3 tcdrain.3 tcsendbreak.3 tcflow.3 tcsendbreak.3 tcflush.3
-MLINKS+=tcsetattr.3 cfgetispeed.3 tcsetattr.3 cfgetospeed.3 \
-	tcsetattr.3 cfmakeraw.3 tcsetattr.3 cfmakesane.3 \
-	tcsetattr.3 cfsetispeed.3 tcsetattr.3 cfsetospeed.3 \
-	tcsetattr.3 cfsetspeed.3 tcsetattr.3 tcgetattr.3
-MLINKS+=ttyname.3 isatty.3 ttyname.3 ttyname_r.3
+MLINKS+=tcsendbreak.3 tcdrain.3 \
+	tcsendbreak.3 tcflow.3 \
+	tcsendbreak.3 tcflush.3
+MLINKS+=tcsetattr.3 cfgetispeed.3 \
+	tcsetattr.3 cfgetospeed.3 \
+	tcsetattr.3 cfmakeraw.3 \
+	tcsetattr.3 cfmakesane.3 \
+	tcsetattr.3 cfsetispeed.3 \
+	tcsetattr.3 cfsetospeed.3 \
+	tcsetattr.3 cfsetspeed.3 \
+	tcsetattr.3 tcgetattr.3
+MLINKS+=ttyname.3 isatty.3 \
+	ttyname.3 ttyname_r.3
 MLINKS+=tzset.3 tzsetwall.3
-MLINKS+=unvis.3 strunvis.3 unvis.3 strunvisx.3
-MLINKS+=vis.3 strvis.3 vis.3 strvisx.3
+MLINKS+=unvis.3 strunvis.3 \
+	unvis.3 strunvisx.3
+MLINKS+=vis.3 strvis.3 \
+	vis.3 strvisx.3
 MLINKS+=wordexp.3 wordfree.3
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index a35ed5d..9f216dc 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -78,59 +78,212 @@ ${SPSEUDO}:
 	    >> ${.TARGET}
 	printf ${NOTE_GNU_STACK} >>${.TARGET}
 
-MAN+=	abort2.2 accept.2 access.2 acct.2 adjtime.2 \
-	aio_cancel.2 aio_error.2 aio_read.2 aio_return.2 \
-	aio_suspend.2 aio_waitcomplete.2 aio_write.2 \
-	bind.2 brk.2 cap_enter.2 cap_new.2 chdir.2 chflags.2 \
-	chmod.2 chown.2 chroot.2 clock_gettime.2 close.2 closefrom.2 \
-	connect.2 cpuset.2 cpuset_getaffinity.2 dup.2 execve.2 _exit.2 \
-	extattr_get_file.2 fcntl.2 ffclock.2 fhopen.2 flock.2 fork.2 fsync.2 \
-	getdirentries.2 getdtablesize.2 \
-	getfh.2 getfsstat.2 getgid.2 getgroups.2 getitimer.2 getlogin.2 \
-	getloginclass.2 getpeername.2 getpgrp.2 getpid.2 getpriority.2 \
-	getrlimit.2 getrusage.2 getsid.2 getsockname.2 \
-	getsockopt.2 gettimeofday.2 getuid.2 \
-	intro.2 ioctl.2 issetugid.2 jail.2 kenv.2 kill.2 \
-	kldfind.2 kldfirstmod.2 kldload.2 kldnext.2 kldstat.2 kldsym.2 \
-	kldunload.2 kqueue.2 ktrace.2 link.2 lio_listio.2 listen.2 \
+MAN+=	abort2.2 \
+	accept.2 \
+	access.2 \
+	acct.2 \
+	adjtime.2 \
+	aio_cancel.2 \
+	aio_error.2 \
+	aio_read.2 \
+	aio_return.2 \
+	aio_suspend.2 \
+	aio_waitcomplete.2 \
+	aio_write.2 \
+	bind.2 \
+	brk.2 \
+	cap_enter.2 \
+	cap_new.2 \
+	chdir.2 \
+	chflags.2 \
+	chmod.2 \
+	chown.2 \
+	chroot.2 \
+	clock_gettime.2 \
+	close.2 \
+	closefrom.2 \
+	connect.2 \
+	cpuset.2 \
+	cpuset_getaffinity.2 \
+	dup.2 \
+	execve.2 \
+	_exit.2 \
+	extattr_get_file.2 \
+	fcntl.2 \
+	ffclock.2 \
+	fhopen.2 \
+	flock.2 \
+	fork.2 \
+	fsync.2 \
+	getdirentries.2 \
+	getdtablesize.2 \
+	getfh.2 \
+	getfsstat.2 \
+	getgid.2 \
+	getgroups.2 \
+	getitimer.2 \
+	getlogin.2 \
+	getloginclass.2 \
+	getpeername.2 \
+	getpgrp.2 \
+	getpid.2 \
+	getpriority.2 \
+	getrlimit.2 \
+	getrusage.2 \
+	getsid.2 \
+	getsockname.2 \
+	getsockopt.2 \
+	gettimeofday.2 \
+	getuid.2 \
+	intro.2 \
+	ioctl.2 \
+	issetugid.2 \
+	jail.2 \
+	kenv.2 \
+	kill.2 \
+	kldfind.2 \
+	kldfirstmod.2 \
+	kldload.2 \
+	kldnext.2 \
+	kldstat.2 \
+	kldsym.2 \
+	kldunload.2 \
+	kqueue.2 \
+	ktrace.2 \
+	link.2 \
+	lio_listio.2 \
+	listen.2 \
 	lseek.2 \
-	madvise.2 mincore.2 minherit.2 mkdir.2 mkfifo.2 mknod.2 mlock.2 \
-	mlockall.2 mmap.2 modfind.2 modnext.2 modstat.2 mount.2 mprotect.2 \
-	mq_close.2 mq_getattr.2 mq_notify.2 mq_open.2 mq_receive.2 mq_send.2 \
+	madvise.2 \
+	mincore.2 \
+	minherit.2 \
+	mkdir.2 \
+	mkfifo.2 \
+	mknod.2 \
+	mlock.2 \
+	mlockall.2 \
+	mmap.2 \
+	modfind.2 \
+	modnext.2 \
+	modstat.2 \
+	mount.2 \
+	mprotect.2 \
+	mq_close.2 \
+	mq_getattr.2 \
+	mq_notify.2 \
+	mq_open.2 \
+	mq_receive.2 \
+	mq_send.2 \
 	mq_setattr.2 \
-	msgctl.2 msgget.2 msgrcv.2 msgsnd.2 \
-	msync.2 munmap.2 nanosleep.2 nfssvc.2 ntp_adjtime.2 open.2 \
-	pathconf.2 pdfork.2 pipe.2 poll.2 posix_fadvise.2 posix_fallocate.2 \
-	posix_openpt.2 profil.2 \
-	pselect.2 ptrace.2 quotactl.2 \
-	read.2 readlink.2 reboot.2 recv.2 rename.2 revoke.2 rfork.2 rmdir.2 \
+	msgctl.2 \
+	msgget.2 \
+	msgrcv.2 \
+	msgsnd.2 \
+	msync.2 \
+	munmap.2 \
+	nanosleep.2 \
+	nfssvc.2 \
+	ntp_adjtime.2 \
+	open.2 \
+	pathconf.2 \
+	pdfork.2 \
+	pipe.2 \
+	poll.2 \
+	posix_fadvise.2 \
+	posix_fallocate.2 \
+	posix_openpt.2 \
+	profil.2 \
+	pselect.2 \
+	ptrace.2 \
+	quotactl.2 \
+	read.2 \
+	readlink.2 \
+	reboot.2 \
+	recv.2 \
+	rename.2 \
+	revoke.2 \
+	rfork.2 \
+	rmdir.2 \
 	rtprio.2
 .if !defined(NO_P1003_1B)
-MAN+=	sched_get_priority_max.2 sched_setparam.2 \
-	sched_setscheduler.2 sched_yield.2
+MAN+=	sched_get_priority_max.2 \
+	sched_setparam.2 \
+	sched_setscheduler.2 \
+	sched_yield.2
 .endif
-MAN+=	sctp_generic_recvmsg.2 sctp_generic_sendmsg.2 sctp_peeloff.2 \
-	select.2 semctl.2 semget.2 semop.2 send.2 setfib.2 sendfile.2 \
-	setgroups.2 setpgid.2 setregid.2 setresuid.2 setreuid.2 setsid.2 \
-	setuid.2 shmat.2 shmctl.2 shmget.2 shm_open.2 shutdown.2 \
-	sigaction.2 sigaltstack.2 sigpending.2 sigprocmask.2 sigqueue.2 \
-	sigreturn.2 sigstack.2 sigsuspend.2 sigwait.2 sigwaitinfo.2 \
-	socket.2 socketpair.2 stat.2 statfs.2 \
-	swapon.2 symlink.2 sync.2 sysarch.2 syscall.2 \
-	timer_create.2 timer_delete.2 timer_settime.2 \
-	truncate.2 umask.2 undelete.2 \
-	unlink.2 utimes.2 utrace.2 uuidgen.2 vfork.2 wait.2 write.2
-
-MLINKS+=access.2 eaccess.2 access.2 faccessat.2
+MAN+=	sctp_generic_recvmsg.2 \
+	sctp_generic_sendmsg.2 \
+	sctp_peeloff.2 \
+	select.2 \
+	semctl.2 \
+	semget.2 \
+	semop.2 \
+	send.2 \
+	setfib.2 \
+	sendfile.2 \
+	setgroups.2 \
+	setpgid.2 \
+	setregid.2 \
+	setresuid.2 \
+	setreuid.2 \
+	setsid.2 \
+	setuid.2 \
+	shmat.2 \
+	shmctl.2 \
+	shmget.2 \
+	shm_open.2 \
+	shutdown.2 \
+	sigaction.2 \
+	sigaltstack.2 \
+	sigpending.2 \
+	sigprocmask.2 \
+	sigqueue.2 \
+	sigreturn.2 \
+	sigstack.2 \
+	sigsuspend.2 \
+	sigwait.2 \
+	sigwaitinfo.2 \
+	socket.2 \
+	socketpair.2 \
+	stat.2 \
+	statfs.2 \
+	swapon.2 \
+	symlink.2 \
+	sync.2 \
+	sysarch.2 \
+	syscall.2 \
+	timer_create.2 \
+	timer_delete.2 \
+	timer_settime.2 \
+	truncate.2 \
+	umask.2 \
+	undelete.2 \
+	unlink.2 \
+	utimes.2 \
+	utrace.2 \
+	uuidgen.2 \
+	vfork.2 \
+	wait.2 \
+	write.2
+
+MLINKS+=access.2 eaccess.2 \
+	access.2 faccessat.2
 MLINKS+=brk.2 sbrk.2
 MLINKS+=cap_enter.2 cap_getmode.2
 MLINKS+=cap_new.2 cap_getrights.2
 MLINKS+=chdir.2 fchdir.2
-MLINKS+=chflags.2 fchflags.2 chflags.2 lchflags.2
-MLINKS+=chmod.2 fchmod.2 chmod.2 fchmodat.2 chmod.2 lchmod.2
-MLINKS+=chown.2 fchown.2 chown.2 fchownat.2 chown.2 lchown.2
-MLINKS+=clock_gettime.2 clock_getres.2 clock_gettime.2 clock_settime.2
-MLINKS+=cpuset.2 cpuset_getid.2 cpuset.2 cpuset_setid.2
+MLINKS+=chflags.2 fchflags.2 \
+	chflags.2 lchflags.2
+MLINKS+=chmod.2 fchmod.2 \
+	chmod.2 fchmodat.2 \
+	chmod.2 lchmod.2
+MLINKS+=chown.2 fchown.2 \
+	chown.2 fchownat.2 \
+	chown.2 lchown.2
+MLINKS+=clock_gettime.2 clock_getres.2 \
+	clock_gettime.2 clock_settime.2
+MLINKS+=cpuset.2 cpuset_getid.2 \
+	cpuset.2 cpuset_setid.2
 MLINKS+=cpuset_getaffinity.2 cpuset_setaffinity.2
 MLINKS+=dup.2 dup2.2
 MLINKS+=execve.2 fexecve.2
@@ -146,7 +299,8 @@ MLINKS+=extattr_get_file.2 extattr.2 \
 	extattr_get_file.2 extattr_set_fd.2 \
 	extattr_get_file.2 extattr_set_file.2 \
 	extattr_get_file.2 extattr_set_link.2
-MLINKS+=ffclock.2 ffclock_getcounter.2 ffclock.2 ffclock_getestimate.2 \
+MLINKS+=ffclock.2 ffclock_getcounter.2 \
+	ffclock.2 ffclock_getestimate.2 \
 	ffclock.2 ffclock_setestimate.2
 MLINKS+=fhopen.2 fhstat.2 fhopen.2 fhstatfs.2
 MLINKS+=getdirentries.2 getdents.2
@@ -169,7 +323,8 @@ MLINKS+=jail.2 jail_attach.2 \
 	jail.2 jail_remove.2 \
 	jail.2 jail_set.2
 MLINKS+=kldunload.2 kldunloadf.2
-MLINKS+=kqueue.2 kevent.2 kqueue.2 EV_SET.3
+MLINKS+=kqueue.2 kevent.2 \
+	kqueue.2 EV_SET.3
 MLINKS+=link.2 linkat.2
 MLINKS+=madvise.2 posix_madvise.2
 MLINKS+=mkdir.2 mkdirat.2
@@ -178,7 +333,8 @@ MLINKS+=mknod.2 mknodat.2
 MLINKS+=mlock.2 munlock.2
 MLINKS+=mlockall.2 munlockall.2
 MLINKS+=modnext.2 modfnext.2
-MLINKS+=mount.2 nmount.2 mount.2 unmount.2
+MLINKS+=mount.2 nmount.2 \
+	mount.2 unmount.2
 MLINKS+=mq_receive.2 mq_timedreceive.2
 MLINKS+=mq_send.2 mq_timedsend.2
 MLINKS+=ntp_adjtime.2 ntp_gettime.2
@@ -188,9 +344,12 @@ MLINKS+=pathconf.2 lpathconf.2
 MLINKS+=pdfork.2 pdgetpid.2\
 	pdfork.2 pdkill.2 \
 	pdfork.2 pdwait4.2
-MLINKS+=read.2 pread.2 read.2 preadv.2 read.2 readv.2
+MLINKS+=read.2 pread.2 \
+	read.2 preadv.2 \
+	read.2 readv.2
 MLINKS+=readlink.2 readlinkat.2
-MLINKS+=recv.2 recvfrom.2 recv.2 recvmsg.2
+MLINKS+=recv.2 recvfrom.2 \
+	recv.2 recvmsg.2
 MLINKS+=rename.2 renameat.2
 MLINKS+=rtprio.2 rtprio_thread.2
 .if !defined(NO_P1003_1B)
@@ -199,24 +358,41 @@ MLINKS+=sched_get_priority_max.2 sched_get_priority_min.2 \
 MLINKS+=sched_setparam.2 sched_getparam.2
 MLINKS+=sched_setscheduler.2 sched_getscheduler.2
 .endif
-MLINKS+=select.2 FD_CLR.3 select.2 FD_ISSET.3 select.2 FD_SET.3 \
+MLINKS+=select.2 FD_CLR.3 \
+	select.2 FD_ISSET.3 \
+	select.2 FD_SET.3 \
 	select.2 FD_ZERO.3
-MLINKS+=send.2 sendmsg.2 send.2 sendto.2
+MLINKS+=send.2 sendmsg.2 \
+	send.2 sendto.2
 MLINKS+=setpgid.2 setpgrp.2
-MLINKS+=setresuid.2 getresgid.2 setresuid.2 getresuid.2 setresuid.2 setresgid.2
-MLINKS+=setuid.2 setegid.2 setuid.2 seteuid.2 setuid.2 setgid.2
+MLINKS+=setresuid.2 getresgid.2 \
+	setresuid.2 getresuid.2 \
+	setresuid.2 setresgid.2
+MLINKS+=setuid.2 setegid.2 \
+	setuid.2 seteuid.2 \
+	setuid.2 setgid.2
 MLINKS+=shmat.2 shmdt.2
 MLINKS+=shm_open.2 shm_unlink.2
 MLINKS+=sigwaitinfo.2 sigtimedwait.2
-MLINKS+=stat.2 fstat.2 stat.2 fstatat.2 stat.2 lstat.2
+MLINKS+=stat.2 fstat.2 \
+	stat.2 fstatat.2 \
+	stat.2 lstat.2
 MLINKS+=statfs.2 fstatfs.2
 MLINKS+=swapon.2 swapoff.2
 MLINKS+=symlink.2 symlinkat.2
 MLINKS+=syscall.2 __syscall.2
-MLINKS+=timer_settime.2 timer_getoverrun.2 timer_settime.2 timer_gettime.2
+MLINKS+=timer_settime.2 timer_getoverrun.2 \
+	timer_settime.2 timer_gettime.2
 MLINKS+=truncate.2 ftruncate.2
 MLINKS+=unlink.2 unlinkat.2
-MLINKS+=utimes.2 futimes.2 utimes.2 futimesat.2 utimes.2 lutimes.2
-MLINKS+=wait.2 wait3.2 wait.2 wait4.2 wait.2 waitpid.2 \
-	wait.2 waitid.2 wait.2 wait6.2
-MLINKS+=write.2 pwrite.2 write.2 pwritev.2 write.2 writev.2
+MLINKS+=utimes.2 futimes.2 \
+	utimes.2 futimesat.2 \
+	utimes.2 lutimes.2
+MLINKS+=wait.2 wait3.2 \
+	wait.2 wait4.2 \
+	wait.2 waitpid.2 \
+	wait.2 waitid.2 \
+	wait.2 wait6.2
+MLINKS+=write.2 pwrite.2 \
+	write.2 pwritev.2 \
+	write.2 writev.2