X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=daemon.c;h=24bac16668ffe4d2301719c48a22c48ec449cf7f;hb=b595ed1478e6240593df4c927c4a240575f53d44;hp=b7d60918ebab7816d8711b927aeae7dfab32fd2e;hpb=4d8fa916c9ff89613234f41b9222a2b679bce5c3;p=git.git

diff --git a/daemon.c b/daemon.c
index b7d60918..24bac166 100644
--- a/daemon.c
+++ b/daemon.c
@@ -3,6 +3,7 @@
 #include <signal.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 #include <netdb.h>
 #include <netinet/in.h>
 
@@ -294,8 +295,11 @@ static int serve(int port)
 		fds = fds_init;
 		
 		if (select(maxfd + 1, &fds, NULL, NULL, NULL) < 0) {
-			error("select failed, resuming: %s", strerror(errno));
-			sleep(1);
+			if (errno != EINTR) {
+				error("select failed, resuming: %s",
+				      strerror(errno));
+				sleep(1);
+			}
 			continue;
 		}
 
@@ -349,8 +353,10 @@ int main(int argc, char **argv)
 		usage(daemon_usage);
 	}
 
-	if (inetd_mode)
+	if (inetd_mode) {
+		fclose(stderr); //FIXME: workaround
 		return execute();
+	}
 
 	return serve(port);
 }