 @@ -1,14 +1,14 @@
-/*	$NetBSD: shutdown.c,v 1.54 2011/02/16 19:33:48 wiz Exp $	*/
+/*	$NetBSD: shutdown.c,v 1.55 2011/08/27 18:54:39 joerg Exp $	*/
 /*
  * Copyright (c) 1988, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -29,27 +29,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1988, 1990, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)shutdown.c	8.4 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: shutdown.c,v 1.54 2011/02/16 19:33:48 wiz Exp $");
+__RCSID("$NetBSD: shutdown.c,v 1.55 2011/08/27 18:54:39 joerg Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/syslog.h>
 #include <ctype.h>
 #include <err.h>
 #include <fcntl.h>
 #include <pwd.h>
 #include <setjmp.h>
 @@ -89,32 +89,32 @@ static const struct interval {
 static time_t offset, shuttime;
 static int dofast, dohalt, doreboot, killflg, nofork, nosync, dodump;
 static size_t mbuflen;
 static int dopowerdown;
 static int dodebug, dosilent, doverbose;
 static const char *whom;
 static char mbuf[BUFSIZ];
 static char *bootstr;
 static void badtime(void) __dead;
 static void die_you_gravy_sucking_pig_dog(void) __dead;
 static void doitfast(void);
-void dorcshutdown(void);
+static void dorcshutdown(void);
 static void finish(int) __dead;
 static void getoffset(char *);
-static void loop(void);
+static void loop(void) __dead;
 static void nolog(void);
-static void timeout(int);
+static void timeout(int) __dead;
 static void timewarn(time_t);
 static void usage(void) __dead;
 int
 main(int argc, char *argv[])
+{
 	char *p, *endp;
 	struct passwd *pw;
 	size_t arglen, len;
 	int ch;
 	(void)setprogname(argv[0]);
 #ifndef DEBUG
 @@ -240,27 +240,27 @@ main(int argc, char *argv[])
 			exit(0);
+		}
 		(void)setsid();
+	}
 #endif
 	openlog("shutdown", LOG_CONS, LOG_AUTH);
 	loop();
 	/* NOTREACHED */
 #ifdef __GNUC__
 	return 1;
 #endif
+}
-void
+static void
 loop(void)
+{
 	const struct interval *tp;
 	u_int sltime;
 	int logged;
 	if (offset <= NOLOG_TIME) {
 		logged = 1;
 		nolog();
+	}
 	else
 		logged = 0;
 	tp = tlist;
 @@ -284,27 +284,27 @@ loop(void)
 		if (!logged && tp->timeleft <= NOLOG_TIME) {
 			logged = 1;
 			nolog();
+		}
 		(void)sleep((u_int)tp->timetowait);
 		if (!tp->timeleft)
 			break;
+	}
 	die_you_gravy_sucking_pig_dog();
+}
 static jmp_buf alarmbuf;
-void
+static void
 timewarn(time_t timeleft)
+{
 	static int first;
 	static char hostname[MAXHOSTNAMELEN + 1];
 	FILE *pf;
 	char wcmd[MAXPATHLEN + 4];
 	if (!first++) {
 		(void)gethostname(hostname, sizeof(hostname));
 		hostname[sizeof(hostname) - 1] = '\0';
+	}
 	/* undoc -n option to wall suppresses normal wall banner */
 @@ -425,27 +425,27 @@ die_you_gravy_sucking_pig_dog(void)
 #endif
 	} else {
 #ifndef DEBUG
 		(void)kill(1, SIGTERM);		/* to single user */
 #else
 		printf("kill 1\n");
 #endif
+	}
 	finish(0);
+}
 #define	ATOI2(s)	((s) += 2, ((s)[-2] - '0') * 10 + ((s)[-1] - '0'))
-void
+static void
 getoffset(char *timearg)
+{
 	struct tm *lt;
 	char *p;
 	time_t now;
 	int yearset;
 	(void)time(&now);
 	if (!strcasecmp(timearg, "now")) {		/* now */
 		offset = 0;
 		shuttime = now;
 		return;
+	}
 @@ -505,53 +505,53 @@ getoffset(char *timearg)
 	case 2:
 		lt->tm_min = ATOI2(timearg);
 		break;
 	default:
 		badtime();
+	}
 	if ((shuttime = mktime(lt)) == -1)
 		badtime();
 	if ((offset = shuttime - now) < 0)
 		errx(1, "time is already past");
+}
-void
+static void
 dorcshutdown(void)
+{
 	(void)printf("\r\nAbout to run shutdown hooks...\r\n");
 #ifndef DEBUG
 	(void)setuid(0);
 	(void)system(". " _PATH_RCSHUTDOWN);
 #endif
 	(void)sleep(5);		/* Give operator a chance to abort this. */
 	(void)printf("\r\nDone running shutdown hooks.\r\n");
+}
 #define	FSMSG	"fastboot file for fsck\n"
-void
+static void
 doitfast(void)
+{
 	int fastfd;
 	if ((fastfd = open(_PATH_FASTBOOT, O_WRONLY|O_CREAT|O_TRUNC,
 )) >= 0) {
 		(void)write(fastfd, FSMSG, sizeof(FSMSG) - 1);
 		(void)close(fastfd);
+	}
+}
 #define	NOMSG	"\n\nNO LOGINS: System going down at "
-void
+static void
 nolog(void)
+{
 	int logfd;
 	char *ct;
 	(void)unlink(_PATH_NOLOGIN);	/* in case linked to another file */
 	(void)signal(SIGINT, finish);
 	(void)signal(SIGHUP, finish);
 	(void)signal(SIGQUIT, finish);
 	(void)signal(SIGTERM, finish);
 	if ((logfd = open(_PATH_NOLOGIN, O_WRONLY|O_CREAT|O_TRUNC,
 )) >= 0) {
 		(void)write(logfd, NOMSG, sizeof(NOMSG) - 1);