projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes'
[git.git]
/
daemon.c
diff --git
a/daemon.c
b/daemon.c
index
b6006c7
..
f285a8c
100644
(file)
--- a/
daemon.c
+++ b/
daemon.c
@@
-463,9
+463,7
@@
static int socksetup(int port, int **socklist_p)
return 0;
}
return 0;
}
- *socklist_p = malloc(sizeof(int));
- if ( !*socklist_p )
- die("memory allocation failed: %s", strerror(errno));
+ *socklist_p = xmalloc(sizeof(int));
**socklist_p = sockfd;
}
**socklist_p = sockfd;
}
@@
-476,14
+474,14
@@
static int service_loop(int socknum, int *socklist)
struct pollfd *pfd;
int i;
struct pollfd *pfd;
int i;
- pfd = calloc(socknum, sizeof(struct pollfd));
- if (!pfd)
- die("memory allocation failed: %s", strerror(errno));
+ pfd = xcalloc(socknum, sizeof(struct pollfd));
for (i = 0; i < socknum; i++) {
pfd[i].fd = socklist[i];
pfd[i].events = POLLIN;
}
for (i = 0; i < socknum; i++) {
pfd[i].fd = socklist[i];
pfd[i].events = POLLIN;
}
+
+ signal(SIGCHLD, child_handler);
for (;;) {
int i;
for (;;) {
int i;
@@
-500,7
+498,7
@@
static int service_loop(int socknum, int *socklist)
for (i = 0; i < socknum; i++) {
if (pfd[i].revents & POLLIN) {
struct sockaddr_storage ss;
for (i = 0; i < socknum; i++) {
if (pfd[i].revents & POLLIN) {
struct sockaddr_storage ss;
- int sslen = sizeof(ss);
+
unsigned
int sslen = sizeof(ss);
int incoming = accept(pfd[i].fd, (struct sockaddr *)&ss, &sslen);
if (incoming < 0) {
switch (errno) {
int incoming = accept(pfd[i].fd, (struct sockaddr *)&ss, &sslen);
if (incoming < 0) {
switch (errno) {
@@
-522,8
+520,6
@@
static int serve(int port)
{
int socknum, *socklist;
{
int socknum, *socklist;
- signal(SIGCHLD, child_handler);
-
socknum = socksetup(port, &socklist);
if (socknum == 0)
die("unable to allocate any listen sockets on port %u", port);
socknum = socksetup(port, &socklist);
if (socknum == 0)
die("unable to allocate any listen sockets on port %u", port);