summaryrefslogtreecommitdiff
path: root/usr.bin/file
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/file')
-rw-r--r--usr.bin/file/LEGAL.NOTICE2
-rw-r--r--usr.bin/file/MAINT2
-rw-r--r--usr.bin/file/Magdir/Localstuff2
-rw-r--r--usr.bin/file/Magdir/softquad2
-rw-r--r--usr.bin/file/Makefile2
-rw-r--r--usr.bin/file/PORTING2
-rw-r--r--usr.bin/file/README2
-rw-r--r--usr.bin/file/apprentice.c2
-rw-r--r--usr.bin/file/ascmagic.c2
-rw-r--r--usr.bin/file/compress.c2
-rw-r--r--usr.bin/file/cvsimport.sh2
-rw-r--r--usr.bin/file/file.12
-rw-r--r--usr.bin/file/file.c2
-rw-r--r--usr.bin/file/file.h2
-rw-r--r--usr.bin/file/fsmagic.c2
-rw-r--r--usr.bin/file/is_tar.c2
-rw-r--r--usr.bin/file/magic.52
-rw-r--r--usr.bin/file/names.h2
-rw-r--r--usr.bin/file/patchlevel.h5
-rw-r--r--usr.bin/file/print.c2
-rw-r--r--usr.bin/file/softmagic.c2
-rw-r--r--usr.bin/file/tar.h2
22 files changed, 25 insertions, 22 deletions
diff --git a/usr.bin/file/LEGAL.NOTICE b/usr.bin/file/LEGAL.NOTICE
index 87c3176beb78..5b000ea1a6e9 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.9 1995/10/27 23:14:20 christos Exp $
+$Id: LEGAL.NOTICE,v 1.1.1.2 1996/01/23 12:26:21 mpp 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 7fc5e3637f3b..63d41b783b62 100644
--- a/usr.bin/file/MAINT
+++ b/usr.bin/file/MAINT
@@ -1,4 +1,4 @@
-$Id: MAINT,v 1.2 1993/09/23 21:47:01 christos Exp $
+$Id: MAINT,v 1.1.1.1 1994/09/03 19:16:22 csgr Exp $
Maintenance notes:
diff --git a/usr.bin/file/Magdir/Localstuff b/usr.bin/file/Magdir/Localstuff
index 3c2fa0ef777f..05f16af9eef7 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 1995/01/21 21:09:00 christos Exp $
+# $Id: Localstuff,v 1.1.1.2 1996/01/23 12:26:56 mpp 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 ffad996caa6e..875f7a429579 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.9 1995/01/21 21:09:00 christos Exp $
+# $Id: softquad,v 1.1.1.2 1996/01/23 12:28:46 mpp Exp $
# Author/Editor and RulesBuilder
#
# XXX - byte order?
diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile
index ca198f498c90..a6809ab532f9 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.5 1996/08/17 22:27:08 wosch Exp $
+# @(#)$Id: Makefile,v 1.5.2.1 1996/12/14 10:10:42 joerg 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 06790e6ace03..6f62a3ef35be 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.11 1993/09/23 21:47:23 christos Exp $
+@(#) $Id: PORTING,v 1.1.1.1 1994/09/03 19:16:22 csgr 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 2ee8e6777a40..ff11bdd2d35e 100644
--- a/usr.bin/file/README
+++ b/usr.bin/file/README
@@ -1,5 +1,5 @@
** README for file(1) Command **
-@(#) $Id: README,v 1.20 1993/09/23 21:47:01 christos Exp $
+@(#) $Id: README,v 1.1.1.1 1994/09/03 19:16:22 csgr Exp $
This is Release 3.x of Ian Darwin's (copyright but distributable)
file(1) command. Release 3.x is scheduled for inclusion in the
diff --git a/usr.bin/file/apprentice.c b/usr.bin/file/apprentice.c
index 0eb1983daffb..4ae3de0d8b6f 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.2 1995/05/30 06:29:58 rgrimes Exp $";
+ "@(#)$Id: apprentice.c,v 1.3 1996/01/23 12:40:04 mpp 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 a7e9437abd29..0efb6a5d65b0 100644
--- a/usr.bin/file/ascmagic.c
+++ b/usr.bin/file/ascmagic.c
@@ -36,7 +36,7 @@
#ifndef lint
static char *moduleid =
- "@(#)$Id$";
+ "@(#)$Id: ascmagic.c,v 1.3.2.1 1996/12/20 22:28:54 joerg Exp $";
#endif /* lint */
/* an optimisation over plain strcmp() */
diff --git a/usr.bin/file/compress.c b/usr.bin/file/compress.c
index a648429873fd..d5253d9b0d78 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.2 1995/05/30 06:30:00 rgrimes Exp $
+ * $Id: compress.c,v 1.3 1996/01/23 12:40:08 mpp Exp $
*/
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/file/cvsimport.sh b/usr.bin/file/cvsimport.sh
index 6112e9655fcf..b801525935aa 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$
+# $Id: cvsimport.sh,v 1.1 1994/09/03 23:08:40 csgr 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 ca51db5dbd4b..92c1b444ce06 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.5 1996/02/02 00:25:40 mpp Exp $
+.\# $Id: file.1,v 1.6 1996/02/12 01:20:19 mpp Exp $
.SH NAME
file \- determine file type
.SH SYNOPSIS
diff --git a/usr.bin/file/file.c b/usr.bin/file/file.c
index 54000830e5a4..dc8772a5beee 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.3 1996/01/23 12:40:11 mpp Exp $";
+ "@(#)$Id: file.c,v 1.3.2.1 1996/12/14 10:10:44 joerg Exp $";
#endif /* lint */
#include <stdio.h>
diff --git a/usr.bin/file/file.h b/usr.bin/file/file.h
index 1ed677264173..ad3e8e00d57e 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.3 1996/01/23 12:40:13 mpp Exp $
+ * @(#)$Id: file.h,v 1.3.2.1 1996/12/14 10:10:45 joerg 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 ae020a040fed..8c112c964ef9 100644
--- a/usr.bin/file/fsmagic.c
+++ b/usr.bin/file/fsmagic.c
@@ -46,7 +46,7 @@
#ifndef lint
static char *moduleid =
- "@(#)$Id: fsmagic.c,v 1.2 1995/05/30 06:30:03 rgrimes Exp $";
+ "@(#)$Id: fsmagic.c,v 1.3 1996/01/23 12:40:14 mpp Exp $";
#endif /* lint */
int
diff --git a/usr.bin/file/is_tar.c b/usr.bin/file/is_tar.c
index fc9cce2782b6..fff57b68c0c3 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.1.1.1 1994/09/03 19:16:22 csgr Exp $
+ * $Id: is_tar.c,v 1.2 1995/05/30 06:30:04 rgrimes 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 4f5f7d233b08..49c946f14e8f 100644
--- a/usr.bin/file/magic.5
+++ b/usr.bin/file/magic.5
@@ -191,4 +191,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.3 1996/01/23 12:40:17 mpp Exp $
+.\" @(#)$Id: magic.5,v 1.4 1996/04/18 18:17:14 jdp Exp $
diff --git a/usr.bin/file/names.h b/usr.bin/file/names.h
index eba0b51154d7..fa4953fb3226 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.1.1.2 1996/01/22 22:31:42 mpp Exp $
+ * $Id: names.h,v 1.2 1996/01/23 12:40:19 mpp 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 15241ebe8e52..1f5ddbc1b18d 100644
--- a/usr.bin/file/patchlevel.h
+++ b/usr.bin/file/patchlevel.h
@@ -3,9 +3,12 @@
/*
* Patchlevel file for Ian Darwin's MAGIC command.
- * $Id: patchlevel.h,v 1.2 1995/05/30 06:30:06 rgrimes Exp $
+ * $Id: patchlevel.h,v 1.3 1996/01/23 12:40:20 mpp Exp $
*
* $Log: patchlevel.h,v $
+ * Revision 1.3 1996/01/23 12:40:20 mpp
+ * Merged changes to resolve conflicts with file 3.19 import.
+ *
* Revision 1.2 1995/05/30 06:30:06 rgrimes
* Remove trailing whitespace.
*
diff --git a/usr.bin/file/print.c b/usr.bin/file/print.c
index c65d97fa957d..87c17d8a41d2 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.2 1995/05/30 06:30:08 rgrimes Exp $";
+ "@(#)$Id: print.c,v 1.3 1996/01/23 12:40:22 mpp Exp $";
#endif /* lint */
#define SZOF(a) (sizeof(a) / sizeof(a[0]))
diff --git a/usr.bin/file/softmagic.c b/usr.bin/file/softmagic.c
index 489f13b4aafe..0f1832f3c0ba 100644
--- a/usr.bin/file/softmagic.c
+++ b/usr.bin/file/softmagic.c
@@ -34,7 +34,7 @@
#ifndef lint
static char *moduleid =
- "@(#)$Id: softmagic.c,v 1.3 1995/05/30 06:30:09 rgrimes Exp $";
+ "@(#)$Id: softmagic.c,v 1.4 1996/01/23 12:40:24 mpp 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 fd6f0c94f744..cca00fe3117e 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 1992/09/08 15:32:41 ian Exp $ # checkin only
+ * $Id: tar.h,v 1.1.1.1 1994/09/03 19:16:23 csgr Exp $ # checkin only
*/
/*
generated by cgit v1.3 (git 2.53.0) at 2026-04-08 02:33:32 +0000