5 files changed, 47 insertions, 23 deletions
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
index 6cfda08..fac1e43 100644
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -491,6 +491,20 @@ MLINKS+=ttyname.3 isatty.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+=vis.3 nvis.3 \
+	vis.3 snvis.3 \
+	vis.3 strenvisx.3 \
+	vis.3 strnunvis.3 \
+	vis.3 strnunvisx.3 \
+	vis.3 strnvis.3 \
+	vis.3 strnvisx.3 \
+	vis.3 strsenvisx.3 \
+	vis.3 strsnvis.3 \
+	vis.3 strsnvisx.3 \
+	vis.3 strsvis.3 \
+	vis.3 strsvisx.3 \
+	vis.3 strvis.3 \
+	vis.3 strvisx.3 \
+	vis.3 svis.3
+
 MLINKS+=wordexp.3 wordfree.3
diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map
index 4cbf07c..2438951 100644
--- a/lib/libc/gen/Symbol.map
+++ b/lib/libc/gen/Symbol.map
@@ -391,10 +391,12 @@ FBSD_1.3 {
 	pwcache_userdb;
 	pwcache_groupdb;
 	snvis;
+	strenvisx;
 	strnunvis;
 	strnunvisx;
 	strnvis;
 	strnvisx;
+	strsenvisx;
 	strsnvis;
 	strsnvisx;
 	strsvis;
diff --git a/lib/libc/sys/chflags.2 b/lib/libc/sys/chflags.2
index 59979a3..ab8af51 100644
--- a/lib/libc/sys/chflags.2
+++ b/lib/libc/sys/chflags.2
@@ -232,3 +232,7 @@ and
 .Fn fchflags
 system calls first appeared in
 .Bx 4.4 .
+The
+.Fn lchflags
+system call first appeared in
+.Fx 5.0 .
diff --git a/lib/libipsec/test-policy.c b/lib/libipsec/test-policy.c
index c1dfc79..a24a0b41 100644
--- a/lib/libipsec/test-policy.c
+++ b/lib/libipsec/test-policy.c
@@ -75,14 +75,13 @@ struct req_t {
 { 1, "out ipsec ah/transport esp/use" },
 { 1, "in ipsec ah/transport esp/tunnel" },
 { 0, "in ipsec ah/transport esp/tunnel/::1-::1" },
-{ 0, "in ipsec
-	ah / transport
-	esp / tunnel / ::1-::2" },
-{ 0, "out ipsec
-	ah/transport/::1-::2 esp/tunnel/::3-::4/use ah/transport/::5-::6/require
-	ah/transport/::1-::2 esp/tunnel/::3-::4/use ah/transport/::5-::6/require
-	ah/transport/::1-::2 esp/tunnel/::3-::4/use ah/transport/::5-::6/require
-	" },
+{ 0, "in ipsec\n"
+	"ah / transport\n"
+	"esp / tunnel / ::1-::2" },
+{ 0, "out ipsec\n"
+	"ah/transport/::1-::2 esp/tunnel/::3-::4/use ah/transport/::5-::6/require\n"
+	"ah/transport/::1-::2 esp/tunnel/::3-::4/use ah/transport/::5-::6/require\n"
+	"ah/transport/::1-::2 esp/tunnel/::3-::4/use ah/transport/::5-::6/require\n" },
 { 0, "out ipsec esp/transport/fec0::10-fec0::11/use" },
 };
 
diff --git a/lib/libutil/pidfile.c b/lib/libutil/pidfile.c
index bca0315..7949e9e 100644
--- a/lib/libutil/pidfile.c
+++ b/lib/libutil/pidfile.c
@@ -126,20 +126,25 @@ pidfile_open(const char *path, mode_t mode, pid_t *pidptr)
 	fd = flopen(pfh->pf_path,
 	    O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC | O_NONBLOCK, mode);
 	if (fd == -1) {
-		if (errno == EWOULDBLOCK && pidptr != NULL) {
-			count = 20;
-			rqtp.tv_sec = 0;
-			rqtp.tv_nsec = 5000000;
-			for (;;) {
-				errno = pidfile_read(pfh->pf_path, pidptr);
-				if (errno != EAGAIN || --count == 0)
-					break;
-				nanosleep(&rqtp, 0);
-			}
-			if (errno == EAGAIN)
-				*pidptr = -1;
-			if (errno == 0 || errno == EAGAIN)
+		if (errno == EWOULDBLOCK) {
+			if (pidptr == NULL) {
 				errno = EEXIST;
+			} else {
+				count = 20;
+				rqtp.tv_sec = 0;
+				rqtp.tv_nsec = 5000000;
+				for (;;) {
+					errno = pidfile_read(pfh->pf_path,
+					    pidptr);
+					if (errno != EAGAIN || --count == 0)
+						break;
+					nanosleep(&rqtp, 0);
+				}
+				if (errno == EAGAIN)
+					*pidptr = -1;
+				if (errno == 0 || errno == EAGAIN)
+					errno = EEXIST;
+			}
 		}
 		free(pfh);
 		return (NULL);