Add RCS identifier, #ifndef lint.

diff --git a/src/apprentice.c b/src/apprentice.c
index b593da608b994f70c894e6ee4f82e337718cc2d7..3c5263543be0eff744b2294594278105ed923518 100644 (file)
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -29,13 +29,17 @@
 #include <ctype.h>
 #include "file.h"
 
+#ifndef        lint
+static char *moduleid = "$Header: /home/glen/git/file/cvs/file/src/apprentice.c,v 1.6 1987/09/16 10:11:06 ian Exp $";
+#endif /* lint */
+
 #define MAXSTR         500
 #define        EATAB {while (isascii(*l) && isspace(*l))  ++l;}
 
 
 extern char *progname;
 extern char *magicfile;
-extern int debug, check;       /* options */
+extern int debug;              /* option */
 extern int nmagic;             /* number of valid magic[]s */
 extern long strtol();
 
@@ -43,8 +47,9 @@ struct magic magic[MAXMAGIS];
 
 char *getstr();
 
-apprentice(fn)
-char *fn;
+apprentice(fn, check)
+char *fn;                      /* name of magic file */
+int check;             /* non-zero: checking-only run. */
 {
        FILE *f;
        char line[MAXSTR+1];
@@ -65,7 +70,7 @@ char *fn;
                if (strlen(line) <= 1)  /* null line, garbage, etc */
                        continue;
                line[strlen(line)-1] = '\0'; /* delete newline */
-               (void) parse(line, &nmagic);
+               (void) parse(line, &nmagic, check);
        }
 
        (void) fclose(f);
@@ -74,9 +79,9 @@ char *fn;
 /*
  * parse one line from magic file, put into magic[index++] if valid
  */
-parse(l, ndx)
+parse(l, ndx, check)
 char *l;
-int *ndx;
+int *ndx, check;
 {
        int i = 0, nd = *ndx;
        int slen;
@@ -132,8 +137,10 @@ int *ndx;
                m->reln = '=';
        EATAB;
 
-/* TODO finish this macro and start using it! */
-#define offsetcheck {if (offset > HOWMANY-1) warning("offset too big"); }
+/*
+ * TODO finish this macro and start using it!
+ * #define offsetcheck {if (offset > HOWMANY-1) warning("offset too big"); }
+ */
        switch(m->type) {
        /*
         * Do not remove the casts below.  They are vital.

diff --git a/src/ascmagic.c b/src/ascmagic.c
index e281742e8c0896f64890a3581106397ed1b4244c..fd9c6d1cd2484765e44bfae6eb8d01ed8db7ba68 100644 (file)
--- a/src/ascmagic.c
+++ b/src/ascmagic.c
@@ -31,6 +31,10 @@
 #include "file.h"
 #include "names.h"
 
+#ifndef        lint
+static char *moduleid = "$Header: /home/glen/git/file/cvs/file/src/ascmagic.c,v 1.4 1987/09/16 10:11:40 ian Exp $";
+#endif /* lint */
+
 char ckfmsg[] = "write error on output";
 
                        /* an optimisation over plain strcmp() */

diff --git a/src/fsmagic.c b/src/fsmagic.c
index 66fb04578387df3390d985aac2bdf868e4ecbec3..35110fbf6bb9fab2cca3ca30f1fb68232f9b977b 100644 (file)
--- a/src/fsmagic.c
+++ b/src/fsmagic.c
@@ -40,7 +40,9 @@
 #include <sys/stat.h>
 #include "file.h"
 
-#define USAGE          "usage: %s [-f file] [-m magicfile] file...\n"
+#ifndef        lint
+static char *moduleid = "$Header: /home/glen/git/file/cvs/file/src/fsmagic.c,v 1.5 1987/09/16 10:11:48 ian Exp $";
+#endif /* lint */
 
 extern char *progname;
 extern char *ckfmsg, *magicfile;

diff --git a/src/print.c b/src/print.c
index 676b4a2d53774d4f49e6846045fd0bf57c2b9ad8..fc8f7568a0137b26fc8155e70ea9a49f4757dda7 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -29,6 +29,10 @@
 #include <errno.h>
 #include "file.h"
 
+#ifndef        lint
+static char *moduleid = "$Header: /home/glen/git/file/cvs/file/src/print.c,v 1.4 1987/09/16 10:11:55 ian Exp $";
+#endif /* lint */
+
 #define MAXSTR         500
 
 extern char *progname;

diff --git a/src/softmagic.c b/src/softmagic.c
index 0aa757e6f9cee30ebbcd01fbef09271ac843f329..d6ded6e71f7ddad6d828d811dadb26b9e9612bb6 100644 (file)
--- a/src/softmagic.c
+++ b/src/softmagic.c
@@ -28,7 +28,9 @@
 #include <stdio.h>
 #include "file.h"
 
-#define USAGE          "usage: %s [-f file] [-m magicfile] file...\n"
+#ifndef        lint
+static char *moduleid = "$Header: /home/glen/git/file/cvs/file/src/softmagic.c,v 1.5 1987/09/16 10:12:01 ian Exp $";
+#endif /* lint */
 
 extern char *progname;
 extern char *magicfile;        /* name of current /etc/magic or clone */