Pull in sources from zephyr locker. See /mit/zephyr/repository for

detailed change information.

1 files changed, 266 insertions, 310 deletions

diff --git a/zhm/zhm.c b/zhm/zhm.c
index ff89aec..51a67af 100644
--- a/zhm/zhm.c
+++ b/zhm/zhm.c
@@ -13,28 +13,9 @@
 
 #include "zhm.h"
 
-static char rcsid_hm_c[] = "$Id$";
+static const char rcsid_hm_c[] = "$Id$";
 
-#ifdef POSIX
-#include <unistd.h>
-#include <stdlib.h>
-#endif
-
-#include <ctype.h>
-#include <signal.h>
-#include <sys/ioctl.h>
-#include <sys/file.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-/* 
- * warning: sys/param.h may include sys/types.h which may not be protected from
- * multiple inclusions on your system
- */
-#include <sys/param.h>
-
-#ifdef Z_HaveHesiod
-#include <hesiod.h>
+#ifdef ZEPHYR_USES_HESIOD
 int use_hesiod = 0;
 #endif
 
@@ -42,6 +23,12 @@ int use_hesiod = 0;
 #define srandom srand48
 #endif
 
+#ifdef _PATH_VARRUN
+#define PIDDIR _PATH_VARRUN
+#else
+#define PIDDIR "/etc/"
+#endif
+
 int hmdebug, rebootflag, errflg, dieflag, inetd, oldpid, nofork;
 int no_server = 1, nservchang, nserv, nclt;
 int booting = 1, timeout_type, deactivated = 1;
@@ -49,219 +36,220 @@ long starttime;
 u_short cli_port;
 struct sockaddr_in cli_sin, serv_sin, from;
 int numserv;
-char **serv_list = (char **)0;
+char **serv_list = NULL;
 char prim_serv[MAXHOSTNAMELEN], cur_serv[MAXHOSTNAMELEN];
 char *zcluster;
-int sig_type;
+int deactivating = 0;
+int terminating = 0;
 struct hostent *hp;
 char **clust_info;
 char hostname[MAXHOSTNAMELEN], loopback[4];
-char *PidFile = PIDFILE;
-
-void choose_server(), init_hm(), detach(),
-    handle_timeout(), resend_notices(), die_gracefully();
-
-#ifdef POSIX
-void
-#endif
-  set_sig_type(sig)
-     int sig;
+char PidFile[128];
+
+static RETSIGTYPE deactivate __P((void));
+static RETSIGTYPE terminate __P((void));
+static void choose_server __P((void));
+static void init_hm __P((void));
+static void detach __P((void));
+static void send_stats __P((ZNotice_t *, struct sockaddr_in *));
+static char *strsave __P((const char *));
+extern int optind;
+
+static RETSIGTYPE deactivate()
 {
-     sig_type = sig;
+    deactivating = 1;
 }
 
-char *strsave();
+static RETSIGTYPE terminate()
+{
+    terminating = 1;
+}
 
 main(argc, argv)
 char *argv[];
 {
-     ZNotice_t notice;
-     ZPacket_t packet;
-     Code_t ret;
-     int opt, pak_len;
-     extern int optind;
-     register int i, j = 0;
-
-#ifdef _AIX
-     struct sigaction sa;
-
-     sigemptyset(&sa.sa_mask);
-     sa.sa_flags = SA_FULLDUMP;
-     sa.sa_handler = SIG_DFL;
-     sigaction(SIGSEGV, &sa, (struct sigaction *)0);
-#endif
-     
-     if (gethostname(hostname, MAXHOSTNAMELEN) < 0) {
-	  printf("Can't find my hostname?!\n");
-	  exit(-1);
-     }
-     prim_serv[0] = '\0';
-     while ((opt = getopt(argc, argv, "drhin")) != EOF)
-	  switch(opt) {
+    ZNotice_t notice;
+    ZPacket_t packet;
+    Code_t ret;
+    int opt, pak_len, i, j = 0, fd, count;
+    fd_set readers;
+    struct timeval tv;
+
+    sprintf(PidFile, "%szhm.pid", PIDDIR);
+
+    if (gethostname(hostname, MAXHOSTNAMELEN) < 0) {
+	printf("Can't find my hostname?!\n");
+	exit(-1);
+    }
+    prim_serv[0] = '\0';
+    while ((opt = getopt(argc, argv, "drhin")) != EOF)
+	switch(opt) {
 	  case 'd':
-	       hmdebug++;
-	       break;
+	    hmdebug = 1;
+	    break;
 	  case 'h':
-	       /* Die on SIGHUP */
-	       dieflag++;
-	       break;
+	    /* Die on SIGHUP */
+	    dieflag = 1;
+	    break;
 	  case 'r':
-	       /* Reboot host -- send boot notice -- and exit */
-	       rebootflag++;
-	       break;
+	    /* Reboot host -- send boot notice -- and exit */
+	    rebootflag= 1;
+	    break;
 	  case 'i':
-	       /* inetd operation: don't do bind ourselves, fd 0 is
-		  already connected to a socket. Implies -h */
-	       inetd++;
-	       dieflag++;
-	       break;
+	    /* inetd operation: don't do bind ourselves, fd 0 is
+	       already connected to a socket. Implies -h */
+	    inetd = 1;
+	    dieflag = 1;
+	    break;
 	  case 'n':
-	       nofork = 1;
-	       break;
+	    nofork = 1;
+	    break;
 	  case '?':
 	  default:
-	       errflg++;
-	       break;
-	  }
-     if (errflg) {
-	  fprintf(stderr, "Usage: %s [-d] [-h] [-r] [-n] [server]\n", argv[0]);
-	  exit(2);
-     }
+	    errflg++;
+	    break;
+	}
+    if (errflg) {
+	fprintf(stderr, "Usage: %s [-d] [-h] [-r] [-n] [server]\n", argv[0]);
+	exit(2);
+    }
+
+    numserv = 0;
 
-     numserv = 0;
-
-     /* Override server argument? */
-     if (optind < argc) {
-	 if ((hp = gethostbyname(argv[optind++])) == NULL) {
-	     printf("Unknown server name: %s\n", argv[optind-1]);
-	 } else
-	     (void) strcpy(prim_serv, hp->h_name);
-
-	 /* argc-optind is the # of other servers on the command line */
-	 serv_list = (char **)malloc((argc-optind + 2) * sizeof(char *));
-	 serv_list[numserv++] = prim_serv;
-	 for (; optind < argc; optind++) {
-	     if ((hp = gethostbyname(argv[optind])) == NULL) {
-		 printf("Unknown server name '%s', ignoring\n", argv[optind]);
-		 continue;
-	     }
+    /* Override server argument? */
+    if (optind < argc) {
+	if ((hp = gethostbyname(argv[optind++])) == NULL) {
+	    printf("Unknown server name: %s\n", argv[optind-1]);
+	} else
+	    strcpy(prim_serv, hp->h_name);
+
+	/* argc-optind is the # of other servers on the command line */
+	serv_list = (char **) malloc((argc - optind + 2) * sizeof(char *));
+	serv_list[numserv++] = prim_serv;
+	for (; optind < argc; optind++) {
+	    if ((hp = gethostbyname(argv[optind])) == NULL) {
+		printf("Unknown server name '%s', ignoring\n", argv[optind]);
+		continue;
+	    }
 	     serv_list[numserv++] = strsave(hp->h_name);
-	 }
-	 serv_list[numserv] = NULL;
-     }
-#ifdef Z_HaveHesiod
-     else
-	 use_hesiod = 1;
+	}
+	serv_list[numserv] = NULL;
+    }
+#ifdef ZEPHYR_USES_HESIOD
+    else
+	use_hesiod = 1;
 #endif
 
-     choose_server();
-     if (*prim_serv == '\0') {
-	 printf("No valid primary server found, exiting.\n");
-	 exit(ZERR_SERVNAK);
-     }
-     init_hm();
+    choose_server();
+    if (*prim_serv == '\0') {
+	printf("No valid primary server found, exiting.\n");
+	exit(ZERR_SERVNAK);
+    }
+    init_hm();
 
-     DPR2 ("zephyr server port: %u\n", ntohs(serv_sin.sin_port));
-     DPR2 ("zephyr client port: %u\n", ntohs(cli_port));
+    DPR2("zephyr server port: %u\n", ntohs(serv_sin.sin_port));
+    DPR2("zephyr client port: %u\n", ntohs(cli_port));
   
-     /* Main loop */
-     for ever {
-	  DPR ("Waiting for a packet...");
-	  switch(sig_type) {
-	  case 0:
-	       break;
-	  case SIGHUP:	/* A SIGHUP means we are deactivating the ws. */
-	       sig_type = 0;
-	       if (dieflag) {
-		   die_gracefully();
-	       } else {
-		   choose_server();
-		   send_flush_notice(HM_FLUSH);
-		   deactivated = 1;
-	       }
-	       break;
-	  case SIGTERM:
-	       sig_type = 0;
-	       die_gracefully();
-	       break;
-	  case SIGALRM:
-	       sig_type = 0;
-	       handle_timeout();
-	       break;
-	  default:
-	       sig_type = 0;
-	       syslog (LOG_WARNING, "Unknown system interrupt.");
-	       break;
-	  }
-	  ret = ZReceivePacket(packet, &pak_len, &from);
-	  if ((ret != ZERR_NONE) && (ret != EINTR)){
-	       Zperr(ret);
-	       com_err("hm", ret, "receiving notice");
-	  } else if (ret != EINTR) {
-	       /* Where did it come from? */
-	       if ((ret = ZParseNotice(packet, pak_len, &notice))
-		   != ZERR_NONE) {
-		   Zperr(ret);
-		   com_err("hm", ret, "parsing notice");
-	      } else {
-		   DPR ("Got a packet.\n");
-		   DPR ("notice:\n");
-		   DPR2("\tz_kind: %d\n", notice.z_kind);
-		   DPR2("\tz_port: %u\n", ntohs(notice.z_port));
-		   DPR2("\tz_class: %s\n", notice.z_class);
-		   DPR2("\tz_class_inst: %s\n", notice.z_class_inst);
-		   DPR2("\tz_opcode: %s\n", notice.z_opcode);
-		   DPR2("\tz_sender: %s\n", notice.z_sender);
-		   DPR2("\tz_recip: %s\n", notice.z_recipient);
-		   DPR2("\tz_def_format: %s\n", notice.z_default_format);
-		   DPR2("\tz_message: %s\n", notice.z_message);
-		   if (memcmp(loopback, (char *)&from.sin_addr, 4) &&
-		       ((notice.z_kind == SERVACK) ||
-			(notice.z_kind == SERVNAK) ||
-			(notice.z_kind == HMCTL))) {
-		       server_manager(&notice);
-		  } else {
-		       if (!memcmp(loopback, (char *)&from.sin_addr, 4) &&
-			   ((notice.z_kind == UNSAFE) ||
-			    (notice.z_kind == UNACKED) ||
-			    (notice.z_kind == ACKED) ||
-			    (notice.z_kind == HMCTL))) {
-			   /* Client program... */
-			   if (deactivated) {
+    /* Main loop */
+    for ever {
+	/* Wait for incoming packets or queue timeouts. */
+	DPR("Waiting for a packet...");
+	fd = ZGetFD();
+	FD_ZERO(&readers);
+	FD_SET(fd, &readers);
+	count = select(fd + 1, &readers, NULL, NULL, timer_timeout(&tv));
+	if (count == -1 && errno != EINTR) {
+	    syslog(LOG_CRIT, "select() failed: %m");
+	    die_gracefully();
+	}
+
+	if (terminating)
+	    die_gracefully();
+
+	if (deactivating) {
+	    deactivating = 0;
+	    if (dieflag) {
+		die_gracefully();
+	    } else {
+		choose_server();
+		send_flush_notice(HM_FLUSH);
+		deactivated = 1;
+	    }
+	}
+
+	timer_process();
+
+	if (count > 0) {
+	    ret = ZReceivePacket(packet, &pak_len, &from);
+	    if ((ret != ZERR_NONE) && (ret != EINTR)){
+		Zperr(ret);
+		com_err("hm", ret, "receiving notice");
+	    } else if (ret != EINTR) {
+		/* Where did it come from? */
+		if ((ret = ZParseNotice(packet, pak_len, &notice))
+		    != ZERR_NONE) {
+		    Zperr(ret);
+		    com_err("hm", ret, "parsing notice");
+		} else {
+		    DPR("Got a packet.\n");
+		    DPR("notice:\n");
+		    DPR2("\tz_kind: %d\n", notice.z_kind);
+		    DPR2("\tz_port: %u\n", ntohs(notice.z_port));
+		    DPR2("\tz_class: %s\n", notice.z_class);
+		    DPR2("\tz_class_inst: %s\n", notice.z_class_inst);
+		    DPR2("\tz_opcode: %s\n", notice.z_opcode);
+		    DPR2("\tz_sender: %s\n", notice.z_sender);
+		    DPR2("\tz_recip: %s\n", notice.z_recipient);
+		    DPR2("\tz_def_format: %s\n", notice.z_default_format);
+		    DPR2("\tz_message: %s\n", notice.z_message);
+		    if (memcmp(loopback, &from.sin_addr, 4) &&
+			((notice.z_kind == SERVACK) ||
+			 (notice.z_kind == SERVNAK) ||
+			 (notice.z_kind == HMCTL))) {
+			server_manager(&notice);
+		    } else {
+			if (!memcmp(loopback, &from.sin_addr, 4) &&
+			    ((notice.z_kind == UNSAFE) ||
+			     (notice.z_kind == UNACKED) ||
+			     (notice.z_kind == ACKED) ||
+			     (notice.z_kind == HMCTL))) {
+			    /* Client program... */
+			    if (deactivated) {
 				send_boot_notice(HM_BOOT);
 				deactivated = 0;
-			   }
-			   transmission_tower(&notice, packet, pak_len);
-			   DPR2 ("Pending = %d\n", ZPending());
-		      } else {
-			   if (notice.z_kind == STAT) {
+			    }
+			    transmission_tower(&notice, packet, pak_len);
+			    DPR2("Pending = %d\n", ZPending());
+			} else {
+			    if (notice.z_kind == STAT) {
 				send_stats(&notice, &from);
-			   } else {
+			    } else {
 				syslog(LOG_INFO,
 				       "Unknown notice type: %d",
 				       notice.z_kind);
-			   }
-		      }
-		  }
-	      }
-	  }
-     }
+			    }
+			}	
+		    }
+		}
+	    }
+	}
+    }
 }
 
-void choose_server()
+static void choose_server()
 {
     int i = 0;
 
-#ifdef Z_HaveHesiod
+#ifdef ZEPHYR_USES_HESIOD
     if (use_hesiod) {
 
 	/* Free up any previously used resources */
 	if (prim_serv[0]) 
 	    i = 1;
 	while (i < numserv)
-	    (void) free(serv_list[i++]);
+	    free(serv_list[i++]);
 	if (serv_list)
-	    (void) free(serv_list);
+	    free(serv_list);
 	
 	numserv = 0;
 	prim_serv[0] = '\0';
@@ -280,7 +268,7 @@ void choose_server()
 		if ((c = strchr(*clust_info, ' ')) == 0) {
 		    printf("Hesiod error getting primary server info.\n");
 		} else
-		    (void)strcpy(prim_serv, c+1);
+		    strcpy(prim_serv, c+1);
 		break;
 	    }
 	    if (!strncasecmp("ZCLUSTER", *clust_info, 9)) {
@@ -291,7 +279,7 @@ void choose_server()
 		} else {
 		    if ((zcluster = malloc((unsigned)(strlen(c+1)+1)))
 			!= NULL) {
-			(void)strcpy(zcluster, c+1);
+			strcpy(zcluster, c+1);
 		    } else {
 			printf("Out of memory.\n");
 			exit(-5);
@@ -303,14 +291,14 @@ void choose_server()
 	
 	if (zcluster == NULL) {
 	    if ((zcluster = malloc((unsigned)(strlen("zephyr")+1))) != NULL)
-		(void)strcpy(zcluster, "zephyr");
+		strcpy(zcluster, "zephyr");
 	}
 	while ((serv_list = hes_resolve(zcluster, "sloc")) == (char **)NULL) {
 	    syslog(LOG_ERR, "No servers or no hesiod");
 	    /* wait a bit, and try again */
 	    sleep(30);
 	}
-	clust_info = (char **)malloc(2*sizeof(char *));
+	clust_info = (char **) malloc(2 * sizeof(char *));
 	if (prim_serv[0])
 	    clust_info[numserv++] = prim_serv;
 	for (i = 0; serv_list[i]; i++)
@@ -327,85 +315,68 @@ void choose_server()
 #endif
     
     if (!prim_serv[0] && numserv) {
-	srandom(time((long *) 0));
-	(void) strcpy(prim_serv, serv_list[random() % numserv]);
+	srandom(time(NULL));
+	strcpy(prim_serv, serv_list[random() % numserv]);
     }
 }
 
-void init_hm()
+static void init_hm()
 {
      struct servent *sp;
      Code_t ret;
      FILE *fp;
-#ifdef POSIX
+#ifdef _POSIX_VERSION
      struct sigaction sa;
 #endif
 
      starttime = time((time_t *)0);
      OPENLOG("hm", LOG_PID, LOG_DAEMON);
   
+     ZSetServerState(1);	/* Aargh!!! */
      if ((ret = ZInitialize()) != ZERR_NONE) {
-	  Zperr(ret);
-	  com_err("hm", ret, "initializing");
-	  closelog();
-	  exit(-1);
+	 Zperr(ret);
+	 com_err("hm", ret, "initializing");
+	 closelog();
+	 exit(-1);
      }
-     (void)ZSetServerState(1);	/* Aargh!!! */
      init_queue();
 
      if (*prim_serv == '\0')
-	  (void)strcpy(prim_serv, *serv_list);
+	 strcpy(prim_serv, *serv_list);
   
      loopback[0] = 127;
      loopback[1] = 0;
      loopback[2] = 0;
      loopback[3] = 1;
       
-     /* kill old hm if it exists */
-     fp = fopen(PidFile, "r");
-     if (fp != NULL) {
-	  (void)fscanf(fp, "%d\n", &oldpid);
-	  while (!kill(oldpid, SIGTERM))
-	       sleep(1);
-	  syslog(LOG_INFO, "Killed old image.");
-	  (void) fclose(fp);
-     }
-
      if (inetd) {
-	     (void) ZSetFD(0);		/* fd 0 is on the socket,
-					   thanks to inetd */
+	 ZSetFD(0);		/* fd 0 is on the socket, thanks to inetd */
      } else {
-	     /* Open client socket, for receiving client and server notices */
-	     if ((sp = getservbyname(HM_SVCNAME, "udp")) == NULL) {
-		     printf("No %s entry in /etc/services.\n", HM_SVCNAME);
-		     exit(1);
-	     }
-	     cli_port = sp->s_port;
+	 /* Open client socket, for receiving client and server notices */
+	 sp = getservbyname(HM_SVCNAME, "udp");
+	 cli_port = (sp) ? sp->s_port : HM_SVC_FALLBACK;
       
-	     if ((ret = ZOpenPort(&cli_port)) != ZERR_NONE) {
-		     Zperr(ret);
-		     com_err("hm", ret, "opening port");
-		     exit(ret);
-	     }
+	 if ((ret = ZOpenPort(&cli_port)) != ZERR_NONE) {
+	     Zperr(ret);
+	     com_err("hm", ret, "opening port");
+	     exit(ret);
+	 }
      }
      cli_sin = ZGetDestAddr();
-  
-     /* Open the server socket */
-  
-     if ((sp = getservbyname(SERVER_SVCNAME, "udp")) == NULL) {
-	  printf("No %s entry in /etc/services.\n", SERVER_SVCNAME);
-	  exit(1);
-     }
 
+     sp = getservbyname(SERVER_SVCNAME, "udp");
+     memset(&serv_sin, 0, sizeof(struct sockaddr_in));
+     serv_sin.sin_port = (sp) ? sp->s_port : SERVER_SVC_FALLBACK;
+      
 #ifndef DEBUG
      if (!inetd && !nofork)
-	     detach();
+	 detach();
   
      /* Write pid to file */
      fp = fopen(PidFile, "w");
      if (fp != NULL) {
-	     fprintf(fp, "%d\n", getpid());
-	     (void) fclose(fp);
+	 fprintf(fp, "%d\n", getpid());
+	 fclose(fp);
      }
 #endif /* DEBUG */
 
@@ -413,9 +384,6 @@ void init_hm()
 	  syslog(LOG_INFO, "Debugging on.");
      }
 
-     (void) memset((char *)&serv_sin, 0, sizeof(struct sockaddr_in));
-     serv_sin.sin_port = sp->s_port;
-      
      /* Set up communications with server */
      /* target is SERVER_SVCNAME port on server machine */
 
@@ -424,31 +392,30 @@ void init_hm()
      /* who to talk to */
      if ((hp = gethostbyname(prim_serv)) == NULL) {
 	  DPR("gethostbyname failed\n");
-	  find_next_server((char *)NULL);
+	  find_next_server(NULL);
      } else {
-	  DPR2 ("Server = %s\n", prim_serv);
-	  (void)strcpy(cur_serv, prim_serv);
-	  (void)memcpy((char *)&serv_sin.sin_addr, hp->h_addr, hp->h_length);
+	  DPR2("Server = %s\n", prim_serv);
+	  strcpy(cur_serv, prim_serv);
+	  memcpy(&serv_sin.sin_addr, hp->h_addr, hp->h_length);
      }
 
      send_boot_notice(HM_BOOT);
      deactivated = 0;
 
-#ifdef POSIX
+#ifdef _POSIX_VERSION
      sigemptyset(&sa.sa_mask);
      sa.sa_flags = 0;
-     sa.sa_handler = set_sig_type;
+     sa.sa_handler = deactivate;
      sigaction(SIGHUP, &sa, (struct sigaction *)0);
-     sigaction(SIGALRM, &sa, (struct sigaction *)0);
+     sa.sa_handler = terminate; 
      sigaction(SIGTERM, &sa, (struct sigaction *)0);
 #else
-     (void)signal (SIGHUP,  set_sig_type);
-     (void)signal (SIGALRM, set_sig_type);
-     (void)signal (SIGTERM, set_sig_type);
+     signal(SIGHUP, deactivate);
+     signal(SIGTERM, terminate);
 #endif
 }
 
-void detach()
+static void detach()
 {
      /* detach from terminal and fork. */
      register int i, x = ZGetFD();
@@ -459,31 +426,36 @@ void detach()
 	       perror("fork");
 	  exit(0);
      }
-#ifdef POSIX
+#ifdef _POSIX_VERSION
      size = sysconf(_SC_OPEN_MAX);
 #else
      size = getdtablesize();
 #endif
      for (i = 0; i < size; i++)
 	  if (i != x)
-	       (void) close(i);
+	       close(i);
 
-     if ((i = open("/dev/tty", O_RDWR, 666)) < 0)
+     if ((i = open("/dev/tty", O_RDWR, 0666)) < 0)
 	  ;		/* Can't open tty, but don't flame about it. */
      else {
 #ifdef TIOCNOTTY
-	  (void) ioctl(i, TIOCNOTTY, (caddr_t) 0);
+	  /* Necessary for old non-POSIX systems which automatically assign
+	   * an opened tty as the controlling terminal of a process which
+	   * doesn't already have one.  POSIX systems won't include
+	   * <sys/ioctl.h> (see ../h/sysdep.h); if TIOCNOTTY is defined anyway,
+	   * this is unnecessary but won't hurt. */
+	  ioctl(i, TIOCNOTTY, (caddr_t) 0);
 #endif
-	  (void) close(i);
+	  close(i);
      }
-#ifdef POSIX
-     (void) setsid();
+#ifdef _POSIX_VERSION
+     setsid();
 #endif
 }
 
 static char version[BUFSIZ];
 
-send_stats(notice, sin)
+static void send_stats(notice, sin)
      ZNotice_t *notice;
      struct sockaddr_in *sin;
 {
@@ -492,7 +464,7 @@ send_stats(notice, sin)
      char *bfr;
      char *list[20];
      int len, i, nitems = 10;
-     unsigned int size;
+     unsigned long size;
 
      newnotice = *notice;
      
@@ -502,91 +474,75 @@ send_stats(notice, sin)
      }
      newnotice.z_kind = HMACK;
 
-     list[0] = (char *)malloc(MAXHOSTNAMELEN);
-     (void)strcpy(list[0], cur_serv);
-     list[1] = (char *)malloc(64);
-     (void)sprintf(list[1], "%d", queue_len());
-     list[2] = (char *)malloc(64);
-     (void)sprintf(list[2], "%d", nclt);
-     list[3] = (char *)malloc(64);
-     (void)sprintf(list[3], "%d", nserv);
-     list[4] = (char *)malloc(64);
-     (void)sprintf(list[4], "%d", nservchang);
-     list[5] = (char *)malloc(64);
-     (void)strcpy(list[5], rcsid_hm_c);
-     list[6] = (char *)malloc(64);
+     list[0] = (char *) malloc(MAXHOSTNAMELEN);
+     strcpy(list[0], cur_serv);
+     list[1] = (char *) malloc(64);
+     sprintf(list[1], "%d", queue_len());
+     list[2] = (char *) malloc(64);
+     sprintf(list[2], "%d", nclt);
+     list[3] = (char *) malloc(64);
+     sprintf(list[3], "%d", nserv);
+     list[4] = (char *) malloc(64);
+     sprintf(list[4], "%d", nservchang);
+     list[5] = (char *) malloc(64);
+     strcpy(list[5], rcsid_hm_c);
+     list[6] = (char *) malloc(64);
      if (no_server)
-	  (void)sprintf(list[6], "yes");
+	  sprintf(list[6], "yes");
      else
-	  (void)sprintf(list[6], "no");
-     list[7] = (char *)malloc(64);
-     (void)sprintf(list[7], "%ld", time((time_t *)0) - starttime);
+	  sprintf(list[6], "no");
+     list[7] = (char *) malloc(64);
+     sprintf(list[7], "%ld", time((time_t *)0) - starttime);
 #ifdef adjust_size
-     size = (unsigned int)sbrk(0);
+     size = (unsigned long)sbrk(0);
      adjust_size (size);
 #else
      size = -1;
 #endif
      list[8] = (char *)malloc(64);
-     (void)sprintf(list[8], "%ld", size);
+     sprintf(list[8], "%ld", size);
      list[9] = (char *)malloc(32);
-     (void)strcpy(list[9], MACHINE);
+     strcpy(list[9], MACHINE_TYPE);
 
      /* Since ZFormatRaw* won't change the version number on notices,
 	we need to set the version number explicitly.  This code is taken
 	from Zinternal.c, function Z_FormatHeader */
      if (!*version)
-	     (void) sprintf(version, "%s%d.%d", ZVERSIONHDR, ZVERSIONMAJOR,
-			    ZVERSIONMINOR);
+	     sprintf(version, "%s%d.%d", ZVERSIONHDR, ZVERSIONMAJOR,
+		     ZVERSIONMINOR);
      newnotice.z_version = version;
 
      if ((ret = ZFormatRawNoticeList(&newnotice, list, nitems, &bfr,
 				     &len)) != ZERR_NONE) {
-	  syslog(LOG_INFO, "Couldn't format stats packet");
-     } else
-	  if ((ret = ZSendPacket(bfr, len, 0)) != ZERR_NONE) {
-	       Zperr(ret);
-	       com_err("hm", ret, "sending stats");
-	  }
+	 syslog(LOG_INFO, "Couldn't format stats packet");
+     } else {
+	 if ((ret = ZSendPacket(bfr, len, 0)) != ZERR_NONE) {
+	     Zperr(ret);
+	     com_err("hm", ret, "sending stats");
+	 }
+     }
      free(bfr);
      for(i=0;i<nitems;i++)
 	  free(list[i]);
 }
 
-void handle_timeout()
-{
-     switch(timeout_type) {
-     case BOOTING:
-	  new_server((char *)NULL);
-	  break;
-     case NOTICES:
-	  DPR ("Notice timeout\n");
-	  resend_notices(&serv_sin);
-	  break;
-     default:
-	  syslog (LOG_ERR, "Unknown timeout type: %d\n", timeout_type);
-	  break;
-     }
-}
-
 void die_gracefully()
 {
      syslog(LOG_INFO, "Terminate signal caught...");
      send_flush_notice(HM_FLUSH);
-     (void)unlink(PidFile);
+     unlink(PidFile);
      closelog();
      exit(0);
 }
 
-char *
-strsave(sp)
-char *sp;
+static char *strsave(sp)
+    const char *sp;
 {
     register char *ret;
 
     if((ret = malloc((unsigned) strlen(sp)+1)) == NULL) {
 	    abort();
     }
-    (void) strcpy(ret,sp);
+    strcpy(ret,sp);
     return(ret);
 }