Fix xsetfd, close eloop fd with epoll and correct a diagnositic message.

Author: rsmarples

src/common.c

@@ -473,7 +473,7 @@ xsetfd(int fd, int flags)
 		if (oflags == -1)
 			return -1;
 		if (!(oflags & FD_CLOEXEC) &&
-		    fcntl(fd, F_SETFD, oflags | O_NONBLOCK) == -1)
+		    fcntl(fd, F_SETFD, oflags | FD_CLOEXEC) == -1)
 			return -1;
 	}
 #endif

src/eloop.c

@@ -700,7 +700,11 @@ eloop_forked(struct eloop *eloop, unsigned short flags)
 	unsigned short events;
 	int err;
 
-	/* The fd is invalid after a fork, no need to close it. */
+/* kqueue invalidates the fd on fork.
+ * epoll shares state across fork, so we close the old and create a new one. */
+#ifdef USE_EPOLL
+	close(eloop->fd);
+#endif
 	eloop->fd = -1;
 	if (flags && eloop_open(eloop) == -1)
 		return -1;

src/service.c

@@ -102,12 +102,12 @@ srv_recv(struct srv_ctx *sctx, unsigned short e)
 
 		nread = recvmsg(sctx->srv_fd, &msg, MSG_WAITALL);
 		if (nread == -1) {
-			logerr("%s: recvmsg cmd", __func__);
+			logerr("%s: recvmsg data", __func__);
 			return -1;
 		}
 		if ((size_t)nread != cmd.sc_datalen) {
-			logerrx("%s: read datalen mismatch: %zd != %zd",
-			    __func__, nread, cmd.sc_datalen);
+			logerrx("%s: read datalen mismatch: %zu != %zu",
+			    __func__, (size_t)nread, cmd.sc_datalen);
 			return -1;
 		}
 	}