rdelaage
/
gmid
mirror of https://github.com/omar-polo/gmid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revert commit 346f28eeaa 

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...)
This commit is contained in:
Omar Polo 2021-02-03 14:16:39 +00:00
parent 9edb828251
commit 9b8f5ed2c0
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gmid.h
View File

@ -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 char**);
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

11
server.c
View File

@ -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)
{

12
utils.c
View File

@ -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)
{