make sure that we always include "file.h" first which includes config.h

and add rcsid's to all files.

diff --git a/src/apprentice.c b/src/apprentice.c
index 22d65062fac51fb2dcf5be6de2bf6453c17361c1..7edcb56ca69292037b562fe8f1a9959a0331a012 100644 (file)
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -30,6 +30,11 @@
  */
 
 #include "file.h"
+
+#ifndef        lint
+FILE_RCSID("@(#)$File: apprentice.c,v 1.143 2008/10/30 10:54:07 rrt Exp $")
+#endif /* lint */
+
 #include "magic.h"
 #include "patchlevel.h"
 #include <stdlib.h>
@@ -48,10 +53,6 @@
 #include <sys/types.h>
 #include <dirent.h>
 
-#ifndef        lint
-FILE_RCSID("@(#)$File: apprentice.c,v 1.142 2008/10/18 20:47:48 christos Exp $")
-#endif /* lint */
-
 #define        EATAB {while (isascii((unsigned char) *l) && \
                      isspace((unsigned char) *l))  ++l;}
 #define LOWCASE(l) (isupper((unsigned char) (l)) ? \

diff --git a/src/apptype.c b/src/apptype.c
index ab776856b4901ead713e3accacd51afa2b82fd37..83569e9bf09bf3218df095023a260c4eb32e2f0e 100644 (file)
--- a/src/apptype.c
+++ b/src/apptype.c
@@ -24,16 +24,16 @@
  * 
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "file.h"
 
 #ifndef        lint
-FILE_RCSID("@(#)$File: apptype.c,v 1.7 2007/01/12 17:38:27 christos Exp $")
+FILE_RCSID("@(#)$File: apptype.c,v 1.8 2008/08/31 07:58:00 christos Exp $")
 #endif /* lint */
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #ifdef __EMX__
 #include <io.h>
 #define INCL_DOSSESMGR

diff --git a/src/ascmagic.c b/src/ascmagic.c
index 792cbf18eedf73927d80a998bf36dce52d4ee38d..5c5574f506331da3f4b76da6eb2b48ade032a0e4 100644 (file)
--- a/src/ascmagic.c
+++ b/src/ascmagic.c
@@ -37,6 +37,11 @@
  */
 
 #include "file.h"
+
+#ifndef        lint
+FILE_RCSID("@(#)$File: ascmagic.c,v 1.68 2008/10/30 10:50:24 rrt Exp $")
+#endif /* lint */
+
 #include "magic.h"
 #include <stdio.h>
 #include <string.h>
@@ -48,10 +53,6 @@
 #endif
 #include "names.h"
 
-#ifndef        lint
-FILE_RCSID("@(#)$File: ascmagic.c,v 1.67 2008/10/18 20:47:48 christos Exp $")
-#endif /* lint */
-
 #define MAXLINELEN 300 /* longest sane line length */
 #define ISSPC(x) ((x) == ' ' || (x) == '\t' || (x) == '\r' || (x) == '\n' \
                  || (x) == 0x85 || (x) == '\f')

diff --git a/src/asprintf.c b/src/asprintf.c
index c103cf18e553b92d02c46d8ece312d6c44e0b82e..deb4574e9cbc35b844eaa24cb0f0eaf1148172f1 100644 (file)
--- a/src/asprintf.c
+++ b/src/asprintf.c
@@ -26,6 +26,12 @@
  * SUCH DAMAGE.
  */
 
+#include "file.h"
+
+#ifndef lint
+FILE_RCSID("@(#)$File: cdf.c,v 1.11 2008/11/03 05:34:27 christos Exp $")
+#endif
+
 #include <stdarg.h>
 
 int vasprintf(char **ptr, const char *format_string, va_list vargs);

diff --git a/src/cdf.c b/src/cdf.c
index 118404a2c730f05b7b131f216313006f3cfe6453..cdaf860973657c2ff04f76077e512fe2c228d78a 100644 (file)
--- a/src/cdf.c
+++ b/src/cdf.c
@@ -29,8 +29,10 @@
  * Info from: http://sc.openoffice.org/compdocfileformat.pdf
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "file.h"
+
+#ifndef lint
+FILE_RCSID("@(#)$File: cdf.c,v 1.11 2008/11/03 05:34:27 christos Exp $")
 #endif
 
 #include <assert.h>
@@ -58,11 +60,6 @@
 
 #include "cdf.h"
 
-#include "file.h"
-#ifndef lint
-FILE_RCSID("@(#)$File: readelf.c,v 1.80 2008/10/18 20:47:48 christos Exp $")
-#endif
-
 #ifndef __arraycount
 #define __arraycount(a) (sizeof(a) / sizeof(a[0]))
 #endif

diff --git a/src/cdf_time.c b/src/cdf_time.c
index b74cd305f7cb2f3a840a39a3c2ddebe476401d35..71f9e7fb5d860d584314fd26f17a711251f66b09 100644 (file)
--- a/src/cdf_time.c
+++ b/src/cdf_time.c
@@ -23,8 +23,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
+
+#include "file.h"
+
+#ifndef lint
+FILE_RCSID("@(#)$File: cdf.c,v 1.11 2008/11/03 05:34:27 christos Exp $")
 #endif
 
 #include <sys/types.h>

diff --git a/src/compress.c b/src/compress.c
index 9d2311b62378fe9685a5ef1e81cd49c1b5293254..e62cf2c4d4026e6f5223a1714d88f7a209d06f84 100644 (file)
--- a/src/compress.c
+++ b/src/compress.c
@@ -33,6 +33,11 @@
  *                                         using method, return sizeof new
  */
 #include "file.h"
+
+#ifndef lint
+FILE_RCSID("@(#)$File: compress.c,v 1.57 2008/07/16 18:00:57 christos Exp $")
+#endif
+
 #include "magic.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -54,11 +59,6 @@
 #include <zlib.h>
 #endif
 
-
-#ifndef lint
-FILE_RCSID("@(#)$File: compress.c,v 1.56 2008/02/07 00:58:52 christos Exp $")
-#endif
-
 private const struct {
        const char magic[8];
        size_t maglen;

diff --git a/src/file.c b/src/file.c
index 17862a5d931118a0169790e1df3c2cbf9402f700..3e38839bf54a444e13b2a3a7fca45e9b56ec723c 100644 (file)
--- a/src/file.c
+++ b/src/file.c
@@ -30,6 +30,11 @@
  */
 
 #include "file.h"
+
+#ifndef        lint
+FILE_RCSID("@(#)$File: file.c,v 1.126 2008/10/18 20:47:48 christos Exp $")
+#endif /* lint */
+
 #include "magic.h"
 
 #include <stdio.h>
@@ -73,11 +78,6 @@ int getopt_long(int argc, char * const *argv, const char *optstring, const struc
 
 #include "patchlevel.h"
 
-#ifndef        lint
-FILE_RCSID("@(#)$File: file.c,v 1.125 2008/10/12 15:38:51 christos Exp $")
-#endif /* lint */
-
-
 #ifdef S_IFLNK
 #define SYMLINKFLAG "Lh"
 #else

diff --git a/src/fsmagic.c b/src/fsmagic.c
index 596b779d84ec44350d0d1762d7f814f4b158e6f4..a974d9e5eaf5a1fa4a8bc6769017f542f9fa51d1 100644 (file)
--- a/src/fsmagic.c
+++ b/src/fsmagic.c
@@ -30,6 +30,11 @@
  */
 
 #include "file.h"
+
+#ifndef        lint
+FILE_RCSID("@(#)$File: fsmagic.c,v 1.54 2008/10/18 20:47:48 christos Exp $")
+#endif /* lint */
+
 #include "magic.h"
 #include <string.h>
 #ifdef HAVE_UNISTD_H
@@ -56,10 +61,6 @@
 #endif
 #undef HAVE_MAJOR
 
-#ifndef        lint
-FILE_RCSID("@(#)$File: fsmagic.c,v 1.53 2008/10/16 16:31:16 christos Exp $")
-#endif /* lint */
-
 private int
 bad_link(struct magic_set *ms, int err, char *buf)
 {

diff --git a/src/funcs.c b/src/funcs.c
index f8eee56bf339edf767ef80bf5c08b825370ac468..69485921f3d5b756c7a731e2e8cc8b2193010d72 100644 (file)
--- a/src/funcs.c
+++ b/src/funcs.c
@@ -25,6 +25,11 @@
  * SUCH DAMAGE.
  */
 #include "file.h"
+
+#ifndef        lint
+FILE_RCSID("@(#)$File: funcs.c,v 1.46 2008/10/16 16:30:34 christos Exp $")
+#endif /* lint */
+
 #include "magic.h"
 #include <stdarg.h>
 #include <stdlib.h>
@@ -40,10 +45,6 @@
 #include <limits.h>
 #endif
 
-#ifndef        lint
-FILE_RCSID("@(#)$File: funcs.c,v 1.45 2008/10/12 15:38:52 christos Exp $")
-#endif /* lint */
-
 #ifndef SIZE_MAX
 #define SIZE_MAX       ((size_t)~0)
 #endif

diff --git a/src/getopt_long.c b/src/getopt_long.c
index 5b9c20b4992884704c46bf1608b1b664d40d142a..f81306ef7ccca03c1d1dc179516f3b3dff4bae20 100644 (file)
--- a/src/getopt_long.c
+++ b/src/getopt_long.c
@@ -29,9 +29,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "file.h"
+
+#ifndef        lint
+FILE_RCSID("@(#)$File: funcs.c,v 1.46 2008/10/16 16:30:34 christos Exp $")
+#endif /* lint */
+
 #include <assert.h>
 #ifdef HAVE_ERR_H
 #include <err.h>

diff --git a/src/is_tar.c b/src/is_tar.c
index 255b3002178330cbaf72be4dd7d49a6fd260cb56..907a265ac297f23e2cf80f31efd52c808eb0dd9f 100644 (file)
--- a/src/is_tar.c
+++ b/src/is_tar.c
@@ -38,16 +38,17 @@
  */
 
 #include "file.h"
+
+#ifndef lint
+FILE_RCSID("@(#)$File: is_tar.c,v 1.33 2008/11/03 06:18:34 rrt Exp $")
+#endif
+
 #include "magic.h"
 #include <string.h>
 #include <ctype.h>
 #include <sys/types.h>
 #include "tar.h"
 
-#ifndef lint
-FILE_RCSID("@(#)$File: is_tar.c,v 1.32 2008/10/18 20:47:48 christos Exp $")
-#endif
-
 #define        isodigit(c)     ( ((c) >= '0') && ((c) <= '7') )
 
 private int is_tar(const unsigned char *, size_t);

diff --git a/src/magic.c b/src/magic.c
index e7b002aa369371ffffae217dda9d5225690f8c55..093f827e1e04bd266d004e142634f29820db1981 100644 (file)
--- a/src/magic.c
+++ b/src/magic.c
@@ -26,6 +26,11 @@
  */
 
 #include "file.h"
+
+#ifndef        lint
+FILE_RCSID("@(#)$File: magic.c,v 1.54 2008/07/25 23:30:32 rrt Exp $")
+#endif /* lint */
+
 #include "magic.h"
 
 #include <stdio.h>
@@ -64,10 +69,6 @@
 
 #include "patchlevel.h"
 
-#ifndef        lint
-FILE_RCSID("@(#)$File: magic.c,v 1.53 2008/07/16 18:00:57 christos Exp $")
-#endif /* lint */
-
 #ifndef PIPE_BUF
 /* Get the PIPE_BUF from pathconf */
 #ifdef _PC_PIPE_BUF

diff --git a/src/print.c b/src/print.c
index 72a8c1014dfcfba5341b42610ac9f29b3c387606..5f61a17ea959fce4e3e49b809476ee1e0684f6d8 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -30,6 +30,11 @@
  */
 
 #include "file.h"
+
+#ifndef lint
+FILE_RCSID("@(#)$File: print.c,v 1.64 2008/10/20 15:14:17 christos Exp $")
+#endif  /* lint */
+
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
@@ -40,10 +45,6 @@
 #endif
 #include <time.h>
 
-#ifndef lint
-FILE_RCSID("@(#)$File: print.c,v 1.63 2008/02/17 19:28:54 rrt Exp $")
-#endif  /* lint */
-
 #define SZOF(a)        (sizeof(a) / sizeof(a[0]))
 
 #ifndef COMPILE_ONLY

diff --git a/src/readelf.c b/src/readelf.c
index c807d04049c6b02072f86a076413b1e72325c858..ad5d9727b8f9f21e30fb6fd40e2b77fdea2fe3b2 100644 (file)
--- a/src/readelf.c
+++ b/src/readelf.c
@@ -26,6 +26,10 @@
  */
 #include "file.h"
 
+#ifndef lint
+FILE_RCSID("@(#)$File: readelf.c,v 1.80 2008/10/18 20:47:48 christos Exp $")
+#endif
+
 #ifdef BUILTIN_ELF
 #include <string.h>
 #include <ctype.h>
@@ -37,10 +41,6 @@
 #include "readelf.h"
 #include "magic.h"
 
-#ifndef lint
-FILE_RCSID("@(#)$File: readelf.c,v 1.79 2008/10/12 19:06:36 christos Exp $")
-#endif
-
 #ifdef ELFCORE
 private int dophn_core(struct magic_set *, int, int, int, off_t, int, size_t,
     off_t, int *);

diff --git a/src/softmagic.c b/src/softmagic.c
index 9ab83f4d4010cce9f2196b7f787034ad4cad8e52..3dff3c7ed005ce5b8c8ca745952c29d6f7c5e8e7 100644 (file)
--- a/src/softmagic.c
+++ b/src/softmagic.c
@@ -30,6 +30,11 @@
  */
 
 #include "file.h"
+
+#ifndef        lint
+FILE_RCSID("@(#)$File: softmagic.c,v 1.125 2008/10/30 10:43:49 rrt Exp $")
+#endif /* lint */
+
 #include "magic.h"
 #include <string.h>
 #include <ctype.h>
@@ -37,10 +42,6 @@
 #include <time.h>
 
 
-#ifndef        lint
-FILE_RCSID("@(#)$File: softmagic.c,v 1.124 2008/10/18 20:47:48 christos Exp $")
-#endif /* lint */
-
 private int match(struct magic_set *, struct magic *, uint32_t,
     const unsigned char *, size_t, int);
 private int mget(struct magic_set *, const unsigned char *,

diff --git a/src/vasprintf.c b/src/vasprintf.c
index 0289c0d88b4f1342a73bf296e832f39bfba5226e..0e2affed227ffec8521c3d33d1b2d13cdcdbe1a8 100644 (file)
--- a/src/vasprintf.c
+++ b/src/vasprintf.c
@@ -105,9 +105,11 @@ A buffer overflow can only occur if your sprintf() do strange things or when
 you use strange formats.
 
 */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "file.h"
+
+#ifndef        lint
+FILE_RCSID("@(#)$File: softmagic.c,v 1.125 2008/10/30 10:43:49 rrt Exp $")
+#endif /* lint */
 
 #include <assert.h>
 #include <stdio.h>