Commit Diff

Commit:
9b8f5ed2c0c53467115b3b1d6754642d8e5e4da1
From:
Omar Polo <op@omarpolo.com>
Date:
Message:
revert commit 346f28eeaa205d268d1e63c7ffd86cf041f6d1e6 keep mark_nonblock in utils.c, as otherwise the build for the regress suite will fail (mark_nonblock needs fatal which is in gmid.c, and we can't link gmid.o with the regress suite...)
Actions:
Patch | Tree
commit - 9edb82825145b2311c547003b9e7ca286ef7db3a
commit + 9b8f5ed2c0c53467115b3b1d6754642d8e5e4da1
blob - 5ccf59b45825328ff3a10f73f5251aef31d6ea72
blob + 5c107e28544ad469afabc31c905eef330f54eff3
--- gmid.h
+++ gmid.h
@@ -220,6 +220,7 @@ const char	*vhost_lang(struct vhost*, const char*);
 const char	*vhost_default_mime(struct vhost*, const char*);
 const char	*vhost_index(struct vhost*, const char*);
 int		 vhost_auto_index(struct vhost*, const char*);
+void		 mark_nonblock(int);
 void		 loop(struct tls*, int, int);
 
 /* ex.c */
@@ -253,7 +254,6 @@ int		 puny_decode(const char*, char*, size_t, const ch
 int		 starts_with(const char*, const char*);
 int		 ends_with(const char*, const char*);
 ssize_t		 filesize(int);
-void		 mark_nonblock(int);
 char		*absolutify_path(const char*);
 
 #endif
blob - 0a8d794f4907f5b8b7f50a76ee046a4b0932aa79
blob + 07fb904bc4bcb08f50ab7500cdacf488263b3e7e
--- server.c
+++ server.c
@@ -268,6 +268,17 @@ err:
 	return;
 }
 
+void
+mark_nonblock(int fd)
+{
+	int flags;
+
+	if ((flags = fcntl(fd, F_GETFL)) == -1)
+		fatal("fcntl(F_GETFL): %s", strerror(errno));
+	if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) == -1)
+		fatal("fcntl(F_SETFL): %s", strerror(errno));
+}
+
 static void
 handle_handshake(struct pollfd *fds, struct client *c)
 {
blob - c64a181ece812e1786646b5ecd0e62d5573f45fe
blob + c32ecb8af4fe2267ab399151dff9bedf9ef4c50c
--- utils.c
+++ utils.c
@@ -15,7 +15,6 @@
  */
 
 #include <errno.h>
-#include <fcntl.h>
 #include <string.h>
 
 #include "gmid.h"
@@ -64,17 +63,6 @@ filesize(int fd)
 	return len;
 }
 
-void
-mark_nonblock(int fd)
-{
-	int flags;
-
-	if ((flags = fcntl(fd, F_GETFL)) == -1)
-		fatal("fcntl(F_GETFL): %s", strerror(errno));
-	if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) == -1)
-		fatal("fcntl(F_SETFL): %s", strerror(errno));
-}
-
 char *
 absolutify_path(const char *path)
 {