Correct use of .Nm and other cosmetics. Add rcsid. Remove unused #inc.

7 files changed, 33 insertions, 34 deletions

diff --git a/bin/dd/args.c b/bin/dd/args.c
index a12f464..b0322a6 100644
--- a/bin/dd/args.c
+++ b/bin/dd/args.c
@@ -33,12 +33,14 @@
  * 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: args.c,v 1.10 1997/10/11 20:09:04 joerg Exp $
  */
 
 #ifndef lint
+#if 0
 static char const sccsid[] = "@(#)args.c	8.3 (Berkeley) 4/2/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -46,7 +48,6 @@ static char const sccsid[] = "@(#)args.c	8.3 (Berkeley) 4/2/94";
 #include <err.h>
 #include <errno.h>
 #include <limits.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/bin/dd/conv.c b/bin/dd/conv.c
index fa7d652..4f6bed0 100644
--- a/bin/dd/conv.c
+++ b/bin/dd/conv.c
@@ -33,12 +33,14 @@
  * 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
+#if 0
 static char const sccsid[] = "@(#)conv.c	8.3 (Berkeley) 4/2/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/dd/conv_tab.c b/bin/dd/conv_tab.c
index 56df2a0..cbe9d02 100644
--- a/bin/dd/conv_tab.c
+++ b/bin/dd/conv_tab.c
@@ -33,12 +33,14 @@
  * 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
+#if 0
 static char const sccsid[] = "@(#)conv_tab.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/dd/dd.1 b/bin/dd/dd.1
index 85aca7b..bfe05ee 100644
--- a/bin/dd/dd.1
+++ b/bin/dd/dd.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
-.\"	$Id: dd.1,v 1.5 1997/04/28 04:07:29 steve Exp $
+.\"	$Id: dd.1,v 1.6 1997/10/11 20:09:04 joerg Exp $
 .\"
 .Dd January 13, 1994
 .Dt DD 1
@@ -52,7 +52,7 @@ Input data is read and written in 512-byte blocks.
 If input reads are short, input from multiple reads are aggregated
 to form the output block.
 When finished,
-.Nm dd
+.Nm
 displays the number of complete and partial input and output blocks
 and truncated input records to the standard error output.
 .Pp
@@ -237,7 +237,7 @@ will be positioned past the block in which the error occurred using
 Do not truncate the output file.
 This will preserve any blocks in the output file not explicitly written
 by
-.Nm dd .
+.Nm Ns .
 The
 .Cm notrunc
 value is not supported for tapes.
@@ -287,7 +287,7 @@ in an integer, respectively.
 Two or more numbers may be separated by an ``x'' to indicate a product.
 .Pp
 When finished,
-.Nm dd
+.Nm
 displays the number of complete and partial input and output blocks,
 truncated input records and odd-length byte-swapping blocks to the
 standard error output.
@@ -310,7 +310,7 @@ This means that the final output block may be shorter than the output
 block size.
 .Pp
 If
-.Nm dd
+.Nm
 receives a
 .Dv SIGINFO
 (see the ``status'' argument for
@@ -319,17 +319,17 @@ signal, the current input and output block counts will
 be written to the standard error output
 in the same format as the standard completion message.
 If
-.Nm dd
+.Nm
 receives a
 .Dv SIGINT
 signal, the current input and output block counts will
 be written to the standard error output
 in the same format as the standard completion message and
-.Nm dd
+.Nm
 will exit.
 .Pp
 The
-.Nm dd
+.Nm
 utility exits 0 on success and >0 if an error occurred.
 .Sh SEE ALSO
 .Xr cp 1 ,
@@ -337,7 +337,7 @@ utility exits 0 on success and >0 if an error occurred.
 .Xr tr 1
 .Sh STANDARDS
 The
-.Nm dd
+.Nm
 utility is expected to be a superset of the
 .St -p1003.2
 standard.
diff --git a/bin/dd/dd.c b/bin/dd/dd.c
index 6078bf5..97c81c7 100644
--- a/bin/dd/dd.c
+++ b/bin/dd/dd.c
@@ -33,8 +33,6 @@
  * 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: dd.c,v 1.12 1997/10/11 20:09:05 joerg Exp $
  */
 
 #ifndef lint
@@ -44,12 +42,15 @@ static char const copyright[] =
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char const sccsid[] = "@(#)dd.c	8.5 (Berkeley) 4/2/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/stat.h>
-#include <sys/ioctl.h>
 #include <sys/mtio.h>
 
 #include <ctype.h>
@@ -57,7 +58,6 @@ static char const sccsid[] = "@(#)dd.c	8.5 (Berkeley) 4/2/94";
 #include <errno.h>
 #include <fcntl.h>
 #include <locale.h>
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/bin/dd/misc.c b/bin/dd/misc.c
index fcd5dd4..eae6d51 100644
--- a/bin/dd/misc.c
+++ b/bin/dd/misc.c
@@ -33,23 +33,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: misc.c,v 1.11 1998/02/11 02:23:31 asami Exp $
  */
 
 #ifndef lint
+#if 0
 static char const sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
-#include <sys/types.h>
 #include <sys/time.h>
 
-#include <err.h>
 #include <errno.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
 #include <unistd.h>
 
 #include "dd.h"
diff --git a/bin/dd/position.c b/bin/dd/position.c
index 9e2ed77..1eee499 100644
--- a/bin/dd/position.c
+++ b/bin/dd/position.c
@@ -33,22 +33,19 @@
  * 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: position.c,v 1.5 1997/02/22 14:02:48 peter Exp $
  */
 
 #ifndef lint
+#if 0
 static char const sccsid[] = "@(#)position.c	8.3 (Berkeley) 4/2/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
 #include <sys/mtio.h>
 
 #include <err.h>
-#include <errno.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "dd.h"