*** empty log message ***

diff --git a/src/Makefile b/src/Makefile
index 6f39565ebd81e7017b8a3a829aa20da0354fa64e..c64280871a91fa70c9cda68704aab97f9db4bcbc 100644 (file)
--- a/src/Makefile
+++ b/src/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.35 1993/04/15 17:26:53 ian Exp $
+# @(#)$Id: Makefile,v 1.36 1993/09/23 20:26:25 christos 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.
@@ -137,4 +137,4 @@ dist.magic: Magdir
                (echo mkdir Magdir; $(SHAR) $(ALLMAGIC)) >$@
 
 tar:           $(ALLSRC) $(ALLMAGIC)
-               tar cvf /dev/rfd0a $(ALLSRC) $(ALLMAGIC)
+               tar cvf file.tar $(ALLSRC) $(ALLMAGIC)

diff --git a/src/file.h b/src/file.h
index 55cf9f3cb4de643a199034e2e7c8fafabaa20c1f..c6cf24e2155938467e5f76e43db7091cbd4dd286 100644 (file)
--- a/src/file.h
+++ b/src/file.h
@@ -1,6 +1,6 @@
 /*
  * file.h - definitions for file(1) program
- * @(#)$Id: file.h,v 1.15 1993/09/16 21:08:06 christos Exp $
+ * @(#)$Id: file.h,v 1.16 1993/09/23 20:26:25 christos Exp $
  *
  * Copyright (c) Ian F. Darwin, 1987.
  * Written by Ian F. Darwin.
@@ -40,7 +40,6 @@ struct magic {
                long offset;    /* offset from indirection */
        } in;
        long offset;            /* offset to magic number */
-#define        MASK    0200            /* this is a masked op, like & v1 = v2 */
        unsigned char reln;     /* relation (0=eq, '>'=gt, etc) */
        char type;              /* int, short, long or string. */
        char vallen;            /* length of string value, if any */

diff --git a/src/print.c b/src/print.c
index aca9ebb449ccda7803eaad6c1bd4446b30bc8965..7114a7bd571910e1423c0a37862343c37f769b53 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -40,7 +40,7 @@
 
 #ifndef lint
 static char *moduleid =
-       "@(#)$Id: print.c,v 1.19 1993/09/16 21:15:59 christos Exp $";
+       "@(#)$Id: print.c,v 1.20 1993/09/23 20:26:25 christos Exp $";
 #endif  /* lint */
 
 #define SZOF(a)        (sizeof(a) / sizeof(a[0]))
@@ -72,9 +72,7 @@ struct magic *m;
                        "*bad*", 
                     stderr);
 
-       if (m->reln & MASK)
-           (void) fprintf(stderr, ",%x&%c", m->mask, m->reln & ~MASK);
-       else if (m->reln == 'x')
+       if (m->reln == 'x')
            (void) fputs(",*any*", stderr);
        else
            (void) fprintf(stderr, ",%c", m->reln);