summaryrefslogtreecommitdiffstats
path: root/sbin/shutdown/shutdown.c
diff options
context:
space:
mode:
authorcharnier <charnier@FreeBSD.org>1998-08-03 06:22:43 +0000
committercharnier <charnier@FreeBSD.org>1998-08-03 06:22:43 +0000
commit0432758e6b59676565e504d8e96aa1f204b26130 (patch)
treea80f95a47938cdcad5d2d6cbe3abb0859caeab79 /sbin/shutdown/shutdown.c
parent0d7f7325ec036e910412c761f3a388ab9d6d57c8 (diff)
downloadFreeBSD-src-0432758e6b59676565e504d8e96aa1f204b26130.zip
FreeBSD-src-0432758e6b59676565e504d8e96aa1f204b26130.tar.gz
Correct use of .Nm. Add rcsid. Do not dot terminate err(3) strings. Spelling.
Diffstat (limited to 'sbin/shutdown/shutdown.c')
-rw-r--r--sbin/shutdown/shutdown.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c
index 11911b0..025a1c6 100644
--- a/sbin/shutdown/shutdown.c
+++ b/sbin/shutdown/shutdown.c
@@ -29,18 +29,20 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $Id: shutdown.c,v 1.11 1998/01/08 20:05:45 alex Exp $
*/
#ifndef lint
-static char copyright[] =
+static const char copyright[] =
"@(#) Copyright (c) 1988, 1990, 1993\n\
The Regents of the University of California. All rights reserved.\n";
#endif /* not lint */
#ifndef lint
+#if 0
static char sccsid[] = "@(#)shutdown.c 8.2 (Berkeley) 2/16/94";
+#endif
+static const char rcsid[] =
+ "$Id$";
#endif /* not lint */
#include <sys/param.h>
@@ -49,6 +51,7 @@ static char sccsid[] = "@(#)shutdown.c 8.2 (Berkeley) 2/16/94";
#include <sys/syslog.h>
#include <ctype.h>
+#include <err.h>
#include <fcntl.h>
#include <pwd.h>
#include <setjmp.h>
@@ -57,7 +60,6 @@ static char sccsid[] = "@(#)shutdown.c 8.2 (Berkeley) 2/16/94";
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <err.h>
#include "pathnames.h"
@@ -109,7 +111,6 @@ main(argc, argv)
int argc;
char *argv[];
{
- extern int optind;
register char *p, *endp;
struct passwd *pw;
int arglen, ch, len, readstdin;
@@ -148,7 +149,7 @@ main(argc, argv)
usage();
if (doreboot && dohalt) {
- warnx("incompatible switches -h and -r.");
+ warnx("incompatible switches -h and -r");
usage();
}
getoffset(*argv++);
@@ -208,7 +209,7 @@ main(argc, argv)
#endif
openlog("shutdown", LOG_CONS, LOG_AUTH);
loop();
- /* NOTREACHED */
+ return(0);
}
void
@@ -301,7 +302,7 @@ timewarn(timeleft)
/*
* play some games, just in case wall doesn't come back
- * probably unecessary, given that wall is careful.
+ * probably unnecessary, given that wall is careful.
*/
if (!setjmp(alarmbuf)) {
(void)signal(SIGALRM, timeout);
@@ -474,7 +475,7 @@ finish(signo)
void
badtime()
{
- errx(1, "bad time format.");
+ errx(1, "bad time format");
}
void
OpenPOWER on IntegriCloud