release/2.2.5_cvs

23 files changed, 29 insertions, 26 deletions

diff --git a/usr.bin/file/LEGAL.NOTICE b/usr.bin/file/LEGAL.NOTICE
index 57686bed95cf6..adf1b21d921cd 100644
--- a/usr.bin/file/LEGAL.NOTICE
+++ b/usr.bin/file/LEGAL.NOTICE
@@ -1,6 +1,6 @@
 Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995.
 Software written by Ian F. Darwin and others; maintained by Christos Zoulas.
-$Id: LEGAL.NOTICE,v 1.3 1997/02/22 19:29:06 peter Exp $
+$Id: LEGAL.NOTICE,v 1.1.1.2.2.1 1997/08/18 18:58:54 jdp Exp $
 
 This software (or derivative software) may not be made subject to any 
 license which denies anyone permission to alter it and redistribute it 
diff --git a/usr.bin/file/MAINT b/usr.bin/file/MAINT
index e4e7abb2e3ae6..731c1b3670eb7 100644
--- a/usr.bin/file/MAINT
+++ b/usr.bin/file/MAINT
@@ -1,4 +1,4 @@
-$Id: MAINT,v 1.3 1997/02/22 19:29:06 peter Exp $
+$Id: MAINT,v 1.1.1.1.8.1 1997/08/18 18:58:55 jdp Exp $
 
 Maintenance notes:
 
diff --git a/usr.bin/file/Magdir/Localstuff b/usr.bin/file/Magdir/Localstuff
index ad421216baed9..4c802f7b0bca6 100644
--- a/usr.bin/file/Magdir/Localstuff
+++ b/usr.bin/file/Magdir/Localstuff
@@ -2,6 +2,6 @@
 #------------------------------------------------------------------------------
 # Localstuff:  file(1) magic for locally observed files
 #
-# $Id: Localstuff,v 1.3 1997/02/22 19:29:21 peter Exp $
+# $Id: Localstuff,v 1.1.1.2.2.1 1997/08/18 18:59:31 jdp Exp $
 # Add any locally observed files here.  Remember:
 # text if readable, executable if runnable binary, data if unreadable.
diff --git a/usr.bin/file/Magdir/softquad b/usr.bin/file/Magdir/softquad
index 996889fb399e0..679c125b428a0 100644
--- a/usr.bin/file/Magdir/softquad
+++ b/usr.bin/file/Magdir/softquad
@@ -2,7 +2,7 @@
 #------------------------------------------------------------------------------
 # softquad:  file(1) magic for SoftQuad Publishing Software
 #
-# $Id: softquad,v 1.3 1997/02/22 19:29:21 peter Exp $
+# $Id: softquad,v 1.1.1.2.2.1 1997/08/18 18:59:55 jdp Exp $
 # Author/Editor and RulesBuilder
 #
 # XXX - byte order?
diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile
index 2fe6feb08d512..7bf37b2e63f3c 100644
--- a/usr.bin/file/Makefile
+++ b/usr.bin/file/Makefile
@@ -1,6 +1,6 @@
 # Makefile for file(1) cmd.
 # Copyright (c) Ian F. Darwin 86/09/01 - see LEGAL.NOTICE.
-# @(#)$Id: Makefile,v 1.11 1997/04/04 02:42:53 mpp Exp $
+# @(#)$Id: Makefile,v 1.5.2.2 1997/08/18 18:58:56 jdp Exp $
 #
 # This software is not subject to any license of the American Telephone
 # and Telegraph Company or of the Regents of the University of California.
diff --git a/usr.bin/file/PORTING b/usr.bin/file/PORTING
index 2f3023413a2e1..b743f7aa007cb 100644
--- a/usr.bin/file/PORTING
+++ b/usr.bin/file/PORTING
@@ -1,5 +1,5 @@
 Portability of the new file(1) command.
-@(#) $Id: PORTING,v 1.3 1997/02/22 19:29:08 peter Exp $
+@(#) $Id: PORTING,v 1.1.1.1.8.1 1997/08/18 18:58:58 jdp Exp $
 
 Read this file only if the program doesn't compile on your system.
 
diff --git a/usr.bin/file/README b/usr.bin/file/README
index 19b66e363449a..49961da6abd31 100644
--- a/usr.bin/file/README
+++ b/usr.bin/file/README
@@ -1,5 +1,5 @@
 ** README for file(1) Command **
-@(#) $Id: README,v 1.4 1997/03/18 19:37:15 mpp Exp $
+@(#) $Id: README,v 1.1.1.1.8.1 1997/08/18 18:58:59 jdp Exp $
 
 This is Release 3.x of Ian Darwin's (copyright but distributable)
 file(1) command. This version is the standard "file" command for Linux,
diff --git a/usr.bin/file/apprentice.c b/usr.bin/file/apprentice.c
index 411adf9491d0a..189eec6d6fa50 100644
--- a/usr.bin/file/apprentice.c
+++ b/usr.bin/file/apprentice.c
@@ -34,7 +34,7 @@
 
 #ifndef	lint
 static char *moduleid = 
-	"@(#)$Id: apprentice.c,v 1.6 1997/03/18 19:37:16 mpp Exp $";
+	"@(#)$Id: apprentice.c,v 1.3.2.1 1997/08/18 18:59:01 jdp Exp $";
 #endif	/* lint */
 
 #define	EATAB {while (isascii((unsigned char) *l) && \
diff --git a/usr.bin/file/ascmagic.c b/usr.bin/file/ascmagic.c
index 1944cfb3cb6de..3fea961ac16c4 100644
--- a/usr.bin/file/ascmagic.c
+++ b/usr.bin/file/ascmagic.c
@@ -36,7 +36,7 @@
 
 #ifndef	lint
 static char *moduleid = 
-	"@(#)$Id: ascmagic.c,v 1.7 1997/03/18 19:37:17 mpp Exp $";
+	"@(#)$Id: ascmagic.c,v 1.3.2.2 1997/08/18 18:59:02 jdp Exp $";
 #endif	/* lint */
 
 			/* an optimisation over plain strcmp() */
diff --git a/usr.bin/file/compress.c b/usr.bin/file/compress.c
index c8c23e899f106..55003fb43d141 100644
--- a/usr.bin/file/compress.c
+++ b/usr.bin/file/compress.c
@@ -4,7 +4,7 @@
  *		   information if recognized
  *	uncompress(method, old, n, newch) - uncompress old into new,
  *					    using method, return sizeof new
- * $Id: compress.c,v 1.5 1997/02/22 19:29:10 peter Exp $
+ * $Id: compress.c,v 1.3.2.1 1997/08/18 18:59:03 jdp Exp $
  */
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.bin/file/cvsimport.sh b/usr.bin/file/cvsimport.sh
index 3c6a934ea41ae..eebbedaca87be 100644
--- a/usr.bin/file/cvsimport.sh
+++ b/usr.bin/file/cvsimport.sh
@@ -3,7 +3,7 @@
 # This shell script can be used in order to handle future imports
 # of newer versions of file(1)
 #
-# $Id: cvsimport.sh,v 1.4 1997/03/20 23:34:11 mpp Exp $
+# $Id: cvsimport.sh,v 1.1.8.1 1997/08/18 18:59:04 jdp Exp $
 if [ $# -ne 2 ] ; then 
 	echo "usage: $0 <major> <minor>" 1>&2
 	exit 1
diff --git a/usr.bin/file/file.1 b/usr.bin/file/file.1
index 70540683b8ea9..206e9e74f7f44 100644
--- a/usr.bin/file/file.1
+++ b/usr.bin/file/file.1
@@ -1,5 +1,5 @@
 .TH FILE 1 "Copyright but distributable"
-.\" $Id: file.1,v 1.10 1997/04/04 02:41:01 mpp Exp $
+.\" $Id: file.1,v 1.6.2.1 1997/08/18 18:59:05 jdp Exp $
 .SH NAME
 file \- determine file type
 .SH SYNOPSIS
diff --git a/usr.bin/file/file.c b/usr.bin/file/file.c
index 38ecaa78d020d..cba132d8039c2 100644
--- a/usr.bin/file/file.c
+++ b/usr.bin/file/file.c
@@ -26,7 +26,7 @@
  */
 #ifndef	lint
 static char *moduleid = 
-	"@(#)$Id: file.c,v 1.8 1997/03/29 04:29:23 imp Exp $";
+	"@(#)$Id: file.c,v 1.3.2.2 1997/08/18 18:59:06 jdp Exp $";
 #endif	/* lint */
 
 #include <stdio.h>
diff --git a/usr.bin/file/file.h b/usr.bin/file/file.h
index 04df2b6ca3661..4da6e3e523921 100644
--- a/usr.bin/file/file.h
+++ b/usr.bin/file/file.h
@@ -1,6 +1,6 @@
 /*
  * file.h - definitions for file(1) program
- * @(#)$Id: file.h,v 1.7 1997/03/18 19:37:18 mpp Exp $
+ * @(#)$Id: file.h,v 1.3.2.2 1997/08/18 18:59:08 jdp Exp $
  *
  * Copyright (c) Ian F. Darwin, 1987.
  * Written by Ian F. Darwin.
diff --git a/usr.bin/file/fsmagic.c b/usr.bin/file/fsmagic.c
index d4296e971785d..4644529b44afa 100644
--- a/usr.bin/file/fsmagic.c
+++ b/usr.bin/file/fsmagic.c
@@ -51,7 +51,7 @@
 
 #ifndef	lint
 static char *moduleid = 
-	"@(#)$Id: fsmagic.c,v 1.6 1997/03/18 19:37:19 mpp Exp $";
+	"@(#)$Id: fsmagic.c,v 1.3.2.1 1997/08/18 18:59:09 jdp Exp $";
 #endif	/* lint */
 
 int
diff --git a/usr.bin/file/is_tar.c b/usr.bin/file/is_tar.c
index 1471fa0f2190c..baf7fb2842fa7 100644
--- a/usr.bin/file/is_tar.c
+++ b/usr.bin/file/is_tar.c
@@ -5,7 +5,7 @@
  * Pubic Domain version written 26 Aug 1985 John Gilmore (ihnp4!hoptoad!gnu).
  *
  * @(#)list.c 1.18 9/23/86 Public Domain - gnu
- * $Id: is_tar.c,v 1.5 1997/03/18 19:37:19 mpp Exp $
+ * $Id: is_tar.c,v 1.2.6.1 1997/08/18 18:59:13 jdp Exp $
  *
  * Comments changed and some code/comments reformatted
  * for file command by Ian Darwin.
diff --git a/usr.bin/file/magic.5 b/usr.bin/file/magic.5
index 2d857f4973cac..3ac054519dc15 100644
--- a/usr.bin/file/magic.5
+++ b/usr.bin/file/magic.5
@@ -203,4 +203,4 @@ indirect offsets.
 .\" the changes I posted to the S5R2 version.
 .\"
 .\" Modified for Ian Darwin's version of the file command.
-.\" @(#)$Id: magic.5,v 1.7 1997/03/18 19:37:20 mpp Exp $
+.\" @(#)$Id: magic.5,v 1.4.2.1 1997/08/18 18:59:14 jdp Exp $
diff --git a/usr.bin/file/names.h b/usr.bin/file/names.h
index bfdcf8f60c94d..a69dc7f6f7702 100644
--- a/usr.bin/file/names.h
+++ b/usr.bin/file/names.h
@@ -10,7 +10,7 @@
  *
  * See LEGAL.NOTICE
  *
- * $Id: names.h,v 1.5 1997/03/18 19:37:21 mpp Exp $
+ * $Id: names.h,v 1.2.2.1 1997/08/18 18:59:15 jdp Exp $
  */
 
 /* these types are used to index the table 'types': keep em in sync! */
diff --git a/usr.bin/file/patchlevel.h b/usr.bin/file/patchlevel.h
index cd11e2a2bdd88..64e79fea61b0a 100644
--- a/usr.bin/file/patchlevel.h
+++ b/usr.bin/file/patchlevel.h
@@ -3,20 +3,23 @@
 
 /*
  * Patchlevel file for Ian Darwin's MAGIC command.
- * $Id: patchlevel.h,v 1.7 1997/03/18 19:37:21 mpp Exp $
+ * $Id: patchlevel.h,v 1.3.2.1 1997/08/18 18:59:16 jdp Exp $
  *
  * $Log: patchlevel.h,v $
+ * Revision 1.3.2.1  1997/08/18 18:59:16  jdp
+ * Sync with -current.
+ *
  * Revision 1.7  1997/03/18 19:37:21  mpp
  * Merge to resolve conflicts with file 3.22 merge.
  *
  * Revision 1.6  1997/02/22 19:54:59  peter
- * Revert $FreeBSD$ to $Id: patchlevel.h,v 1.7 1997/03/18 19:37:21 mpp Exp $
+ * Revert $FreeBSD$ to $Id: patchlevel.h,v 1.3.2.1 1997/08/18 18:59:16 jdp Exp $
  *
  * Revision 1.5  1997/02/22 19:29:15  peter
- * Revert $Id: patchlevel.h,v 1.7 1997/03/18 19:37:21 mpp Exp $ to $Id: patchlevel.h,v 1.7 1997/03/18 19:37:21 mpp Exp $
+ * Revert $Id: patchlevel.h,v 1.3.2.1 1997/08/18 18:59:16 jdp Exp $ to $Id: patchlevel.h,v 1.3.2.1 1997/08/18 18:59:16 jdp Exp $
  *
  * Revision 1.4  1997/01/14 06:59:48  jkh
- * Make the long-awaited change from $Id: patchlevel.h,v 1.7 1997/03/18 19:37:21 mpp Exp $ to $Id: patchlevel.h,v 1.7 1997/03/18 19:37:21 mpp Exp $
+ * Make the long-awaited change from $Id: patchlevel.h,v 1.3.2.1 1997/08/18 18:59:16 jdp Exp $ to $Id: patchlevel.h,v 1.3.2.1 1997/08/18 18:59:16 jdp Exp $
  *
  * This will make a number of things easier in the future, as well as (finally!)
  * avoiding the Id-smashing problem which has plagued developers for so long.
diff --git a/usr.bin/file/print.c b/usr.bin/file/print.c
index 4847d12171c5c..95072f1c72cbe 100644
--- a/usr.bin/file/print.c
+++ b/usr.bin/file/print.c
@@ -40,7 +40,7 @@
 
 #ifndef lint
 static char *moduleid =
-	"@(#)$Id: print.c,v 1.6 1997/03/18 19:37:22 mpp Exp $";
+	"@(#)$Id: print.c,v 1.3.2.1 1997/08/18 18:59:17 jdp Exp $";
 #endif  /* lint */
 
 #define SZOF(a)	(sizeof(a) / sizeof(a[0]))
diff --git a/usr.bin/file/readelf.h b/usr.bin/file/readelf.h
index dc2f496c90afe..f5817ee045cca 100644
--- a/usr.bin/file/readelf.h
+++ b/usr.bin/file/readelf.h
@@ -1,6 +1,6 @@
 /*
  * readelf.h 
- * @(#)$Id: readelf.h,v 1.2 1997/03/29 22:26:03 jdp Exp $
+ * @(#)$Id: readelf.h,v 1.2.2.1 1997/08/18 18:59:22 jdp Exp $
  *
  * Provide elf data structures for non-elf machines, allowing file
  * non-elf hosts to determine if an elf binary is stripped.
diff --git a/usr.bin/file/softmagic.c b/usr.bin/file/softmagic.c
index 0a65f08e91abf..0a8555261cefb 100644
--- a/usr.bin/file/softmagic.c
+++ b/usr.bin/file/softmagic.c
@@ -35,7 +35,7 @@
 
 #ifndef	lint
 static char *moduleid = 
-	"@(#)$Id: softmagic.c,v 1.7 1997/03/18 19:37:22 mpp Exp $";
+	"@(#)$Id: softmagic.c,v 1.4.2.1 1997/08/18 18:59:23 jdp Exp $";
 #endif	/* lint */
 
 static int match	__P((unsigned char *, int));
diff --git a/usr.bin/file/tar.h b/usr.bin/file/tar.h
index d1cc4155faa5f..40870d833223a 100644
--- a/usr.bin/file/tar.h
+++ b/usr.bin/file/tar.h
@@ -5,7 +5,7 @@
  *
  * Created 25 August 1985 by John Gilmore, ihnp4!hoptoad!gnu.
  *
- * $Id: tar.h,v 1.3 1997/02/22 19:29:16 peter Exp $ # checkin only
+ * $Id: tar.h,v 1.1.1.1.8.1 1997/08/18 18:59:24 jdp Exp $ # checkin only
  */
 
 /*