X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=overlord.c;h=1cfba9b7cd6c01da5474d8b5acee00dad5eea534;hb=HEAD;hp=ae6fbfb972530cc8a599d1532014d73562f5da17;hpb=a68bf830adf982141dc41b44ee7a66dafd45ae9f;p=userv.git

diff --git a/overlord.c b/overlord.c
index ae6fbfb..756c5ab 100644
--- a/overlord.c
+++ b/overlord.c
@@ -2,11 +2,12 @@
  * userv - overlord.c
  * daemon main program, collects request and forks handlers
  *
- * Copyright (C)1996-1997,1999 Ian Jackson
+ * userv is copyright Ian Jackson and other contributors.
+ * See README for full authorship information.
  *
  * This is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
@@ -15,8 +16,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with userv; if not, write to the Free Software
- * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with userv; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <unistd.h>
@@ -25,6 +25,7 @@
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <assert.h>
 #include <fnmatch.h>
 #include <sys/wait.h>
@@ -67,7 +68,7 @@ static void checkstalepipes(void) {
   if (time(&now) == -1) { syslog(LOG_ERR,"get current time: %m"); return; }
   dir= opendir(".");
   if (!dir) { syslog(LOG_ERR,"open directory " VARDIR ": %m"); return; }
-  while ((de= readdir(dir))) {
+  while ((errno=0, de= readdir(dir))) {
     if (fnmatch(PIPEPATTERN,de->d_name,FNM_PATHNAME|FNM_PERIOD)) continue;
     r= lstat(de->d_name,&stab); if (r && errno==ENOENT) continue;
     if (r) { syslog(LOG_ERR,"could not stat `" VARDIR "/%s': %m",de->d_name); continue; }
@@ -76,12 +77,13 @@ static void checkstalepipes(void) {
     if (unlink(de->d_name) && errno!=ENOENT)
       syslog(LOG_ERR,"could not remove stale pipe `%s': %m",de->d_name);
   }
+  if (errno) syslog(LOG_ERR,"read directory " VARDIR ": %m");
   if (closedir(dir)) syslog(LOG_ERR,"close directory " VARDIR ": %m");
 }
 
 static void sighandler_chld(int x) {
   pid_t r;
-  int status, es, ar;
+  int status, es;
 
   es= errno;
   for (;;) {
@@ -117,8 +119,7 @@ static void sighandler_chld(int x) {
 	       (long)checkpid,status);
       }
       checkpid= -1;
-      ar= alarm(USERVD_MYSELF_CHECK);
-      if (ar<0) { syslog(LOG_CRIT,"set alarm for next check: %m"); exit(5); }
+      alarm(USERVD_MYSELF_CHECK);
     } else {
       if (WIFSIGNALED(status)) {
 	syslog(LOG_ERR,"call pid %ld %s due to signal %s",
@@ -208,8 +209,7 @@ static void NONRETURNING docheck(int needwanted) {
     syslog(LOG_ERR,"unable to connect to uservd daemon: %m"); exit(1);
   }
 
-  r= alarm(USERVD_MYSELF_TIMEOUT);
-  if (r<0) { syslog(LOG_ERR,"set alarm for read: %m"); exit(1); }
+  alarm(USERVD_MYSELF_TIMEOUT);
   remain= sizeof(opening_mbuf); p= (unsigned char*)&opening_mbuf;
   while (remain) {
     r= read(sfd,p,remain);
@@ -247,7 +247,8 @@ static void NONRETURNING docheck(int needwanted) {
   r= write(sfd,&request_mbuf,sizeof(request_mbuf));
   if (r==sizeof(request_mbuf)) {
     endmagic= REQUEST_END_MAGIC;
-    write(sfd,&endmagic,sizeof(endmagic));
+    r= write(sfd,&endmagic,sizeof(endmagic));
+    (void)r;
   }
   syslog(LOG_NOTICE,"uservd[%ld] is running",(long)overlordpid);
 #endif
@@ -263,7 +264,8 @@ static void NONRETURNING startupsyscallerr(const char *what) {
 }
 
 int main(int argc, char *const *argv) {
-  int mfd, sfd, nfd, csocklen, e, r, becomedaemon;
+  int mfd, sfd, nfd, e, r, becomedaemon;
+  socklen_t csocklen;
   struct sigaction sigact;
   struct sockaddr_un ssockname, csockname;
   pid_t child, parentpid, sid;
@@ -353,8 +355,7 @@ int main(int argc, char *const *argv) {
 	  break;
 	} else if (errno==EAGAIN) {
 	  syslog(LOG_ERR,"fork for check - will wait and retry: %m");
-	  r= alarm(USERVD_CHECKFORK_RETRY);
-	  if (r<0) { syslog(LOG_CRIT,"set alarm for retry check: %m"); exit(5); }
+	  alarm(USERVD_CHECKFORK_RETRY);
 	  break;
 	} else if (errno!=EINTR) {
 	  syslog(LOG_CRIT,"fork for check: %m"); exit(5);