Merge in changes from at 2.9

1 files changed, 17 insertions, 16 deletions

diff --git a/usr.bin/at/panic.c b/usr.bin/at/panic.c
index d6b03db8edd..6de03819ee0 100644
--- a/usr.bin/at/panic.c
+++ b/usr.bin/at/panic.c
@@ -1,10 +1,9 @@
-/*	$OpenBSD: panic.c,v 1.3 1996/08/03 20:16:57 millert Exp $	*/
+/*	$OpenBSD: panic.c,v 1.4 1997/03/01 23:40:09 millert Exp $	*/
 /*	$NetBSD: panic.c,v 1.2 1995/03/25 18:13:33 glass Exp $	*/
 
 /*
  * panic.c - terminate fast in case of error
  * Copyright (c) 1993 by Thomas Koenig
- * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -18,7 +17,7 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
@@ -43,7 +42,7 @@
 /* File scope variables */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: panic.c,v 1.3 1996/08/03 20:16:57 millert Exp $";
+static char rcsid[] = "$OpenBSD: panic.c,v 1.4 1997/03/01 23:40:09 millert Exp $";
 #endif
 
 /* External variables */
@@ -54,9 +53,10 @@ void
 panic(a)
 	char *a;
 {
-/* Something fatal has happened, print error message and exit.
- */
-	fprintf(stderr, "%s: %s\n", namep, a);
+	/*
+	 * Something fatal has happened, print error message and exit.
+	 */
+	(void)fprintf(stderr, "%s: %s\n", namep, a);
 	if (fcreated) {
 		PRIV_START
 		unlink(atfile);
@@ -70,8 +70,9 @@ void
 perr(a)
 	char *a;
 {
-/* Some operating system error; print error message and exit.
- */
+	/*
+	 * Some operating system error; print error message and exit.
+	 */
 	perror(a);
 	if (fcreated) {
 		PRIV_START
@@ -86,18 +87,18 @@ void
 perr2(a, b)
 	char *a, *b;
 {
-	fprintf(stderr, "%s", a);
+	(void)fputs(a, stderr);
 	perr(b);
 }
 
 void
 usage(void)
 {
-/* Print usage and exit.
-*/
-	fprintf(stderr, "Usage: at [-q x] [-f file] [-m] time\n"
-	    "       atq [-q x] [-v]\n"
-	    "       atrm [-q x] job ...\n"
-	    "       batch [-f file] [-m]\n");
+	/* Print usage and exit.  */
+	(void)fprintf(stderr,   "Usage: at [-V] [-q x] [-f file] [-m] time\n"
+				"       at [-V] -c job [job ...]\n"
+				"       atq [-V] [-q x] [-v]\n"
+				"       atrm [-V] job [job ...]\n"
+				"       batch [-V] [-f file] [-m]\n");
 	exit(EXIT_FAILURE);
 }