Add updated legal notice.

diff --git a/src/Makefile b/src/Makefile
index 55b1828f63a76dbdf72e005713676c936a3d6891..994103e79591a88135c35ba2f81d993e6876712d 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,11 +1,31 @@
-# Makefile for file(1) cmd. Copyright (c) Darwin 86/09/01 - see LEGAL.NOTICE.
+# Makefile for file(1) cmd. 
+# Copyright (c) Ian F. Darwin 86/09/01 - see LEGAL.NOTICE.
+#
+# This software is not subject to any license of the American Telephone
+# and Telegraph Company or of the Regents of the University of California.
+#
+# Permission is granted to anyone to use this software for any purpose on
+# any computer system, and to alter it and redistribute it freely, subject
+# to the following restrictions:
+#
+# 1. The author is not responsible for the consequences of use of this
+#    software, no matter how awful, even if they arise from flaws in it.
+#
+# 2. The origin of this software must not be misrepresented, either by
+#    explicit claim or by omission.  Since few users ever read sources,
+#    credits must appear in the documentation.
+#
+# 3. Altered versions must be plainly marked as such, and must not be
+#    misrepresented as being the original software.  Since few users
+#    ever read sources, credits must appear in the documentation.
+#
+# 4. This notice may not be removed or altered.
 
 MAGIC  = /etc/magic
 DEFS   = -DMAGIC='"$(MAGIC)"' # -Dvoid=int
 COPTS  = -O # -g
 CFLAGS = $(COPTS) $(DEFS)
 SHAR   = bundle
-OTHERS = darwin!ian            # people to whom we mail updates
 OFILE  = /usr/bin/file.orig    # old or distributed version, for comparison
 BINDIR = /usr/local            # where new binary lives
 MANDIR = /usr/man/local        # for our man pages
@@ -19,8 +39,8 @@ LOCALOBJS = strtol.o strtok.o
 OBJS = file.o apprentice.o fsmagic.o softmagic.o ascmagic.o is_tar.o \
        print.o $(LOCALOBJS)
 
-ALLSRC = LEGAL.NOTICE README PORTING TODO $(SRCS) *.h \
-       Makefile file.[15] magdir/[a-z]* tst/Makefile
+ALLSRC = LEGAL.NOTICE README PORTING $(SRCS) *.h \
+       Makefile file.1 magic.4 magdir/[a-z]* tst/Makefile
 
 all:           file magic
 
@@ -47,10 +67,10 @@ install:    all
                cp file $(BINDIR)/file
                cp magic $(MAGIC)
                cp file.1 $(MANDIR)/man1
-               cp file.5 $(MANDIR)/man5
+               cp magic.4 $(MANDIR)/man4 # maybe 5 on some systems.
 
 clean:
-               rm -f *.o file magic errs lintout
+               rm -f *.o file magic lint.out
                (cd tst; make clean)
 
 dist:          $(ALLSRC)

diff --git a/src/apprentice.c b/src/apprentice.c
index 66975b2f28bdb24d07b229f1de973e7a3505c636..b593da608b994f70c894e6ee4f82e337718cc2d7 100644 (file)
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -1,5 +1,28 @@
 /*
- * make one pass through /etc/magic, reading it into core
+ * apprentice - make one pass through /etc/magic, learning its secrets.
+ *
+ * Copyright (c) Ian F. Darwin, 1987.
+ * Written by Ian F. Darwin.
+ *
+ * This software is not subject to any license of the American Telephone
+ * and Telegraph Company or of the Regents of the University of California.
+ *
+ * Permission is granted to anyone to use this software for any purpose on
+ * any computer system, and to alter it and redistribute it freely, subject
+ * to the following restrictions:
+ *
+ * 1. The author is not responsible for the consequences of use of this
+ *    software, no matter how awful, even if they arise from flaws in it.
+ *
+ * 2. The origin of this software must not be misrepresented, either by
+ *    explicit claim or by omission.  Since few users ever read sources,
+ *    credits must appear in the documentation.
+ *
+ * 3. Altered versions must be plainly marked as such, and must not be
+ *    misrepresented as being the original software.  Since few users
+ *    ever read sources, credits must appear in the documentation.
+ *
+ * 4. This notice may not be removed or altered.
  */
 
 #include <stdio.h>

diff --git a/src/ascmagic.c b/src/ascmagic.c
index f5a83a5590fd88af8caffac0c1e6bb18d64fa88a..e281742e8c0896f64890a3581106397ed1b4244c 100644 (file)
--- a/src/ascmagic.c
+++ b/src/ascmagic.c
@@ -1,14 +1,38 @@
 /*
  * Ascii magic -- file types that we know based on keywords
  * that can appear anywhere in the file.
+ *
+ * Copyright (c) Ian F. Darwin, 1987.
+ * Written by Ian F. Darwin.
+ *
+ * This software is not subject to any license of the American Telephone
+ * and Telegraph Company or of the Regents of the University of California.
+ *
+ * Permission is granted to anyone to use this software for any purpose on
+ * any computer system, and to alter it and redistribute it freely, subject
+ * to the following restrictions:
+ *
+ * 1. The author is not responsible for the consequences of use of this
+ *    software, no matter how awful, even if they arise from flaws in it.
+ *
+ * 2. The origin of this software must not be misrepresented, either by
+ *    explicit claim or by omission.  Since few users ever read sources,
+ *    credits must appear in the documentation.
+ *
+ * 3. Altered versions must be plainly marked as such, and must not be
+ *    misrepresented as being the original software.  Since few users
+ *    ever read sources, credits must appear in the documentation.
+ *
+ * 4. This notice may not be removed or altered.
  */
 
 #include <stdio.h>
 #include <ctype.h>
 #include "file.h"
-char ckfmsg[] = "write error on output";
 #include "names.h"
 
+char ckfmsg[] = "write error on output";
+
                        /* an optimisation over plain strcmp() */
 #define        STREQ(a, b)     (*(a) == *(b) && strcmp((a), (b)) == 0)
 

diff --git a/src/file.c b/src/file.c
index e080b15f25879493f0fdfc6eac0e4363783ecb18..05b0284b00fe4f7277631d73a80c95ea5da522d1 100644 (file)
--- a/src/file.c
+++ b/src/file.c
@@ -1,5 +1,28 @@
 /*
- * file - find type of a file or files
+ * file - find type of a file or files - main program.
+ *
+ * Copyright (c) Ian F. Darwin, 1987.
+ * Written by Ian F. Darwin.
+ *
+ * This software is not subject to any license of the American Telephone
+ * and Telegraph Company or of the Regents of the University of California.
+ *
+ * Permission is granted to anyone to use this software for any purpose on
+ * any computer system, and to alter it and redistribute it freely, subject
+ * to the following restrictions:
+ *
+ * 1. The author is not responsible for the consequences of use of this
+ *    software, no matter how awful, even if they arise from flaws in it.
+ *
+ * 2. The origin of this software must not be misrepresented, either by
+ *    explicit claim or by omission.  Since few users ever read sources,
+ *    credits must appear in the documentation.
+ *
+ * 3. Altered versions must be plainly marked as such, and must not be
+ *    misrepresented as being the original software.  Since few users
+ *    ever read sources, credits must appear in the documentation.
+ *
+ * 4. This notice may not be removed or altered.
  */
 
 #include <stdio.h>

diff --git a/src/file.h b/src/file.h
index 1c4746339be15d9f037c5a9c0bb58d55e815c916..6de66d554e97c7ba1c8d81453ca3d2f858f909ae 100644 (file)
--- a/src/file.h
+++ b/src/file.h
@@ -1,5 +1,28 @@
 /*
- * definitions for file(1) program:
+ * file.h - definitions for file(1) program
+ *
+ * Copyright (c) Ian F. Darwin, 1987.
+ * Written by Ian F. Darwin.
+ *
+ * This software is not subject to any license of the American Telephone
+ * and Telegraph Company or of the Regents of the University of California.
+ *
+ * Permission is granted to anyone to use this software for any purpose on
+ * any computer system, and to alter it and redistribute it freely, subject
+ * to the following restrictions:
+ *
+ * 1. The author is not responsible for the consequences of use of this
+ *    software, no matter how awful, even if they arise from flaws in it.
+ *
+ * 2. The origin of this software must not be misrepresented, either by
+ *    explicit claim or by omission.  Since few users ever read sources,
+ *    credits must appear in the documentation.
+ *
+ * 3. Altered versions must be plainly marked as such, and must not be
+ *    misrepresented as being the original software.  Since few users
+ *    ever read sources, credits must appear in the documentation.
+ *
+ * 4. This notice may not be removed or altered.
  */
 
 #define HOWMANY        1024            /* how much of the file to look at */

diff --git a/src/fsmagic.c b/src/fsmagic.c
index ee2454c4089f17303f40fec2b9806018cf9687a2..66fb04578387df3390d985aac2bdf868e4ecbec3 100644 (file)
--- a/src/fsmagic.c
+++ b/src/fsmagic.c
@@ -1,5 +1,28 @@
 /*
- * magic based on mode of file - directory, special files, etc.
+ * fsmagic - magic based on filesystem info - directory, special files, etc.
+ *
+ * Copyright (c) Ian F. Darwin, 1987.
+ * Written by Ian F. Darwin.
+ *
+ * This software is not subject to any license of the American Telephone
+ * and Telegraph Company or of the Regents of the University of California.
+ *
+ * Permission is granted to anyone to use this software for any purpose on
+ * any computer system, and to alter it and redistribute it freely, subject
+ * to the following restrictions:
+ *
+ * 1. The author is not responsible for the consequences of use of this
+ *    software, no matter how awful, even if they arise from flaws in it.
+ *
+ * 2. The origin of this software must not be misrepresented, either by
+ *    explicit claim or by omission.  Since few users ever read sources,
+ *    credits must appear in the documentation.
+ *
+ * 3. Altered versions must be plainly marked as such, and must not be
+ *    misrepresented as being the original software.  Since few users
+ *    ever read sources, credits must appear in the documentation.
+ *
+ * 4. This notice may not be removed or altered.
  */
 
 #include <stdio.h>

diff --git a/src/names.h b/src/names.h
index 8db588ee972f80a0e778259371e4c2bbbd1fbf89..b21908096dfaa1af84382835f6c126e34173aa56 100644 (file)
--- a/src/names.h
+++ b/src/names.h
@@ -4,6 +4,29 @@
  * the first HOWMANY bytes, while tokens in /etc/magic must
  * appear at fixed offsets into the file. Don't make HOWMANY
  * too high unless you have a very fast CPU.
+ *
+ * Copyright (c) Ian F. Darwin, 1987.
+ * Written by Ian F. Darwin.
+ *
+ * This software is not subject to any license of the American Telephone
+ * and Telegraph Company or of the Regents of the University of California.
+ *
+ * Permission is granted to anyone to use this software for any purpose on
+ * any computer system, and to alter it and redistribute it freely, subject
+ * to the following restrictions:
+ *
+ * 1. The author is not responsible for the consequences of use of this
+ *    software, no matter how awful, even if they arise from flaws in it.
+ *
+ * 2. The origin of this software must not be misrepresented, either by
+ *    explicit claim or by omission.  Since few users ever read sources,
+ *    credits must appear in the documentation.
+ *
+ * 3. Altered versions must be plainly marked as such, and must not be
+ *    misrepresented as being the original software.  Since few users
+ *    ever read sources, credits must appear in the documentation.
+ *
+ * 4. This notice may not be removed or altered.
  */
 
 /* these types are used to index the table 'types': keep em in sync! */

diff --git a/src/print.c b/src/print.c
index b2dc80f6630d2350afbb729aadf36116c64c33b1..676b4a2d53774d4f49e6846045fd0bf57c2b9ad8 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -1,5 +1,28 @@
 /*
- * Debugging printout routines
+ * print.c - debugging printout routines
+ *
+ * Copyright (c) Ian F. Darwin, 1987.
+ * Written by Ian F. Darwin.
+ *
+ * This software is not subject to any license of the American Telephone
+ * and Telegraph Company or of the Regents of the University of California.
+ *
+ * Permission is granted to anyone to use this software for any purpose on
+ * any computer system, and to alter it and redistribute it freely, subject
+ * to the following restrictions:
+ *
+ * 1. The author is not responsible for the consequences of use of this
+ *    software, no matter how awful, even if they arise from flaws in it.
+ *
+ * 2. The origin of this software must not be misrepresented, either by
+ *    explicit claim or by omission.  Since few users ever read sources,
+ *    credits must appear in the documentation.
+ *
+ * 3. Altered versions must be plainly marked as such, and must not be
+ *    misrepresented as being the original software.  Since few users
+ *    ever read sources, credits must appear in the documentation.
+ *
+ * 4. This notice may not be removed or altered.
  */
 
 #include <stdio.h>

diff --git a/src/softmagic.c b/src/softmagic.c
index f03f4600b86c9bb6f79679199a030f5c2ddf26aa..0aa757e6f9cee30ebbcd01fbef09271ac843f329 100644 (file)
--- a/src/softmagic.c
+++ b/src/softmagic.c
@@ -1,5 +1,28 @@
 /*
- * variable magic from /etc/magic
+ * softmagic - interpret variable magic from /etc/magic
+ *
+ * Copyright (c) Ian F. Darwin, 1987.
+ * Written by Ian F. Darwin.
+ *
+ * This software is not subject to any license of the American Telephone
+ * and Telegraph Company or of the Regents of the University of California.
+ *
+ * Permission is granted to anyone to use this software for any purpose on
+ * any computer system, and to alter it and redistribute it freely, subject
+ * to the following restrictions:
+ *
+ * 1. The author is not responsible for the consequences of use of this
+ *    software, no matter how awful, even if they arise from flaws in it.
+ *
+ * 2. The origin of this software must not be misrepresented, either by
+ *    explicit claim or by omission.  Since few users ever read sources,
+ *    credits must appear in the documentation.
+ *
+ * 3. Altered versions must be plainly marked as such, and must not be
+ *    misrepresented as being the original software.  Since few users
+ *    ever read sources, credits must appear in the documentation.
+ *
+ * 4. This notice may not be removed or altered.
  */
 
 #include <stdio.h>
@@ -15,7 +38,8 @@ extern struct magic magic[];
 static int magindex;
 
 /*
- * softmagic - lookup one file in /etc/magic database.
+ * softmagic - lookup one file in database 
+ * (already read from /etc/magic by apprentice.c).
  * Passed the name and FILE * of one file to be typed.
  */
 softmagic(buf)