Correct use of .Nm. Add rcsid. Remove unused #includes.

8 files changed, 53 insertions, 40 deletions

diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8
index d5bc26b..617712f 100644
--- a/sbin/dump/dump.8
+++ b/sbin/dump/dump.8
@@ -11,7 +11,7 @@
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
+.\"    must display the following acknowledgment:
 .\"	This product includes software developed by the University of
 .\"	California, Berkeley and its contributors.
 .\" 4. Neither the name of the University nor the names of its contributors
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dump.8	8.3 (Berkeley) 5/1/95
-.\"	$Id: dump.8,v 1.19 1998/01/03 20:26:15 steve Exp $
+.\"	$Id: dump.8,v 1.20 1998/05/10 16:35:31 steve Exp $
 .\"
 .Dd May 1, 1995
 .Dt DUMP 8
@@ -85,7 +85,7 @@ By default, the same output file name is used for each volume
 after prompting the operator to change media.
 .Pp
 The following options are supported by
-.Nm dump :
+.Nm Ns :
 .Bl -tag -width Ds
 .It Fl 0\-9
 Dump levels.
@@ -154,7 +154,7 @@ If the name of the file is of the form
 .Dq host:file ,
 or
 .Dq user@host:file ,
-.Nm dump
+.Nm
 writes to the named file on the remote host using
 .Xr rmt 8 .
 The default path name of the remote
@@ -167,11 +167,11 @@ this can be overridden by the environment variable
 .It Fl k
 Use Kerberos authentication to talk to remote tape servers.  (Only
 available if this option was enabled when
-.Nm dump
+.Nm
 was compiled.)
 .It Fl n
 Whenever
-.Nm dump
+.Nm
 requires operator attention,
 notify all operators in the group
 .Dq operator
@@ -181,7 +181,7 @@ by means similar to a
 Attempt to calculate the amount of tape needed
 at a particular density.
 If this amount is exceeded,
-.Nm dump
+.Nm
 prompts for a new tape.
 It is recommended to be a bit conservative on this option.
 The default tape length is 2300 feet.
@@ -227,7 +227,7 @@ and
 The
 .Fl W
 option causes
-.Nm dump
+.Nm
 to print out, for each file system in
 .Pa /etc/dumpdates
 the most recent dump date and level,
@@ -235,7 +235,7 @@ and highlights those file systems that should be dumped.
 If the
 .Fl W
 option is set, all other options are ignored, and
-.Nm dump
+.Nm
 exits immediately.
 .It Fl w
 Is like W, but prints only those filesystems which need to be dumped.
@@ -251,15 +251,15 @@ disk read error (if there are more than a threshold of 32).
 In addition to alerting all operators implied by the
 .Fl n
 key,
-.Nm dump
+.Nm
 interacts with the operator on
 .Em dump's
 control terminal at times when
-.Nm dump
+.Nm
 can no longer proceed,
 or if something is grossly wrong.
 All questions
-.Nm dump
+.Nm
 poses
 .Em must
 be answered by typing
@@ -269,10 +269,10 @@ or
 appropriately.
 .Pp
 Since making a dump involves a lot of time and effort for full dumps,
-.Nm dump
+.Nm
 checkpoints itself at the start of each tape volume.
 If writing that volume fails for some reason,
-.Nm dump
+.Nm
 will,
 with operator permission,
 restart itself from the checkpoint
@@ -287,7 +287,7 @@ the time to the tape change.
 The output is verbose,
 so that others know that the terminal
 controlling
-.Nm dump
+.Nm
 is busy,
 and will be for some time.
 .Pp
@@ -364,7 +364,7 @@ Currently,
 .Xr physio 9
 slices all requests into chunks of 64 KB.  Therefore, it is
 impossible to use a larger tape blocksize, so
-.Nm dump
+.Nm
 will prevent this from happening.
 .Pp
 .Nm Dump
@@ -379,7 +379,7 @@ even if listed in
 .Pa /etc/fstab .
 .Pp
 It would be nice if
-.Nm dump
+.Nm
 knew about the dump sequence,
 kept track of the tapes scribbled on,
 told the operator which tape to mount when,
@@ -387,13 +387,14 @@ and provided more assistance
 for the operator running
 .Xr restore .
 .Pp
-.Nm dump
+.Nm Dump
 cannot do remote backups without being run as root, due to its
-security history.  This will be fixed in a later version of FreeBSD.
+security history.  This will be fixed in a later version of
+.Bx Free .
 Presently, it works if you set it setuid (like it used to be), but this
 might constitute a security risk.
 .Sh HISTORY
 A
-.Nm dump
+.Nm
 command appeared in
 .At v6 .
diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c
index 6420eaa..84fef13 100644
--- a/sbin/dump/dumprmt.c
+++ b/sbin/dump/dumprmt.c
@@ -32,12 +32,15 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)dumprmt.c	8.3 (Berkeley) 4/28/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/mtio.h>
-#include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #ifdef sunos
@@ -56,10 +59,8 @@ static char sccsid[] = "@(#)dumprmt.c	8.3 (Berkeley) 4/28/95";
 #include <protocols/dumprestore.h>
 
 #include <ctype.h>
-#include <err.h>
 #include <netdb.h>
 #include <pwd.h>
-#include <signal.h>
 #include <stdio.h>
 #ifdef __STDC__
 #include <stdlib.h>
diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c
index 94656ac..483533e 100644
--- a/sbin/dump/itime.c
+++ b/sbin/dump/itime.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)itime.c	8.1 (Berkeley) 6/5/93";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -55,7 +59,6 @@ static char sccsid[] = "@(#)itime.c	8.1 (Berkeley) 6/5/93";
 #ifdef __STDC__
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #endif
 
 #include "dump.h"
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index d838160..1e702c5 100644
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.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$
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1980, 1991, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/1/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -59,7 +61,6 @@ static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/1/95";
 
 #include <ctype.h>
 #include <err.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <fstab.h>
 #include <signal.h>
@@ -423,7 +424,8 @@ main(argc, argv)
 	 * Allocate tape buffer.
 	 */
 	if (!alloctape())
-		quit("can't allocate tape buffers - try a smaller blocking factor.\n");
+		quit(
+	"can't allocate tape buffers - try a smaller blocking factor.\n");
 
 	startnewtape(1);
 	(void)time((time_t *)&(tstart_writing));
@@ -640,7 +642,7 @@ obsolete(argcp, argvp)
 	}
 
 	/* Copy remaining arguments. */
-	while (*nargv++ = *argv++);
+	while ((*nargv++ = *argv++));
 
 	/* Update argument count. */
 	*argcp = nargv - *argvp - 1;
diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c
index 60a6796..318cbd0 100644
--- a/sbin/dump/optr.c
+++ b/sbin/dump/optr.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)optr.c	8.2 (Berkeley) 1/6/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -42,7 +46,6 @@ static char sccsid[] = "@(#)optr.c	8.2 (Berkeley) 1/6/94";
 #include <errno.h>
 #include <fstab.h>
 #include <grp.h>
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c
index dec27ee..1fda006 100644
--- a/sbin/dump/tape.c
+++ b/sbin/dump/tape.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)tape.c	8.4 (Berkeley) 5/1/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -65,7 +69,6 @@ int	write(), read();
 #endif
 
 #include "dump.h"
-#include "pathnames.h"
 
 int	writesize;		/* size of malloc()ed buffer for tape */
 long	lastspclrec = -1;	/* tape block number of last written header */
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index 70c0414..952afc6 100644
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -32,11 +32,14 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)traverse.c	8.7 (Berkeley) 6/15/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
-#include <sys/time.h>
 #include <sys/stat.h>
 #ifdef sunos
 #include <sys/vnode.h>
diff --git a/sbin/dump/unctime.c b/sbin/dump/unctime.c
index bacb469..09557e5 100644
--- a/sbin/dump/unctime.c
+++ b/sbin/dump/unctime.c
@@ -32,22 +32,19 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)unctime.c	8.2 (Berkeley) 6/14/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
-#include <sys/types.h>
-
-#include <stdio.h>
 #include <time.h>
 #ifdef __STDC__
 #include <stdlib.h>
 #include <string.h>
 #endif
 
-#ifndef __P
-#include <sys/cdefs.h>
-#endif
-
 /*
  * Convert a ctime(3) format string into a system format date.
  * Return the date thus calculated.