CVS commit: src/external/bsd/file/dist
Module Name:src Committed By: christos Date: Fri Feb 10 17:56:27 UTC 2017 Modified Files: src/external/bsd/file/dist: configure Log Message: put back maintainer mode To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/external/bsd/file/dist/configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/configure diff -u src/external/bsd/file/dist/configure:1.15 src/external/bsd/file/dist/configure:1.16 --- src/external/bsd/file/dist/configure:1.15 Fri Feb 10 12:53:24 2017 +++ src/external/bsd/file/dist/configure Fri Feb 10 12:56:27 2017 @@ -2977,6 +2977,28 @@ else fi rmdir .tst 2>/dev/null +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } +# Check whether --enable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then : + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 +$as_echo "$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +else + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= +fi + + MAINT=$MAINTAINER_MODE_TRUE + + # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules;
CVS commit: src/external/bsd/file/dist
Module Name:src Committed By: christos Date: Thu Jan 3 16:28:06 UTC 2013 Update of /cvsroot/src/external/bsd/file/dist In directory ivanova.netbsd.org:/tmp/cvs-serv16727 Log Message: from ftp.astron.com Status: Vendor Tag: CHRISTOS Release Tags: FILE_5_12 U src/external/bsd/file/dist/acinclude.m4 U src/external/bsd/file/dist/README C src/external/bsd/file/dist/configure.ac C src/external/bsd/file/dist/aclocal.m4 U src/external/bsd/file/dist/Makefile.am C src/external/bsd/file/dist/Makefile.in C src/external/bsd/file/dist/config.h.in C src/external/bsd/file/dist/configure U src/external/bsd/file/dist/AUTHORS U src/external/bsd/file/dist/COPYING U src/external/bsd/file/dist/ChangeLog U src/external/bsd/file/dist/INSTALL U src/external/bsd/file/dist/NEWS U src/external/bsd/file/dist/TODO U src/external/bsd/file/dist/compile U src/external/bsd/file/dist/config.guess U src/external/bsd/file/dist/config.sub U src/external/bsd/file/dist/depcomp C src/external/bsd/file/dist/install-sh U src/external/bsd/file/dist/ltmain.sh U src/external/bsd/file/dist/missing U src/external/bsd/file/dist/MAINT U src/external/bsd/file/dist/m4/lt~obsolete.m4 U src/external/bsd/file/dist/m4/libtool.m4 U src/external/bsd/file/dist/m4/ltoptions.m4 U src/external/bsd/file/dist/m4/ltsugar.m4 U src/external/bsd/file/dist/m4/ltversion.m4 N src/external/bsd/file/dist/m4/visibility.m4 U src/external/bsd/file/dist/src/Makefile.am U src/external/bsd/file/dist/src/magic.h U src/external/bsd/file/dist/src/getopt_long.c C src/external/bsd/file/dist/src/Makefile.in N src/external/bsd/file/dist/src/asctime_r.c U src/external/bsd/file/dist/src/asprintf.c N src/external/bsd/file/dist/src/ctime_r.c U src/external/bsd/file/dist/src/getline.c U src/external/bsd/file/dist/src/mygetopt.h U src/external/bsd/file/dist/src/strlcat.c U src/external/bsd/file/dist/src/strlcpy.c U src/external/bsd/file/dist/src/vasprintf.c C src/external/bsd/file/dist/src/magic.c C src/external/bsd/file/dist/src/apprentice.c C src/external/bsd/file/dist/src/softmagic.c U src/external/bsd/file/dist/src/ascmagic.c U src/external/bsd/file/dist/src/encoding.c C src/external/bsd/file/dist/src/compress.c U src/external/bsd/file/dist/src/is_tar.c C src/external/bsd/file/dist/src/readelf.c C src/external/bsd/file/dist/src/print.c C src/external/bsd/file/dist/src/fsmagic.c C src/external/bsd/file/dist/src/funcs.c C src/external/bsd/file/dist/src/file.h U src/external/bsd/file/dist/src/readelf.h U src/external/bsd/file/dist/src/tar.h U src/external/bsd/file/dist/src/apptype.c U src/external/bsd/file/dist/src/file_opts.h U src/external/bsd/file/dist/src/elfclass.h C src/external/bsd/file/dist/src/cdf.c C src/external/bsd/file/dist/src/cdf_time.c C src/external/bsd/file/dist/src/readcdf.c U src/external/bsd/file/dist/src/cdf.h U src/external/bsd/file/dist/src/file.c C src/external/bsd/file/dist/magic/Makefile.am C src/external/bsd/file/dist/magic/Makefile.in U src/external/bsd/file/dist/magic/Header U src/external/bsd/file/dist/magic/Localstuff U src/external/bsd/file/dist/magic/magdir/adventure U src/external/bsd/file/dist/magic/magdir/acorn U src/external/bsd/file/dist/magic/magdir/adi U src/external/bsd/file/dist/magic/magdir/animation U src/external/bsd/file/dist/magic/magdir/allegro U src/external/bsd/file/dist/magic/magdir/alliant U src/external/bsd/file/dist/magic/magdir/amanda U src/external/bsd/file/dist/magic/magdir/amigaos C src/external/bsd/file/dist/magic/magdir/apple U src/external/bsd/file/dist/magic/magdir/apl U src/external/bsd/file/dist/magic/magdir/assembler U src/external/bsd/file/dist/magic/magdir/applix C src/external/bsd/file/dist/magic/magdir/archive U src/external/bsd/file/dist/magic/magdir/communications U src/external/bsd/file/dist/magic/magdir/asterix U src/external/bsd/file/dist/magic/magdir/att3b U src/external/bsd/file/dist/magic/magdir/audio U src/external/bsd/file/dist/magic/magdir/basis U src/external/bsd/file/dist/magic/magdir/bflt U src/external/bsd/file/dist/magic/magdir/blcr U src/external/bsd/file/dist/magic/magdir/blender U src/external/bsd/file/dist/magic/magdir/blit U src/external/bsd/file/dist/magic/magdir/bout U src/external/bsd/file/dist/magic/magdir/bsdi U src/external/bsd/file/dist/magic/magdir/bsi U src/external/bsd/file/dist/magic/magdir/btsnoop U src/external/bsd/file/dist/magic/magdir/c-lang U src/external/bsd/file/dist/magic/magdir/c64 U src/external/bsd/file/dist/magic/magdir/cad U src/external/bsd/file/dist/magic/magdir/efi U src/external/bsd/file/dist/magic/magdir/cafebabe U src/external/bsd/file/dist/magic/magdir/cddb U src/external/bsd/file/dist/magic/magdir/chord U src/external/bsd/file/dist/magic/magdir/cisco U src/external/bsd/file/dist/magic/magdir/citrus U src/external/bsd/file/dist/magic/magdir/clarion U src/external/bsd/file/dist/magic/magdir/claris U src/external/bsd/file/dist/magic/magdir/clipper U src/external/bsd/file/dist/magic/magdir/commands C src/external/bsd/file/dist/magic/m
CVS commit: src/external/bsd/file/dist
Module Name:src Committed By: christos Date: Sat Apr 7 17:30:56 UTC 2012 Modified Files: src/external/bsd/file/dist/magic/magdir: apple src/external/bsd/file/dist/src: apprentice.c softmagic.c Log Message: bring in changes from head. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/file/dist/magic/magdir/apple cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/src/apprentice.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/dist/src/softmagic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/magic/magdir/apple diff -u src/external/bsd/file/dist/magic/magdir/apple:1.1.1.2 src/external/bsd/file/dist/magic/magdir/apple:1.2 --- src/external/bsd/file/dist/magic/magdir/apple:1.1.1.2 Thu May 12 16:46:57 2011 +++ src/external/bsd/file/dist/magic/magdir/apple Sat Apr 7 13:30:55 2012 @@ -1,6 +1,6 @@ #-- -# $File: apple,v 1.24 2010/11/25 15:00:12 christos Exp $ +# $File: apple,v 1.25 2012/04/06 21:18:09 christos Exp $ # apple: file(1) magic for Apple file formats # 0 search/1/t FiLeStArTfIlEsTaRt binscii (apple ][) text @@ -249,3 +249,45 @@ # From: "Nelson A. de Oliveira" # .vdi 4 string innotek\ VirtualBox\ Disk\ Image %s + +# Apple disk partition stuff, strengthen the magic using byte 4 +0 beshort 0x4552 +>4 byte 0 Apple Driver Map +>>2 beshort x \b, blocksize %d +>>4 belong x \b, blockcount %d +>>10 beshort x \b, devtype %d +>>12 beshort x \b, devid %d +>>20 beshort x \b, descriptors %d +# Assume 8 partitions each at a multiple of the sector size. +# We could glean this from the partition descriptors, but they are empty!?!? +>>(2.S*1) indirect \b, contains[@0x%x]: +>>(2.S*2) indirect \b, contains[@0x%x]: +>>(2.S*3) indirect \b, contains[@0x%x]: +>>(2.S*4) indirect \b, contains[@0x%x]: +>>(2.S*5) indirect \b, contains[@0x%x]: +>>(2.S*6) indirect \b, contains[@0x%x]: +>>(2.S*7) indirect \b, contains[@0x%x]: +>>(2.S*8) indirect \b, contains[@0x%x]: + +# Yes, the 3rd and 4th bytes are reserved, but we use them to make the +# magic stronger. +0 belong 0x504d Apple Partition Map +>4 belong x \b, map block count %d +>8 belong x \b, start block %d +>12 belong x \b, block count %d +>16 string >0 \b, name %s +>48 string >0 \b, type %s +>124 string >0 \b, processor %s +>140 string >0 \b, boot arguments %s +>92 belong & 1 \b, valid +>92 belong & 2 \b, allocated +>92 belong & 4 \b, in use +>92 belong & 8 \b, has boot info +>92 belong & 16 \b, readable +>92 belong & 32 \b, writable +>92 belong & 64 \b, pic boot code +>92 belong & 128 \b, chain compatible driver +>92 belong & 256 \b, real driver +>92 belong & 512 \b, chain driver +>92 belong & 1024 \b, mount at startup +>92 belong & 2048 \b, is the startup partition Index: src/external/bsd/file/dist/src/apprentice.c diff -u src/external/bsd/file/dist/src/apprentice.c:1.6 src/external/bsd/file/dist/src/apprentice.c:1.7 --- src/external/bsd/file/dist/src/apprentice.c:1.6 Wed Feb 22 12:53:51 2012 +++ src/external/bsd/file/dist/src/apprentice.c Sat Apr 7 13:30:55 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: apprentice.c,v 1.6 2012/02/22 17:53:51 christos Exp $ */ +/* $NetBSD: apprentice.c,v 1.7 2012/04/07 17:30:55 christos Exp $ */ /* * Copyright (c) Ian F. Darwin 1986-1995. @@ -37,7 +37,7 @@ #if 0 FILE_RCSID("@(#)$File: apprentice.c,v 1.173 2011/12/08 12:38:24 rrt Exp $") #else -__RCSID("$NetBSD: apprentice.c,v 1.6 2012/02/22 17:53:51 christos Exp $"); +__RCSID("$NetBSD: apprentice.c,v 1.7 2012/04/07 17:30:55 christos Exp $"); #endif #endif /* lint */ @@ -218,7 +218,7 @@ static const struct type_tbl_s { { XX("ledouble"), FILE_LEDOUBLE, FILE_FMT_DOUBLE }, { XX("leid3"), FILE_LEID3, FILE_FMT_NUM }, { XX("beid3"), FILE_BEID3, FILE_FMT_NUM }, - { XX("indirect"), FILE_INDIRECT, FILE_FMT_NONE }, + { XX("indirect"), FILE_INDIRECT, FILE_FMT_NUM }, { XX_NULL, FILE_INVALID, FILE_FMT_NONE }, # undef XX # undef XX_NULL @@ -477,6 +477,9 @@ apprentice_magic_strength(const struct m val += 8 * MULT; break; + case FILE_INDIRECT: + break; + default: val = 0; (void)fprintf(stderr, "Bad type %d\n", m->type); Index: src/external/bsd/file/dist/src/softmagic.c diff -u src/external/bsd/file/dist/src/softmagic.c:1.5 src/external/bsd/file/dist/src/softmagic.c:1.6 --- src/external/bsd/file/dist/src/softmagic.c:1.5 Wed Feb 22 12:53:51 2012 +++ src/external/bsd/file/dist/src/softmagic.c Sat Apr 7 13:30:56 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: softmagic.c,v 1.5 2012/02/22 17:53:51 christos Exp $ */ +/* $NetBSD: softmagic.c,v 1.6 2012/04/07 17:30:56 christos Exp $ */ /* * Copyright (c) Ian F. Darwin 1986-1995. @@ -37,7 +37,7 @@ #if 0 FILE_RCSID("@(#)$File: softmagic.c,v 1.147 2011/11/05 15:44:22 rrt Exp $") #else -__RCSID("$NetBS
CVS commit: src/external/bsd/file/dist
Module Name:src Committed By: christos Date: Wed Feb 22 17:48:53 UTC 2012 Update of /cvsroot/src/external/bsd/file/dist In directory ivanova.netbsd.org:/tmp/cvs-serv4443 Log Message: from ftp.astron.com, CDF security fixes Status: Vendor Tag: CHRISTOS Release Tags: FILE5_11 U src/external/bsd/file/dist/acinclude.m4 U src/external/bsd/file/dist/README C src/external/bsd/file/dist/configure.ac U src/external/bsd/file/dist/aclocal.m4 U src/external/bsd/file/dist/Makefile.am U src/external/bsd/file/dist/Makefile.in U src/external/bsd/file/dist/config.h.in C src/external/bsd/file/dist/configure U src/external/bsd/file/dist/AUTHORS U src/external/bsd/file/dist/COPYING U src/external/bsd/file/dist/ChangeLog U src/external/bsd/file/dist/INSTALL U src/external/bsd/file/dist/NEWS U src/external/bsd/file/dist/TODO U src/external/bsd/file/dist/compile U src/external/bsd/file/dist/config.guess U src/external/bsd/file/dist/config.sub U src/external/bsd/file/dist/depcomp C src/external/bsd/file/dist/install-sh U src/external/bsd/file/dist/ltmain.sh U src/external/bsd/file/dist/missing U src/external/bsd/file/dist/MAINT U src/external/bsd/file/dist/m4/lt~obsolete.m4 U src/external/bsd/file/dist/m4/libtool.m4 U src/external/bsd/file/dist/m4/ltoptions.m4 U src/external/bsd/file/dist/m4/ltsugar.m4 U src/external/bsd/file/dist/m4/ltversion.m4 U src/external/bsd/file/dist/src/Makefile.am U src/external/bsd/file/dist/src/magic.h U src/external/bsd/file/dist/src/getopt_long.c C src/external/bsd/file/dist/src/Makefile.in U src/external/bsd/file/dist/src/asprintf.c U src/external/bsd/file/dist/src/getline.c U src/external/bsd/file/dist/src/mygetopt.h U src/external/bsd/file/dist/src/strlcat.c U src/external/bsd/file/dist/src/strlcpy.c U src/external/bsd/file/dist/src/vasprintf.c U src/external/bsd/file/dist/src/magic.c C src/external/bsd/file/dist/src/apprentice.c C src/external/bsd/file/dist/src/softmagic.c U src/external/bsd/file/dist/src/ascmagic.c U src/external/bsd/file/dist/src/encoding.c C src/external/bsd/file/dist/src/compress.c U src/external/bsd/file/dist/src/is_tar.c U src/external/bsd/file/dist/src/readelf.c C src/external/bsd/file/dist/src/print.c U src/external/bsd/file/dist/src/fsmagic.c C src/external/bsd/file/dist/src/funcs.c C src/external/bsd/file/dist/src/file.h U src/external/bsd/file/dist/src/readelf.h U src/external/bsd/file/dist/src/tar.h C src/external/bsd/file/dist/src/cdf.c U src/external/bsd/file/dist/src/apptype.c U src/external/bsd/file/dist/src/file_opts.h U src/external/bsd/file/dist/src/elfclass.h C src/external/bsd/file/dist/src/cdf_time.c C src/external/bsd/file/dist/src/readcdf.c U src/external/bsd/file/dist/src/cdf.h U src/external/bsd/file/dist/src/file.c C src/external/bsd/file/dist/magic/Makefile.am C src/external/bsd/file/dist/magic/Makefile.in U src/external/bsd/file/dist/magic/Header U src/external/bsd/file/dist/magic/Localstuff U src/external/bsd/file/dist/magic/magdir/adventure U src/external/bsd/file/dist/magic/magdir/acorn U src/external/bsd/file/dist/magic/magdir/adi U src/external/bsd/file/dist/magic/magdir/animation U src/external/bsd/file/dist/magic/magdir/allegro U src/external/bsd/file/dist/magic/magdir/alliant U src/external/bsd/file/dist/magic/magdir/amanda U src/external/bsd/file/dist/magic/magdir/amigaos U src/external/bsd/file/dist/magic/magdir/apple U src/external/bsd/file/dist/magic/magdir/apl N src/external/bsd/file/dist/magic/magdir/assembler U src/external/bsd/file/dist/magic/magdir/applix C src/external/bsd/file/dist/magic/magdir/archive U src/external/bsd/file/dist/magic/magdir/communications U src/external/bsd/file/dist/magic/magdir/asterix U src/external/bsd/file/dist/magic/magdir/att3b U src/external/bsd/file/dist/magic/magdir/audio U src/external/bsd/file/dist/magic/magdir/basis U src/external/bsd/file/dist/magic/magdir/bflt U src/external/bsd/file/dist/magic/magdir/blcr U src/external/bsd/file/dist/magic/magdir/blender U src/external/bsd/file/dist/magic/magdir/blit U src/external/bsd/file/dist/magic/magdir/bout U src/external/bsd/file/dist/magic/magdir/bsdi U src/external/bsd/file/dist/magic/magdir/bsi U src/external/bsd/file/dist/magic/magdir/btsnoop U src/external/bsd/file/dist/magic/magdir/c-lang U src/external/bsd/file/dist/magic/magdir/c64 U src/external/bsd/file/dist/magic/magdir/cad U src/external/bsd/file/dist/magic/magdir/efi U src/external/bsd/file/dist/magic/magdir/cafebabe U src/external/bsd/file/dist/magic/magdir/cddb U src/external/bsd/file/dist/magic/magdir/chord U src/external/bsd/file/dist/magic/magdir/cisco U src/external/bsd/file/dist/magic/magdir/citrus U src/external/bsd/file/dist/magic/magdir/clarion U src/external/bsd/file/dist/magic/magdir/claris U src/external/bsd/file/dist/magic/magdir/clipper U src/external/bsd/file/dist/magic/magdir/commands U src/external/bsd/file/dist/magic/magdir/filesystems U src/external/bsd/file/dist/magic/magdir/compress U src/external/bsd/file/dist/magic/magdir/conso
CVS commit: src/external/bsd/file/dist
Module Name:src Committed By: christos Date: Wed Feb 22 17:53:52 UTC 2012 Modified Files: src/external/bsd/file/dist: configure configure.ac install-sh src/external/bsd/file/dist/doc: file.1 libmagic.3 magic.5 src/external/bsd/file/dist/magic: Makefile.am Makefile.in src/external/bsd/file/dist/magic/magdir: archive src/external/bsd/file/dist/src: Makefile.in apprentice.c cdf.c cdf_time.c compress.c file.h funcs.c print.c readcdf.c softmagic.c Removed Files: src/external/bsd/file/dist/src: names.h Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/configure cvs rdiff -u -r1.3 -r1.4 src/external/bsd/file/dist/configure.ac cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/dist/install-sh cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/doc/file.1 cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/doc/libmagic.3 cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/doc/magic.5 cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/dist/magic/Makefile.am cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/magic/Makefile.in cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/dist/magic/magdir/archive cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/dist/src/Makefile.in \ src/external/bsd/file/dist/src/compress.c \ src/external/bsd/file/dist/src/softmagic.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/dist/src/apprentice.c \ src/external/bsd/file/dist/src/cdf.c \ src/external/bsd/file/dist/src/file.h cvs rdiff -u -r1.3 -r1.4 src/external/bsd/file/dist/src/cdf_time.c \ src/external/bsd/file/dist/src/funcs.c \ src/external/bsd/file/dist/src/print.c cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/file/dist/src/names.h cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/src/readcdf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/configure diff -u src/external/bsd/file/dist/configure:1.6 src/external/bsd/file/dist/configure:1.7 --- src/external/bsd/file/dist/configure:1.6 Sun Sep 25 14:18:43 2011 +++ src/external/bsd/file/dist/configure Wed Feb 22 12:53:48 2012 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.64 for file 5.09. +# Generated by GNU Autoconf 2.68 for file 5.11. # # Report bugs to . # @@ -698,8 +698,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='file' PACKAGE_TARNAME='file' -PACKAGE_VERSION='5.09' -PACKAGE_STRING='file 5.09' +PACKAGE_VERSION='5.11' +PACKAGE_STRING='file 5.11' PACKAGE_BUGREPORT='chris...@astron.com' PACKAGE_URL='' @@ -1431,7 +1431,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures file 5.09 to adapt to many kinds of systems. +\`configure' configures file 5.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1501,7 +1501,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of file 5.09:";; + short | recursive ) echo "Configuration of file 5.11:";; esac cat <<\_ACEOF @@ -1609,8 +1609,8 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -file configure 5.09 -generated by GNU Autoconf 2.64 +file configure 5.11 +generated by GNU Autoconf 2.68 Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -2308,8 +2308,8 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by file $as_me 5.09, which was -generated by GNU Autoconf 2.64. Invocation command line was +It was created by file $as_me 5.11, which was +generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3116,7 +3116,7 @@ fi # Define the identity of the package. PACKAGE='file' - VERSION='5.09' + VERSION='5.11' cat >>confdefs.h <<_ACEOF @@ -13477,8 +13477,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by file $as_me 5.09, which was -generated by GNU Autoconf 2.64. Invocation command line was +This file was extended by file $as_me 5.11, which was +generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES= $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -13541,9 +13541,9 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -file config.status 5.09 -configured by $0, generated by GNU Autoconf 2.64, - with options \\"`$as_echo "$ac_co
CVS commit: src/external/bsd/file/dist
Module Name:src Committed By: christos Date: Fri May 8 16:35:10 UTC 2009 Update of /cvsroot/src/external/bsd/file/dist In directory ivanova.netbsd.org:/tmp/cvs-serv14862 Log Message: from ftp.astron.com Status: Vendor Tag: CHRISTOS Release Tags: FILE5_03 N src/external/bsd/file/dist/acinclude.m4 N src/external/bsd/file/dist/README N src/external/bsd/file/dist/configure.ac N src/external/bsd/file/dist/aclocal.m4 N src/external/bsd/file/dist/Makefile.am N src/external/bsd/file/dist/Makefile.in N src/external/bsd/file/dist/config.h.in N src/external/bsd/file/dist/configure N src/external/bsd/file/dist/AUTHORS N src/external/bsd/file/dist/COPYING N src/external/bsd/file/dist/ChangeLog N src/external/bsd/file/dist/INSTALL N src/external/bsd/file/dist/NEWS N src/external/bsd/file/dist/TODO N src/external/bsd/file/dist/compile N src/external/bsd/file/dist/config.guess N src/external/bsd/file/dist/config.sub N src/external/bsd/file/dist/depcomp N src/external/bsd/file/dist/install-sh N src/external/bsd/file/dist/ltmain.sh N src/external/bsd/file/dist/missing N src/external/bsd/file/dist/MAINT N src/external/bsd/file/dist/file2netbsd N src/external/bsd/file/dist/src/Makefile.am N src/external/bsd/file/dist/src/magic.h N src/external/bsd/file/dist/src/getopt_long.c N src/external/bsd/file/dist/src/Makefile.in N src/external/bsd/file/dist/src/asprintf.c N src/external/bsd/file/dist/src/apptype.c N src/external/bsd/file/dist/src/strlcat.c N src/external/bsd/file/dist/src/strlcpy.c N src/external/bsd/file/dist/src/vasprintf.c N src/external/bsd/file/dist/src/magic.c N src/external/bsd/file/dist/src/apprentice.c N src/external/bsd/file/dist/src/softmagic.c N src/external/bsd/file/dist/src/ascmagic.c N src/external/bsd/file/dist/src/encoding.c N src/external/bsd/file/dist/src/compress.c N src/external/bsd/file/dist/src/is_tar.c N src/external/bsd/file/dist/src/readelf.c N src/external/bsd/file/dist/src/print.c N src/external/bsd/file/dist/src/fsmagic.c N src/external/bsd/file/dist/src/funcs.c N src/external/bsd/file/dist/src/file.h N src/external/bsd/file/dist/src/names.h N src/external/bsd/file/dist/src/patchlevel.h N src/external/bsd/file/dist/src/readelf.h N src/external/bsd/file/dist/src/tar.h N src/external/bsd/file/dist/src/file_opts.h N src/external/bsd/file/dist/src/elfclass.h N src/external/bsd/file/dist/src/mygetopt.h N src/external/bsd/file/dist/src/cdf.c N src/external/bsd/file/dist/src/cdf_time.c N src/external/bsd/file/dist/src/readcdf.c N src/external/bsd/file/dist/src/cdf.h N src/external/bsd/file/dist/src/file.c N src/external/bsd/file/dist/magic/Makefile.am N src/external/bsd/file/dist/magic/Makefile.in N src/external/bsd/file/dist/magic/Header N src/external/bsd/file/dist/magic/Localstuff N src/external/bsd/file/dist/magic/magdir/adventure N src/external/bsd/file/dist/magic/magdir/acorn N src/external/bsd/file/dist/magic/magdir/adi N src/external/bsd/file/dist/magic/magdir/animation N src/external/bsd/file/dist/magic/magdir/allegro N src/external/bsd/file/dist/magic/magdir/alliant N src/external/bsd/file/dist/magic/magdir/alpha N src/external/bsd/file/dist/magic/magdir/amanda N src/external/bsd/file/dist/magic/magdir/amigaos N src/external/bsd/file/dist/magic/magdir/apple N src/external/bsd/file/dist/magic/magdir/apl N src/external/bsd/file/dist/magic/magdir/communications N src/external/bsd/file/dist/magic/magdir/applix N src/external/bsd/file/dist/magic/magdir/archive N src/external/bsd/file/dist/magic/magdir/asterix N src/external/bsd/file/dist/magic/magdir/att3b N src/external/bsd/file/dist/magic/magdir/audio N src/external/bsd/file/dist/magic/magdir/basis N src/external/bsd/file/dist/magic/magdir/bflt N src/external/bsd/file/dist/magic/magdir/blender N src/external/bsd/file/dist/magic/magdir/blit N src/external/bsd/file/dist/magic/magdir/bout N src/external/bsd/file/dist/magic/magdir/bsdi N src/external/bsd/file/dist/magic/magdir/btsnoop N src/external/bsd/file/dist/magic/magdir/c-lang N src/external/bsd/file/dist/magic/magdir/c64 N src/external/bsd/file/dist/magic/magdir/cad N src/external/bsd/file/dist/magic/magdir/cafebabe N src/external/bsd/file/dist/magic/magdir/cddb N src/external/bsd/file/dist/magic/magdir/chord N src/external/bsd/file/dist/magic/magdir/cisco N src/external/bsd/file/dist/magic/magdir/efi N src/external/bsd/file/dist/magic/magdir/citrus N src/external/bsd/file/dist/magic/magdir/clarion N src/external/bsd/file/dist/magic/magdir/claris N src/external/bsd/file/dist/magic/magdir/clipper N src/external/bsd/file/dist/magic/magdir/commands N src/external/bsd/file/dist/magic/magdir/filesystems N src/external/bsd/file/dist/magic/magdir/compress N src/external/bsd/file/dist/magic/magdir/console N src/external/bsd/file/dist/magic/magdir/convex N src/external/bsd/file/dist/magic/magdir/cracklib N src/external/bsd/file/dist/magic/magdir/ctags N src/external/bsd/file/dist/magic/magdir/dact N src/external/bsd/file/dist/magic/magdir/database N src
CVS commit: src/external/bsd/file/dist
Module Name:src Committed By: christos Date: Fri May 8 16:40:10 UTC 2009 Modified Files: src/external/bsd/file/dist: file2netbsd Log Message: add import script To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/file/dist/file2netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/file2netbsd diff -u src/external/bsd/file/dist/file2netbsd:1.1.1.1 src/external/bsd/file/dist/file2netbsd:1.2 --- src/external/bsd/file/dist/file2netbsd:1.1.1.1 Fri May 8 12:35:04 2009 +++ src/external/bsd/file/dist/file2netbsd Fri May 8 12:40:10 2009 @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: file2netbsd,v 1.1.1.1 2009/05/08 16:35:04 christos Exp $ +# $NetBSD: file2netbsd,v 1.2 2009/05/08 16:40:10 christos Exp $ # # Copyright (c) 2003 The NetBSD Foundation, Inc. # All rights reserved. @@ -33,8 +33,12 @@ # based on texinfo2netbsd # -# edit this -file_vers='4.21' +if [ -z "$1" ] +then + echo "Usage $0: " 1>&2 + exit 1 +fi +file_vers="$1" # # (usually) NO NEED TO EDIT BELOW THIS LINE @@ -105,6 +109,6 @@ echo done echo You can import now. Use the following command: -echo cvs import src/dist/file CHRISTOS FILE${file_vers%.*}_${file_vers#*.} +echo cvs import src/external/bsd/file/dist CHRISTOS FILE${file_vers%.*}_${file_vers#*.} exit 0
CVS commit: src/external/bsd/file/dist
Module Name:src Committed By: christos Date: Fri May 8 17:34:35 UTC 2009 Modified Files: src/external/bsd/file/dist: Makefile.am Makefile.in configure src/external/bsd/file/dist/doc: file.1 src/external/bsd/file/dist/magic: Makefile.am Makefile.in src/external/bsd/file/dist/magic/magdir: archive filesystems Log Message: apply our local patches To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/file/dist/Makefile.am \ src/external/bsd/file/dist/Makefile.in \ src/external/bsd/file/dist/configure cvs rdiff -u -r1.2 -r1.3 src/external/bsd/file/dist/doc/file.1 cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/file/dist/magic/Makefile.am \ src/external/bsd/file/dist/magic/Makefile.in cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/file/dist/magic/magdir/archive \ src/external/bsd/file/dist/magic/magdir/filesystems Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/Makefile.am diff -u src/external/bsd/file/dist/Makefile.am:1.1.1.1 src/external/bsd/file/dist/Makefile.am:1.2 --- src/external/bsd/file/dist/Makefile.am:1.1.1.1 Fri May 8 12:35:01 2009 +++ src/external/bsd/file/dist/Makefile.am Fri May 8 13:34:34 2009 @@ -2,4 +2,4 @@ EXTRA_DIST = MAINT -SUBDIRS = src magic tests doc python +SUBDIRS = src magic doc Index: src/external/bsd/file/dist/Makefile.in diff -u src/external/bsd/file/dist/Makefile.in:1.1.1.1 src/external/bsd/file/dist/Makefile.in:1.2 --- src/external/bsd/file/dist/Makefile.in:1.1.1.1 Fri May 8 12:35:01 2009 +++ src/external/bsd/file/dist/Makefile.in Fri May 8 13:34:34 2009 @@ -185,7 +185,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = MAINT -SUBDIRS = src +SUBDIRS = src magic #SUBDIRS = src magic tests doc python all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -235,6 +235,8 @@ @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h $(srcdir)/config.h.in: $(am__configure_deps) + @echo "NOT REBUILDING $@" +NetBSD_DISABLED_srcdir_config.h.in: cd $(top_srcdir) && $(AUTOHEADER) rm -f stamp-h1 touch $@ Index: src/external/bsd/file/dist/configure diff -u src/external/bsd/file/dist/configure:1.1.1.1 src/external/bsd/file/dist/configure:1.2 --- src/external/bsd/file/dist/configure:1.1.1.1 Fri May 8 12:35:03 2009 +++ src/external/bsd/file/dist/configure Fri May 8 13:34:34 2009 @@ -2163,7 +2163,7 @@ # break other packages using the cache if that directory is # removed, or if the value is a relative name. test -d ./--version && rmdir ./--version -MKDIR_P="$ac_install_sh -d" +MKDIR_P="\$(SHELL) $ac_install_sh -d" fi fi { echo "$as_me:$LINENO: result: $MKDIR_P" >&5 Index: src/external/bsd/file/dist/doc/file.1 diff -u src/external/bsd/file/dist/doc/file.1:1.2 src/external/bsd/file/dist/doc/file.1:1.3 --- src/external/bsd/file/dist/doc/file.1:1.2 Fri May 8 12:39:46 2009 +++ src/external/bsd/file/dist/doc/file.1 Fri May 8 13:34:34 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: file.1,v 1.2 2009/05/08 16:39:46 christos Exp $ +.\" $NetBSD: file.1,v 1.3 2009/05/08 17:34:34 christos Exp $ .\" .\" $File: file.man,v 1.79 2008/11/06 22:49:08 rrt Exp $ .Dd October 9, 2008 @@ -177,7 +177,7 @@ .Ar testname from the list of tests made to determine the file type. Valid test names are: -.Bl -tag -width +.Bl -tag -width compress .It apptype .Dv EMX application type (only on EMX). Index: src/external/bsd/file/dist/magic/Makefile.am diff -u src/external/bsd/file/dist/magic/Makefile.am:1.1.1.1 src/external/bsd/file/dist/magic/Makefile.am:1.2 --- src/external/bsd/file/dist/magic/Makefile.am:1.1.1.1 Fri May 8 12:35:06 2009 +++ src/external/bsd/file/dist/magic/Makefile.am Fri May 8 13:34:35 2009 @@ -1,7 +1,7 @@ # # $File: Makefile.am,v 1.45 2009/03/05 22:40:59 christos Exp $ # -MAGIC_FRAGMENT_BASE = Magdir +MAGIC_FRAGMENT_BASE = magdir MAGIC_FRAGMENT_DIR = $(top_srcdir)/magic/$(MAGIC_FRAGMENT_BASE) pkgdata_DATA = magic.mgc Index: src/external/bsd/file/dist/magic/Makefile.in diff -u src/external/bsd/file/dist/magic/Makefile.in:1.1.1.1 src/external/bsd/file/dist/magic/Makefile.in:1.2 --- src/external/bsd/file/dist/magic/Makefile.in:1.1.1.1 Fri May 8 12:35:07 2009 +++ src/external/bsd/file/dist/magic/Makefile.in Fri May 8 13:34:35 2009 @@ -168,7 +168,7 @@ # # $File: Makefile.am,v 1.45 2009/03/05 22:40:59 christos Exp $ # -MAGIC_FRAGMENT_BASE = Magdir +MAGIC_FRAGMENT_BASE = magdir MAGIC_FRAGMENT_DIR = $(top_srcdir)/magic/$(MAGIC_FRAGMENT_BASE) pkgdata_DATA = magic.mgc EXTRA_DIST = Header Localstuff \ Index: src/external/bsd/file/dist/magic/magdir/archive diff -u src/external/bsd/file/dist/magic/magdir/archive:1.1.1.1 src/external/bsd/file/dist/magic/magdir/archive:1.2 --- src/external/bsd/file/dist/magic/magdir/archive:1.1.1.1 Fri May 8 12:35:07 2009 +++ src/external/bsd/file/dist/magic/magdir/archive Fri May
CVS commit: src/external/bsd/file/dist
Module Name:src Committed By: christos Date: Thu May 12 20:47:16 UTC 2011 Update of /cvsroot/src/external/bsd/file/dist In directory ivanova.netbsd.org:/tmp/cvs-serv6051 Log Message: from ftp.astron.com. - many security related fixes - no MAXPATHLEN limits - fixed missing text specification on ascii magic - new ``pascal'' style string formats - whitespace comparison fix - more magic Status: Vendor Tag: CHRISTOS Release Tags: FILE5_07 U src/external/bsd/file/dist/acinclude.m4 U src/external/bsd/file/dist/README U src/external/bsd/file/dist/configure.ac U src/external/bsd/file/dist/aclocal.m4 C src/external/bsd/file/dist/Makefile.am C src/external/bsd/file/dist/Makefile.in U src/external/bsd/file/dist/config.h.in C src/external/bsd/file/dist/configure U src/external/bsd/file/dist/AUTHORS U src/external/bsd/file/dist/COPYING U src/external/bsd/file/dist/ChangeLog U src/external/bsd/file/dist/INSTALL U src/external/bsd/file/dist/NEWS U src/external/bsd/file/dist/TODO U src/external/bsd/file/dist/compile U src/external/bsd/file/dist/config.guess U src/external/bsd/file/dist/config.sub U src/external/bsd/file/dist/depcomp U src/external/bsd/file/dist/install-sh U src/external/bsd/file/dist/ltmain.sh U src/external/bsd/file/dist/missing U src/external/bsd/file/dist/MAINT N src/external/bsd/file/dist/m4/lt~obsolete.m4 N src/external/bsd/file/dist/m4/libtool.m4 N src/external/bsd/file/dist/m4/ltoptions.m4 N src/external/bsd/file/dist/m4/ltsugar.m4 N src/external/bsd/file/dist/m4/ltversion.m4 U src/external/bsd/file/dist/src/Makefile.am U src/external/bsd/file/dist/src/magic.h U src/external/bsd/file/dist/src/getopt_long.c U src/external/bsd/file/dist/src/Makefile.in U src/external/bsd/file/dist/src/asprintf.c N src/external/bsd/file/dist/src/getline.c U src/external/bsd/file/dist/src/strlcat.c U src/external/bsd/file/dist/src/strlcpy.c U src/external/bsd/file/dist/src/vasprintf.c C src/external/bsd/file/dist/src/magic.c C src/external/bsd/file/dist/src/apprentice.c C src/external/bsd/file/dist/src/softmagic.c U src/external/bsd/file/dist/src/ascmagic.c U src/external/bsd/file/dist/src/encoding.c C src/external/bsd/file/dist/src/compress.c U src/external/bsd/file/dist/src/is_tar.c C src/external/bsd/file/dist/src/readelf.c U src/external/bsd/file/dist/src/print.c C src/external/bsd/file/dist/src/fsmagic.c C src/external/bsd/file/dist/src/funcs.c C src/external/bsd/file/dist/src/file.h U src/external/bsd/file/dist/src/names.h U src/external/bsd/file/dist/src/readelf.h U src/external/bsd/file/dist/src/tar.h C src/external/bsd/file/dist/src/cdf.c U src/external/bsd/file/dist/src/apptype.c U src/external/bsd/file/dist/src/file_opts.h U src/external/bsd/file/dist/src/elfclass.h U src/external/bsd/file/dist/src/mygetopt.h C src/external/bsd/file/dist/src/cdf_time.c C src/external/bsd/file/dist/src/readcdf.c U src/external/bsd/file/dist/src/cdf.h U src/external/bsd/file/dist/src/file.c C src/external/bsd/file/dist/magic/Makefile.am C src/external/bsd/file/dist/magic/Makefile.in U src/external/bsd/file/dist/magic/Header U src/external/bsd/file/dist/magic/Localstuff U src/external/bsd/file/dist/magic/magdir/adventure U src/external/bsd/file/dist/magic/magdir/acorn U src/external/bsd/file/dist/magic/magdir/adi U src/external/bsd/file/dist/magic/magdir/animation U src/external/bsd/file/dist/magic/magdir/allegro U src/external/bsd/file/dist/magic/magdir/alliant U src/external/bsd/file/dist/magic/magdir/amanda U src/external/bsd/file/dist/magic/magdir/amigaos U src/external/bsd/file/dist/magic/magdir/apple U src/external/bsd/file/dist/magic/magdir/apl U src/external/bsd/file/dist/magic/magdir/cddb U src/external/bsd/file/dist/magic/magdir/applix C src/external/bsd/file/dist/magic/magdir/archive U src/external/bsd/file/dist/magic/magdir/asterix U src/external/bsd/file/dist/magic/magdir/att3b U src/external/bsd/file/dist/magic/magdir/audio U src/external/bsd/file/dist/magic/magdir/basis U src/external/bsd/file/dist/magic/magdir/bflt N src/external/bsd/file/dist/magic/magdir/blcr U src/external/bsd/file/dist/magic/magdir/blender U src/external/bsd/file/dist/magic/magdir/blit U src/external/bsd/file/dist/magic/magdir/bout U src/external/bsd/file/dist/magic/magdir/bsdi N src/external/bsd/file/dist/magic/magdir/bsi U src/external/bsd/file/dist/magic/magdir/btsnoop U src/external/bsd/file/dist/magic/magdir/c-lang U src/external/bsd/file/dist/magic/magdir/c64 U src/external/bsd/file/dist/magic/magdir/cad U src/external/bsd/file/dist/magic/magdir/cafebabe U src/external/bsd/file/dist/magic/magdir/encore U src/external/bsd/file/dist/magic/magdir/efi U src/external/bsd/file/dist/magic/magdir/chord U src/external/bsd/file/dist/magic/magdir/cisco U src/external/bsd/file/dist/magic/magdir/citrus U src/external/bsd/file/dist/magic/magdir/clarion U src/external/bsd/file/dist/magic/magdir/claris U src/external/bsd/file/dist/magic/magdir/clipper U src/external/bsd/file/dist/magic/magdir/commands U src/ex
CVS commit: src/external/bsd/file/dist
Module Name:src Committed By: christos Date: Fri Sep 16 20:38:02 UTC 2011 Update of /cvsroot/src/external/bsd/file/dist In directory ivanova.netbsd.org:/tmp/cvs-serv28841 Log Message: from ftp.astron.com: - elf seeking fixes - improvements in cdf parsing - waitpid only for our child - magic fixes and additions Status: Vendor Tag: CHRISTOS Release Tags: FILE5_09 U src/external/bsd/file/dist/acinclude.m4 U src/external/bsd/file/dist/README C src/external/bsd/file/dist/configure.ac C src/external/bsd/file/dist/aclocal.m4 U src/external/bsd/file/dist/Makefile.am C src/external/bsd/file/dist/Makefile.in C src/external/bsd/file/dist/config.h.in C src/external/bsd/file/dist/configure U src/external/bsd/file/dist/AUTHORS U src/external/bsd/file/dist/COPYING U src/external/bsd/file/dist/ChangeLog C src/external/bsd/file/dist/INSTALL U src/external/bsd/file/dist/NEWS U src/external/bsd/file/dist/TODO C src/external/bsd/file/dist/compile C src/external/bsd/file/dist/config.guess C src/external/bsd/file/dist/config.sub C src/external/bsd/file/dist/depcomp C src/external/bsd/file/dist/install-sh U src/external/bsd/file/dist/ltmain.sh C src/external/bsd/file/dist/missing U src/external/bsd/file/dist/MAINT U src/external/bsd/file/dist/m4/lt~obsolete.m4 U src/external/bsd/file/dist/m4/libtool.m4 U src/external/bsd/file/dist/m4/ltoptions.m4 U src/external/bsd/file/dist/m4/ltsugar.m4 U src/external/bsd/file/dist/m4/ltversion.m4 U src/external/bsd/file/dist/src/Makefile.am U src/external/bsd/file/dist/src/magic.h U src/external/bsd/file/dist/src/getopt_long.c C src/external/bsd/file/dist/src/Makefile.in U src/external/bsd/file/dist/src/asprintf.c U src/external/bsd/file/dist/src/getline.c U src/external/bsd/file/dist/src/strlcat.c U src/external/bsd/file/dist/src/strlcpy.c U src/external/bsd/file/dist/src/vasprintf.c C src/external/bsd/file/dist/src/magic.c C src/external/bsd/file/dist/src/apprentice.c C src/external/bsd/file/dist/src/softmagic.c U src/external/bsd/file/dist/src/ascmagic.c U src/external/bsd/file/dist/src/encoding.c C src/external/bsd/file/dist/src/compress.c U src/external/bsd/file/dist/src/is_tar.c C src/external/bsd/file/dist/src/readelf.c C src/external/bsd/file/dist/src/print.c C src/external/bsd/file/dist/src/fsmagic.c U src/external/bsd/file/dist/src/funcs.c C src/external/bsd/file/dist/src/file.h U src/external/bsd/file/dist/src/names.h U src/external/bsd/file/dist/src/readelf.h U src/external/bsd/file/dist/src/tar.h C src/external/bsd/file/dist/src/cdf.c U src/external/bsd/file/dist/src/apptype.c U src/external/bsd/file/dist/src/file_opts.h U src/external/bsd/file/dist/src/elfclass.h U src/external/bsd/file/dist/src/mygetopt.h U src/external/bsd/file/dist/src/cdf_time.c C src/external/bsd/file/dist/src/readcdf.c U src/external/bsd/file/dist/src/cdf.h U src/external/bsd/file/dist/src/file.c C src/external/bsd/file/dist/magic/Makefile.am C src/external/bsd/file/dist/magic/Makefile.in U src/external/bsd/file/dist/magic/Header U src/external/bsd/file/dist/magic/Localstuff U src/external/bsd/file/dist/magic/magdir/adventure U src/external/bsd/file/dist/magic/magdir/acorn U src/external/bsd/file/dist/magic/magdir/adi U src/external/bsd/file/dist/magic/magdir/animation U src/external/bsd/file/dist/magic/magdir/allegro U src/external/bsd/file/dist/magic/magdir/alliant U src/external/bsd/file/dist/magic/magdir/amanda U src/external/bsd/file/dist/magic/magdir/amigaos U src/external/bsd/file/dist/magic/magdir/apple U src/external/bsd/file/dist/magic/magdir/apl U src/external/bsd/file/dist/magic/magdir/cddb U src/external/bsd/file/dist/magic/magdir/applix C src/external/bsd/file/dist/magic/magdir/archive U src/external/bsd/file/dist/magic/magdir/asterix U src/external/bsd/file/dist/magic/magdir/att3b U src/external/bsd/file/dist/magic/magdir/audio U src/external/bsd/file/dist/magic/magdir/basis U src/external/bsd/file/dist/magic/magdir/bflt U src/external/bsd/file/dist/magic/magdir/blcr U src/external/bsd/file/dist/magic/magdir/blender U src/external/bsd/file/dist/magic/magdir/blit U src/external/bsd/file/dist/magic/magdir/bout U src/external/bsd/file/dist/magic/magdir/bsdi U src/external/bsd/file/dist/magic/magdir/bsi U src/external/bsd/file/dist/magic/magdir/btsnoop U src/external/bsd/file/dist/magic/magdir/c-lang U src/external/bsd/file/dist/magic/magdir/c64 U src/external/bsd/file/dist/magic/magdir/cad U src/external/bsd/file/dist/magic/magdir/cafebabe U src/external/bsd/file/dist/magic/magdir/encore U src/external/bsd/file/dist/magic/magdir/efi U src/external/bsd/file/dist/magic/magdir/chord U src/external/bsd/file/dist/magic/magdir/cisco U src/external/bsd/file/dist/magic/magdir/citrus U src/external/bsd/file/dist/magic/magdir/clarion U src/external/bsd/file/dist/magic/magdir/claris U src/external/bsd/file/dist/magic/magdir/clipper U src/external/bsd/file/dist/magic/magdir/commands U src/external/bsd/file/dist/magic/magdir/communications U src/external/bsd/file/d
CVS commit: src/external/bsd/file/dist
Module Name:src Committed By: christos Date: Fri Oct 10 20:15:02 UTC 2014 Modified Files: src/external/bsd/file/dist: config.h.in configure configure.ac src/external/bsd/file/dist/doc: file.1 libmagic.3 magic.5 src/external/bsd/file/dist/magic: Makefile.am Makefile.in src/external/bsd/file/dist/magic/magdir: archive elf filesystems src/external/bsd/file/dist/src: Makefile.in apprentice.c cdf.c encoding.c file.c file.h funcs.c magic.c readcdf.c softmagic.c Removed Files: src/external/bsd/file/dist/magic/magdir: rinex Log Message: welcome to file-5.20 To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/config.h.in \ src/external/bsd/file/dist/configure.ac cvs rdiff -u -r1.11 -r1.12 src/external/bsd/file/dist/configure cvs rdiff -u -r1.14 -r1.15 src/external/bsd/file/dist/doc/file.1 cvs rdiff -u -r1.12 -r1.13 src/external/bsd/file/dist/doc/libmagic.3 \ src/external/bsd/file/dist/doc/magic.5 cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/magic/Makefile.am cvs rdiff -u -r1.11 -r1.12 src/external/bsd/file/dist/magic/Makefile.in cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/magic/magdir/archive cvs rdiff -u -r1.10 -r1.11 src/external/bsd/file/dist/magic/magdir/elf cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/magic/magdir/filesystems cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/file/dist/magic/magdir/rinex cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/src/Makefile.in \ src/external/bsd/file/dist/src/cdf.c cvs rdiff -u -r1.11 -r1.12 src/external/bsd/file/dist/src/apprentice.c \ src/external/bsd/file/dist/src/file.h \ src/external/bsd/file/dist/src/softmagic.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/file/dist/src/encoding.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/dist/src/file.c cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/src/funcs.c \ src/external/bsd/file/dist/src/magic.c cvs rdiff -u -r1.10 -r1.11 src/external/bsd/file/dist/src/readcdf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/config.h.in diff -u src/external/bsd/file/dist/config.h.in:1.8 src/external/bsd/file/dist/config.h.in:1.9 --- src/external/bsd/file/dist/config.h.in:1.8 Thu Jun 12 22:08:06 2014 +++ src/external/bsd/file/dist/config.h.in Fri Oct 10 16:15:01 2014 @@ -44,6 +44,9 @@ /* Define to 1 if you have the `fork' function. */ #undef HAVE_FORK +/* Define to 1 if you have the `freelocale' function. */ +#undef HAVE_FREELOCALE + /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ #undef HAVE_FSEEKO @@ -95,6 +98,9 @@ /* Define to 1 if you have a working `mmap' system call. */ #undef HAVE_MMAP +/* Define to 1 if you have the `newlocale' function. */ +#undef HAVE_NEWLOCALE + /* Define to 1 if you have the `pread' function. */ #undef HAVE_PREAD @@ -182,6 +188,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the `uselocale' function. */ +#undef HAVE_USELOCALE + /* Define to 1 if you have the `utime' function. */ #undef HAVE_UTIME Index: src/external/bsd/file/dist/configure.ac diff -u src/external/bsd/file/dist/configure.ac:1.8 src/external/bsd/file/dist/configure.ac:1.9 --- src/external/bsd/file/dist/configure.ac:1.8 Thu Jun 12 22:08:06 2014 +++ src/external/bsd/file/dist/configure.ac Fri Oct 10 16:15:01 2014 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([file],[5.19],[chris...@astron.com]) +AC_INIT([file],[5.20],[chris...@astron.com]) AM_INIT_AUTOMAKE([subdir-objects foreign]) AM_MAINTAINER_MODE(disable) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -139,7 +139,7 @@ else fi]) dnl Checks for functions -AC_CHECK_FUNCS(strerror strndup strtoul mkstemp mkostemp utimes utime wcwidth strtof) +AC_CHECK_FUNCS(strerror strndup strtoul mkstemp mkostemp utimes utime wcwidth strtof newlocale uselocale freelocale) dnl Provide implementation of some required functions if necessary AC_REPLACE_FUNCS(getopt_long asprintf vasprintf strlcpy strlcat getline ctime_r asctime_r pread strcasestr fmtcheck) Index: src/external/bsd/file/dist/configure diff -u src/external/bsd/file/dist/configure:1.11 src/external/bsd/file/dist/configure:1.12 --- src/external/bsd/file/dist/configure:1.11 Thu Jun 12 22:08:06 2014 +++ src/external/bsd/file/dist/configure Fri Oct 10 16:15:01 2014 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for file 5.19. +# Generated by GNU Autoconf 2.69 for file 5.20. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='file' PACKAGE_TARNAME='file' -PACKAGE_VERSION='5.19' -PACKAGE_STRING='file 5.19' +PACKAGE_VERSION='5.20' +PACKAGE_STRING='file 5.20' PACKAGE_BUGREPORT='ch
CVS commit: src/external/bsd/file/dist
Module Name:src Committed By: christos Date: Mon Oct 20 21:48:57 UTC 2014 Modified Files: src/external/bsd/file/dist: ChangeLog configure.ac src/external/bsd/file/dist/magic/magdir: elf pgp src/external/bsd/file/dist/src: apprentice.c file.c file.h fsmagic.c readelf.c Log Message: sync with head of upstream to fix MacOS/X compilation and more. To generate a diff of this commit: cvs rdiff -u -r1.1.1.9 -r1.2 src/external/bsd/file/dist/ChangeLog cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/configure.ac cvs rdiff -u -r1.11 -r1.12 src/external/bsd/file/dist/magic/magdir/elf cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/file/dist/magic/magdir/pgp cvs rdiff -u -r1.12 -r1.13 src/external/bsd/file/dist/src/apprentice.c \ src/external/bsd/file/dist/src/file.h cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/dist/src/file.c cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/src/fsmagic.c \ src/external/bsd/file/dist/src/readelf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/ChangeLog diff -u src/external/bsd/file/dist/ChangeLog:1.1.1.9 src/external/bsd/file/dist/ChangeLog:1.2 --- src/external/bsd/file/dist/ChangeLog:1.1.1.9 Fri Oct 10 16:08:15 2014 +++ src/external/bsd/file/dist/ChangeLog Mon Oct 20 17:48:57 2014 @@ -1,3 +1,12 @@ +2014-10-17 11:48 Christos Zoulas + + * fix bounds in note reading (Francisco Alonso / Red Hat) + +2014-10-11 15:02 Christos Zoulas + + * fix autoconf glue for setlocale and locale_t; some OS's + have locale_t in xlocale.h + 2014-10-10 15:01 Christos Zoulas * release 5.20 Index: src/external/bsd/file/dist/configure.ac diff -u src/external/bsd/file/dist/configure.ac:1.9 src/external/bsd/file/dist/configure.ac:1.10 --- src/external/bsd/file/dist/configure.ac:1.9 Fri Oct 10 16:15:01 2014 +++ src/external/bsd/file/dist/configure.ac Mon Oct 20 17:48:57 2014 @@ -83,7 +83,7 @@ AC_HEADER_MAJOR AC_HEADER_SYS_WAIT AC_CHECK_HEADERS(stdint.h fcntl.h locale.h stdint.h inttypes.h unistd.h) AC_CHECK_HEADERS(stddef.h utime.h wchar.h wctype.h limits.h) -AC_CHECK_HEADERS(getopt.h err.h) +AC_CHECK_HEADERS(getopt.h err.h xlocale.h) AC_CHECK_HEADERS(sys/mman.h sys/stat.h sys/types.h sys/utime.h sys/time.h) AC_CHECK_HEADERS(zlib.h) @@ -139,7 +139,7 @@ else fi]) dnl Checks for functions -AC_CHECK_FUNCS(strerror strndup strtoul mkstemp mkostemp utimes utime wcwidth strtof newlocale uselocale freelocale) +AC_CHECK_FUNCS(strerror strndup strtoul mkstemp mkostemp utimes utime wcwidth strtof newlocale uselocale freelocale setlocale) dnl Provide implementation of some required functions if necessary AC_REPLACE_FUNCS(getopt_long asprintf vasprintf strlcpy strlcat getline ctime_r asctime_r pread strcasestr fmtcheck) Index: src/external/bsd/file/dist/magic/magdir/elf diff -u src/external/bsd/file/dist/magic/magdir/elf:1.11 src/external/bsd/file/dist/magic/magdir/elf:1.12 --- src/external/bsd/file/dist/magic/magdir/elf:1.11 Fri Oct 10 16:15:01 2014 +++ src/external/bsd/file/dist/magic/magdir/elf Mon Oct 20 17:48:57 2014 @@ -30,7 +30,6 @@ #>>>(0x38+0xcc) string >\0 of '%s' #>>>(0x38+0x10) lelong >0 (signal %d), >16 leshort &0xff00 processor-specific, ->18 clear x >18 leshort 0 no machine, >18 leshort 1 AT&T WE32100, >18 leshort 2 SPARC, Index: src/external/bsd/file/dist/magic/magdir/pgp diff -u src/external/bsd/file/dist/magic/magdir/pgp:1.1.1.2 src/external/bsd/file/dist/magic/magdir/pgp:1.2 --- src/external/bsd/file/dist/magic/magdir/pgp:1.1.1.2 Thu May 12 16:47:04 2011 +++ src/external/bsd/file/dist/magic/magdir/pgp Mon Oct 20 17:48:57 2014 @@ -1,6 +1,6 @@ #-- -# $File: pgp,v 1.9 2009/09/19 16:28:11 christos Exp $ +# $File: pgp,v 1.10 2014/10/14 16:50:37 christos Exp $ # pgp: file(1) magic for Pretty Good Privacy # see http://lists.gnupg.org/pipermail/gnupg-devel/1999-September/016052.html # @@ -25,3 +25,391 @@ !:mime application/pgp 0 string -BEGIN\040PGP\40SIGNATURE- PGP signature !:mime application/pgp-signature + +# magic signatures to detect PGP crypto material (from stef) +# detects and extracts metadata from: +# - symmetric encrypted packet header +# - RSA (e=65537) secret (sub-)keys + +# 1024b RSA encrypted data + +0 string \x84\x8c\x03 PGP RSA encrypted session key - +>3 lelong x keyid: %X +>7 lelong x %X +>11 byte 0x01 RSA (Encrypt or Sign) 1024b +>11 byte 0x02 RSA Encrypt-Only 1024b +>12 string \x04\x00 +>12 string \x03\xff +>12 string \x03\xfe +>12 string \x03\xfd +>12 string \x03\xfc +>12 string \x03\xfb +>12 string \x03\xfa +>12 string \x03\xf9 +>142 byte 0xd2 . + +# 2048b RSA encrypted data + +0 string \x85\x01\x0c\x03 PGP RSA encrypted session key - +>4 lelong x keyid: %X +>8 lelong x %X +>12 byte 0x01 RSA (Encrypt or Sign) 2048b +>12 byte 0x02 RSA Encrypt-On
CVS commit: src/external/bsd/file/dist
Module Name:src Committed By: christos Date: Mon Oct 20 22:04:31 UTC 2014 Modified Files: src/external/bsd/file/dist: Makefile.in aclocal.m4 config.h.in configure install-sh missing src/external/bsd/file/dist/doc: Makefile.in src/external/bsd/file/dist/magic: Makefile.in src/external/bsd/file/dist/python: Makefile.in src/external/bsd/file/dist/src: Makefile.in src/external/bsd/file/dist/tests: Makefile.in Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/bsd/file/dist/Makefile.in cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/aclocal.m4 cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/config.h.in \ src/external/bsd/file/dist/install-sh cvs rdiff -u -r1.12 -r1.13 src/external/bsd/file/dist/configure cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/dist/missing cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/doc/Makefile.in cvs rdiff -u -r1.12 -r1.13 src/external/bsd/file/dist/magic/Makefile.in cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/python/Makefile.in cvs rdiff -u -r1.10 -r1.11 src/external/bsd/file/dist/src/Makefile.in cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/tests/Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/Makefile.in diff -u src/external/bsd/file/dist/Makefile.in:1.10 src/external/bsd/file/dist/Makefile.in:1.11 --- src/external/bsd/file/dist/Makefile.in:1.10 Thu Jun 12 22:08:06 2014 +++ src/external/bsd/file/dist/Makefile.in Mon Oct 20 18:04:30 2014 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -619,10 +619,9 @@ distcheck: dist && dc_destdir="$${TMPDIR-/tmp}/am-dc-/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ Index: src/external/bsd/file/dist/aclocal.m4 diff -u src/external/bsd/file/dist/aclocal.m4:1.8 src/external/bsd/file/dist/aclocal.m4:1.9 --- src/external/bsd/file/dist/aclocal.m4:1.8 Thu Jun 12 22:08:06 2014 +++ src/external/bsd/file/dist/aclocal.m4 Mon Oct 20 18:04:30 2014 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.14 -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -113,7 +113,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.14.1], [], +m4_if([$1], [1.14], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -129,7 +129,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.14.1])dnl +[AM_AUTOMAKE_VERSION([1.14])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) Index: src/external/bsd/file/dist/config.h.in diff -u src/external/bsd/file/dist/config.h.in:1.9 src/external/bsd/file/dist/config.h.in:1.10 --- src/external/bsd/file/dist/config.h.in:1.9 Fri Oct 10 16:15:01 2014 +++ src/external/bsd/file/dist/config.h.in Mon Oct 20 18:04:30 2014 @@ -104,6 +104,9 @@ /* Define to 1 if you have the `pread' function. */ #undef HAVE_PREAD +/* Define to 1 if you have the `setlocale' function. */ +#undef HAVE_SETLOCALE + /* Define to 1 if you have the header file. */ #undef HAVE_STDDEF_H @@ -228,6 +231,9 @@ /* Define to 1 if `vfork' works. */ #undef HAVE_WORKING_VFORK +/* Define to 1 if you have the header file. */ +#undef HAVE_XLOCALE_H + /* Define to 1 if you have the header file. */ #undef HAVE_ZLIB_H Index: src/external/bsd/file/dist/install-sh diff -u src/external/bsd/file/dist/install-sh:1.9 src/external/bsd/file/dist/install-sh:1.10 --- src/external/bsd/file/dist/install-sh:1.9 Thu Jun 12 22:08:06 2014 +++ src/external/bsd/file/dist/install-sh Mon Oct 20 18:04:31 2014 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: install-sh,v 1.9 2014/06/13 02:08:06 christos Exp $ +# $NetBSD: install-sh,v 1.10 2014/10/20 22:04:31 christos Exp $ # This script now also installs multiple files, but might choke on installing # multiple files with spaces in the file names. # Index: src/external/bsd/file/dist/configure diff
CVS commit: src/external/bsd/file/dist
Module Name:src Committed By: christos Date: Sat Mar 23 15:50:26 UTC 2013 Update of /cvsroot/src/external/bsd/file/dist In directory ivanova.netbsd.org:/tmp/cvs-serv22550 Log Message: import file-5.14 changes are "name" + "use" keyword features, bug fixes Status: Vendor Tag: CHRISTOS Release Tags: FILE5_14 U src/external/bsd/file/dist/acinclude.m4 U src/external/bsd/file/dist/README C src/external/bsd/file/dist/configure.ac C src/external/bsd/file/dist/aclocal.m4 U src/external/bsd/file/dist/Makefile.am C src/external/bsd/file/dist/Makefile.in C src/external/bsd/file/dist/config.h.in C src/external/bsd/file/dist/configure U src/external/bsd/file/dist/AUTHORS U src/external/bsd/file/dist/COPYING U src/external/bsd/file/dist/ChangeLog U src/external/bsd/file/dist/INSTALL U src/external/bsd/file/dist/NEWS U src/external/bsd/file/dist/TODO C src/external/bsd/file/dist/compile U src/external/bsd/file/dist/config.guess U src/external/bsd/file/dist/config.sub C src/external/bsd/file/dist/depcomp C src/external/bsd/file/dist/install-sh U src/external/bsd/file/dist/ltmain.sh C src/external/bsd/file/dist/missing U src/external/bsd/file/dist/MAINT U src/external/bsd/file/dist/m4/lt~obsolete.m4 U src/external/bsd/file/dist/m4/libtool.m4 U src/external/bsd/file/dist/m4/ltoptions.m4 U src/external/bsd/file/dist/m4/ltsugar.m4 U src/external/bsd/file/dist/m4/ltversion.m4 U src/external/bsd/file/dist/src/Makefile.am U src/external/bsd/file/dist/src/magic.h U src/external/bsd/file/dist/src/getopt_long.c C src/external/bsd/file/dist/src/Makefile.in U src/external/bsd/file/dist/src/asctime_r.c U src/external/bsd/file/dist/src/asprintf.c U src/external/bsd/file/dist/src/ctime_r.c U src/external/bsd/file/dist/src/getline.c U src/external/bsd/file/dist/src/strlcat.c N src/external/bsd/file/dist/src/pread.c U src/external/bsd/file/dist/src/readelf.h C src/external/bsd/file/dist/src/file.h U src/external/bsd/file/dist/src/strlcpy.c U src/external/bsd/file/dist/src/vasprintf.c C src/external/bsd/file/dist/src/magic.c C src/external/bsd/file/dist/src/apprentice.c C src/external/bsd/file/dist/src/softmagic.c U src/external/bsd/file/dist/src/ascmagic.c U src/external/bsd/file/dist/src/encoding.c U src/external/bsd/file/dist/src/compress.c U src/external/bsd/file/dist/src/is_tar.c C src/external/bsd/file/dist/src/readelf.c C src/external/bsd/file/dist/src/print.c C src/external/bsd/file/dist/src/fsmagic.c U src/external/bsd/file/dist/src/funcs.c U src/external/bsd/file/dist/src/apptype.c U src/external/bsd/file/dist/src/tar.h U src/external/bsd/file/dist/src/mygetopt.h U src/external/bsd/file/dist/src/file_opts.h U src/external/bsd/file/dist/src/elfclass.h C src/external/bsd/file/dist/src/cdf.c U src/external/bsd/file/dist/src/cdf_time.c U src/external/bsd/file/dist/src/readcdf.c U src/external/bsd/file/dist/src/cdf.h U src/external/bsd/file/dist/src/file.c N src/external/bsd/file/dist/src/magic.h.in C src/external/bsd/file/dist/magic/Makefile.am C src/external/bsd/file/dist/magic/Makefile.in U src/external/bsd/file/dist/magic/Header U src/external/bsd/file/dist/magic/Localstuff U src/external/bsd/file/dist/magic/magdir/adventure U src/external/bsd/file/dist/magic/magdir/acorn U src/external/bsd/file/dist/magic/magdir/adi U src/external/bsd/file/dist/magic/magdir/animation U src/external/bsd/file/dist/magic/magdir/allegro U src/external/bsd/file/dist/magic/magdir/alliant U src/external/bsd/file/dist/magic/magdir/amanda U src/external/bsd/file/dist/magic/magdir/amigaos C src/external/bsd/file/dist/magic/magdir/apple U src/external/bsd/file/dist/magic/magdir/cad N src/external/bsd/file/dist/magic/magdir/aout U src/external/bsd/file/dist/magic/magdir/apl C src/external/bsd/file/dist/magic/magdir/assembler U src/external/bsd/file/dist/magic/magdir/applix C src/external/bsd/file/dist/magic/magdir/archive U src/external/bsd/file/dist/magic/magdir/communications U src/external/bsd/file/dist/magic/magdir/asterix U src/external/bsd/file/dist/magic/magdir/att3b U src/external/bsd/file/dist/magic/magdir/audio U src/external/bsd/file/dist/magic/magdir/basis U src/external/bsd/file/dist/magic/magdir/bflt U src/external/bsd/file/dist/magic/magdir/blcr U src/external/bsd/file/dist/magic/magdir/blender U src/external/bsd/file/dist/magic/magdir/blit U src/external/bsd/file/dist/magic/magdir/bout U src/external/bsd/file/dist/magic/magdir/bsdi U src/external/bsd/file/dist/magic/magdir/bsi U src/external/bsd/file/dist/magic/magdir/btsnoop U src/external/bsd/file/dist/magic/magdir/c-lang U src/external/bsd/file/dist/magic/magdir/c64 U src/external/bsd/file/dist/magic/magdir/cafebabe U src/external/bsd/file/dist/magic/magdir/efi U src/external/bsd/file/dist/magic/magdir/cddb U src/external/bsd/file/dist/magic/magdir/chord U src/external/bsd/file/dist/magic/magdir/cisco U src/external/bsd/file/dist/magic/magdir/citrus U src/external/bsd/file/dist/magic/magdir/clarion U src/external/bsd/file/dist/magic/magdir/claris
CVS commit: src/external/bsd/file/dist/doc
Module Name:src Committed By: abhinav Date: Sun Oct 22 11:17:39 UTC 2017 Modified Files: src/external/bsd/file/dist/doc: libmagic.3 Log Message: Add magic_open to the NAME section To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/external/bsd/file/dist/doc/libmagic.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/doc/libmagic.3 diff -u src/external/bsd/file/dist/doc/libmagic.3:1.16 src/external/bsd/file/dist/doc/libmagic.3:1.17 --- src/external/bsd/file/dist/doc/libmagic.3:1.16 Fri Sep 8 13:40:25 2017 +++ src/external/bsd/file/dist/doc/libmagic.3 Sun Oct 22 11:17:39 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: libmagic.3,v 1.16 2017/09/08 13:40:25 christos Exp $ +.\" $NetBSD: libmagic.3,v 1.17 2017/10/22 11:17:39 abhinav Exp $ .\" .\" $File: libmagic.man,v 1.41 2017/05/23 21:54:07 christos Exp $ .\" @@ -36,6 +36,7 @@ .Nm magic_error , .Nm magic_errno , .Nm magic_descriptor , +.Nm magic_file , .Nm magic_buffer , .Nm magic_getflags , .Nm magic_setflags ,
CVS commit: src/external/bsd/file/dist/src
Module Name:src Committed By: christos Date: Mon Dec 11 23:19:38 UTC 2017 Modified Files: src/external/bsd/file/dist/src: softmagic.c Log Message: If we don't have any formatting characters, we are always ok. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/external/bsd/file/dist/src/softmagic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/src/softmagic.c diff -u src/external/bsd/file/dist/src/softmagic.c:1.17 src/external/bsd/file/dist/src/softmagic.c:1.18 --- src/external/bsd/file/dist/src/softmagic.c:1.17 Fri Sep 8 09:40:25 2017 +++ src/external/bsd/file/dist/src/softmagic.c Mon Dec 11 18:19:38 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: softmagic.c,v 1.17 2017/09/08 13:40:25 christos Exp $ */ +/* $NetBSD: softmagic.c,v 1.18 2017/12/11 23:19:38 christos Exp $ */ /* * Copyright (c) Ian F. Darwin 1986-1995. @@ -37,7 +37,7 @@ #if 0 FILE_RCSID("@(#)$File: softmagic.c,v 1.249 2017/06/19 18:30:25 christos Exp $") #else -__RCSID("$NetBSD: softmagic.c,v 1.17 2017/09/08 13:40:25 christos Exp $"); +__RCSID("$NetBSD: softmagic.c,v 1.18 2017/12/11 23:19:38 christos Exp $"); #endif #endif /* lint */ @@ -127,6 +127,8 @@ private const char * __attribute__((__fo file_fmtcheck(struct magic_set *ms, const struct magic *m, const char *def, const char *file, size_t line) { + if (strchr(m->desc, '%') == NULL) + return m->desc; const char *ptr = fmtcheck(m->desc, def); if (ptr == def) file_magerror(ms,
CVS commit: src/external/bsd/file/dist/src
Module Name:src Committed By: martin Date: Tue Dec 17 08:02:00 UTC 2019 Modified Files: src/external/bsd/file/dist/src: readelf.c Log Message: Cast an off_t to intmax_t and use %jd to printf it. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/external/bsd/file/dist/src/readelf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/src/readelf.c diff -u src/external/bsd/file/dist/src/readelf.c:1.22 src/external/bsd/file/dist/src/readelf.c:1.23 --- src/external/bsd/file/dist/src/readelf.c:1.22 Tue Dec 17 02:31:05 2019 +++ src/external/bsd/file/dist/src/readelf.c Tue Dec 17 08:02:00 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: readelf.c,v 1.22 2019/12/17 02:31:05 christos Exp $ */ +/* $NetBSD: readelf.c,v 1.23 2019/12/17 08:02:00 martin Exp $ */ /* * Copyright (c) Christos Zoulas 2003. @@ -32,7 +32,7 @@ #if 0 FILE_RCSID("@(#)$File: readelf.c,v 1.168 2019/12/16 03:49:19 christos Exp $") #else -__RCSID("$NetBSD: readelf.c,v 1.22 2019/12/17 02:31:05 christos Exp $"); +__RCSID("$NetBSD: readelf.c,v 1.23 2019/12/17 08:02:00 martin Exp $"); #endif #endif @@ -1355,8 +1355,8 @@ doshn(struct magic_set *ms, int clazz, i name_off = xsh_offset; if (fsize != SIZE_UNKNOWN && fsize < name_off) { - if (file_printf(ms, ", too large section header offset %td", - name_off) == -1) + if (file_printf(ms, ", too large section header offset %jd", + (intmax_t)name_off) == -1) return -1; return 0; }
CVS commit: src/external/bsd/file/dist/src
Module Name:src Committed By: jakllsch Date: Tue Apr 17 12:34:04 UTC 2018 Modified Files: src/external/bsd/file/dist/src: file.c Log Message: sprinkle #ifdef __dead \n __dead \n #endif for clang To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/src/file.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/src/file.c diff -u src/external/bsd/file/dist/src/file.c:1.9 src/external/bsd/file/dist/src/file.c:1.10 --- src/external/bsd/file/dist/src/file.c:1.9 Sun Apr 15 19:45:32 2018 +++ src/external/bsd/file/dist/src/file.c Tue Apr 17 12:34:04 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: file.c,v 1.9 2018/04/15 19:45:32 christos Exp $ */ +/* $NetBSD: file.c,v 1.10 2018/04/17 12:34:04 jakllsch Exp $ */ /* * Copyright (c) Ian F. Darwin 1986-1995. @@ -37,7 +37,7 @@ #if 0 FILE_RCSID("@(#)$File: file.c,v 1.175 2018/03/02 16:11:37 christos Exp $") #else -__RCSID("$NetBSD: file.c,v 1.9 2018/04/15 19:45:32 christos Exp $"); +__RCSID("$NetBSD: file.c,v 1.10 2018/04/17 12:34:04 jakllsch Exp $"); #endif #endif /* lint */ @@ -677,6 +677,9 @@ file_getprogname(void) return file_progname; } +#ifdef __dead +__dead +#endif protected void file_err(int e, const char *fmt, ...) { @@ -691,6 +694,9 @@ file_err(int e, const char *fmt, ...) exit(e); } +#ifdef __dead +__dead +#endif protected void file_errx(int e, const char *fmt, ...) {
CVS commit: src/external/bsd/file/dist/src
Module Name:src Committed By: christos Date: Wed Apr 18 01:17:42 UTC 2018 Modified Files: src/external/bsd/file/dist/src: file.h Log Message: add __noreturn__ attribute to file_err{,x} To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/external/bsd/file/dist/src/file.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/src/file.h diff -u src/external/bsd/file/dist/src/file.h:1.18 src/external/bsd/file/dist/src/file.h:1.19 --- src/external/bsd/file/dist/src/file.h:1.18 Sun Apr 15 15:45:32 2018 +++ src/external/bsd/file/dist/src/file.h Tue Apr 17 21:17:42 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: file.h,v 1.18 2018/04/15 19:45:32 christos Exp $ */ +/* $NetBSD: file.h,v 1.19 2018/04/18 01:17:42 christos Exp $ */ /* * Copyright (c) Ian F. Darwin 1986-1995. @@ -620,9 +620,9 @@ int enable_sandbox_full(void); protected const char *file_getprogname(void); protected void file_setprogname(const char *); protected void file_err(int, const char *, ...) -__attribute__((__format__(__printf__, 2, 3))); +__attribute__((__format__(__printf__, 2, 3), __noreturn__)); protected void file_errx(int, const char *, ...) -__attribute__((__format__(__printf__, 2, 3))); +__attribute__((__format__(__printf__, 2, 3), __noreturn__)); protected void file_warn(const char *, ...) __attribute__((__format__(__printf__, 1, 2))); protected void file_warnx(const char *, ...)
CVS commit: src/external/bsd/file/dist/src
Module Name:src Committed By: christos Date: Wed Apr 18 01:18:16 UTC 2018 Modified Files: src/external/bsd/file/dist/src: file.c Log Message: __noreturn__ does in the header. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/bsd/file/dist/src/file.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/src/file.c diff -u src/external/bsd/file/dist/src/file.c:1.10 src/external/bsd/file/dist/src/file.c:1.11 --- src/external/bsd/file/dist/src/file.c:1.10 Tue Apr 17 08:34:04 2018 +++ src/external/bsd/file/dist/src/file.c Tue Apr 17 21:18:16 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: file.c,v 1.10 2018/04/17 12:34:04 jakllsch Exp $ */ +/* $NetBSD: file.c,v 1.11 2018/04/18 01:18:16 christos Exp $ */ /* * Copyright (c) Ian F. Darwin 1986-1995. @@ -37,7 +37,7 @@ #if 0 FILE_RCSID("@(#)$File: file.c,v 1.175 2018/03/02 16:11:37 christos Exp $") #else -__RCSID("$NetBSD: file.c,v 1.10 2018/04/17 12:34:04 jakllsch Exp $"); +__RCSID("$NetBSD: file.c,v 1.11 2018/04/18 01:18:16 christos Exp $"); #endif #endif /* lint */ @@ -677,9 +677,6 @@ file_getprogname(void) return file_progname; } -#ifdef __dead -__dead -#endif protected void file_err(int e, const char *fmt, ...) { @@ -694,9 +691,6 @@ file_err(int e, const char *fmt, ...) exit(e); } -#ifdef __dead -__dead -#endif protected void file_errx(int e, const char *fmt, ...) {
CVS commit: src/external/bsd/file/dist/src
Module Name:src Committed By: christos Date: Fri Oct 19 00:24:57 UTC 2018 Modified Files: src/external/bsd/file/dist/src: apprentice.c compress.c file.h is_json.c readelf.c Log Message: lint fixes To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/external/bsd/file/dist/src/apprentice.c cvs rdiff -u -r1.16 -r1.17 src/external/bsd/file/dist/src/compress.c cvs rdiff -u -r1.20 -r1.21 src/external/bsd/file/dist/src/file.h cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/file/dist/src/is_json.c cvs rdiff -u -r1.18 -r1.19 src/external/bsd/file/dist/src/readelf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/src/apprentice.c diff -u src/external/bsd/file/dist/src/apprentice.c:1.21 src/external/bsd/file/dist/src/apprentice.c:1.22 --- src/external/bsd/file/dist/src/apprentice.c:1.21 Thu Oct 18 20:11:48 2018 +++ src/external/bsd/file/dist/src/apprentice.c Thu Oct 18 20:24:57 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: apprentice.c,v 1.21 2018/10/19 00:11:48 christos Exp $ */ +/* $NetBSD: apprentice.c,v 1.22 2018/10/19 00:24:57 christos Exp $ */ /* * Copyright (c) Ian F. Darwin 1986-1995. @@ -37,7 +37,7 @@ #if 0 FILE_RCSID("@(#)$File: apprentice.c,v 1.281 2018/10/10 17:41:10 christos Exp $") #else -__RCSID("$NetBSD: apprentice.c,v 1.21 2018/10/19 00:11:48 christos Exp $"); +__RCSID("$NetBSD: apprentice.c,v 1.22 2018/10/19 00:24:57 christos Exp $"); #endif #endif /* lint */ @@ -299,9 +299,9 @@ get_type(const struct type_tbl_s *tbl, c private off_t maxoff_t(void) { - if (sizeof(off_t) == sizeof(int)) + if (/*CONSTCOND*/sizeof(off_t) == sizeof(int)) return CAST(off_t, INT_MAX); - if (sizeof(off_t) == sizeof(long)) + if (/*CONSTCOND*/sizeof(off_t) == sizeof(long)) return CAST(off_t, LONG_MAX); return 0x7fff; } Index: src/external/bsd/file/dist/src/compress.c diff -u src/external/bsd/file/dist/src/compress.c:1.16 src/external/bsd/file/dist/src/compress.c:1.17 --- src/external/bsd/file/dist/src/compress.c:1.16 Thu Oct 18 20:11:48 2018 +++ src/external/bsd/file/dist/src/compress.c Thu Oct 18 20:24:57 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: compress.c,v 1.16 2018/10/19 00:11:48 christos Exp $ */ +/* $NetBSD: compress.c,v 1.17 2018/10/19 00:24:57 christos Exp $ */ /* * Copyright (c) Ian F. Darwin 1986-1995. @@ -40,7 +40,7 @@ #if 0 FILE_RCSID("@(#)$File: compress.c,v 1.113 2018/10/15 16:29:16 christos Exp $") #else -__RCSID("$NetBSD: compress.c,v 1.16 2018/10/19 00:11:48 christos Exp $"); +__RCSID("$NetBSD: compress.c,v 1.17 2018/10/19 00:24:57 christos Exp $"); #endif #endif @@ -428,7 +428,7 @@ file_pipe2file(struct magic_set *ms, int #else { int te; - int ou = umask(0); + mode_t ou = umask(0); tfd = mkstemp(buf); (void)umask(ou); te = errno; Index: src/external/bsd/file/dist/src/file.h diff -u src/external/bsd/file/dist/src/file.h:1.20 src/external/bsd/file/dist/src/file.h:1.21 --- src/external/bsd/file/dist/src/file.h:1.20 Thu Oct 18 20:11:48 2018 +++ src/external/bsd/file/dist/src/file.h Thu Oct 18 20:24:57 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: file.h,v 1.20 2018/10/19 00:11:48 christos Exp $ */ +/* $NetBSD: file.h,v 1.21 2018/10/19 00:24:57 christos Exp $ */ /* * Copyright (c) Ian F. Darwin 1986-1995. @@ -384,7 +384,7 @@ struct mlist { #define CCAST(T, b) const_cast(b) #else #define CAST(T, b) ((T)(b)) -#define RCAST(T, b) ((T)(b)) +#define RCAST(T, b) ((T)(void *)(b)) #define CCAST(T, b) ((T)(uintptr_t)(b)) #endif Index: src/external/bsd/file/dist/src/is_json.c diff -u src/external/bsd/file/dist/src/is_json.c:1.1.1.1 src/external/bsd/file/dist/src/is_json.c:1.2 --- src/external/bsd/file/dist/src/is_json.c:1.1.1.1 Thu Oct 18 19:54:09 2018 +++ src/external/bsd/file/dist/src/is_json.c Thu Oct 18 20:24:57 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: is_json.c,v 1.1.1.1 2018/10/18 23:54:09 christos Exp $ */ +/* $NetBSD: is_json.c,v 1.2 2018/10/19 00:24:57 christos Exp $ */ /*- * Copyright (c) 2018 Christos Zoulas @@ -37,7 +37,7 @@ #if 0 FILE_RCSID("@(#)$File: is_json.c,v 1.11 2018/10/15 16:29:16 christos Exp $") #else -__RCSID("$NetBSD: is_json.c,v 1.1.1.1 2018/10/18 23:54:09 christos Exp $"); +__RCSID("$NetBSD: is_json.c,v 1.2 2018/10/19 00:24:57 christos Exp $"); #endif #endif @@ -50,7 +50,7 @@ __RCSID("$NetBSD: is_json.c,v 1.1.1.1 20 #define DPRINTF(a, b, c) \ printf("%s [%.2x/%c] %.20s\n", (a), *(b), *(b), (const char *)(c)) #else -#define DPRINTF(a, b, c) (void)0 +#define DPRINTF(a, b, c) do { } while (/*CONSTCOND*/0) #endif #define JSON_ARRAY 0 Index: src/external/bsd/file/dist/src/readelf.c diff -u src/external/bsd/file/dist/src/readelf.c:1.18 src/external/bsd/file/dist/src/readelf.c:1.19 --- src/external/bsd/file/dist/src/readelf.c:1.18 Thu Oct 18 20:11:48 2018 +++ src/external/bsd/file/dist/src/readelf.c Thu Oct 18 20:24:57 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: readelf.c,v 1.18 2018/10/19
CVS commit: src/external/bsd/file/dist/src
Module Name:src Committed By: christos Date: Fri Oct 19 00:32:47 UTC 2018 Modified Files: src/external/bsd/file/dist/src: file.h readelf.c softmagic.c Log Message: fix lint fixes To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/external/bsd/file/dist/src/file.h cvs rdiff -u -r1.19 -r1.20 src/external/bsd/file/dist/src/readelf.c cvs rdiff -u -r1.20 -r1.21 src/external/bsd/file/dist/src/softmagic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/src/file.h diff -u src/external/bsd/file/dist/src/file.h:1.21 src/external/bsd/file/dist/src/file.h:1.22 --- src/external/bsd/file/dist/src/file.h:1.21 Thu Oct 18 20:24:57 2018 +++ src/external/bsd/file/dist/src/file.h Thu Oct 18 20:32:47 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: file.h,v 1.21 2018/10/19 00:24:57 christos Exp $ */ +/* $NetBSD: file.h,v 1.22 2018/10/19 00:32:47 christos Exp $ */ /* * Copyright (c) Ian F. Darwin 1986-1995. @@ -384,7 +384,7 @@ struct mlist { #define CCAST(T, b) const_cast(b) #else #define CAST(T, b) ((T)(b)) -#define RCAST(T, b) ((T)(void *)(b)) +#define RCAST(T, b) ((T)(uintptr_t)(b)) #define CCAST(T, b) ((T)(uintptr_t)(b)) #endif Index: src/external/bsd/file/dist/src/readelf.c diff -u src/external/bsd/file/dist/src/readelf.c:1.19 src/external/bsd/file/dist/src/readelf.c:1.20 --- src/external/bsd/file/dist/src/readelf.c:1.19 Thu Oct 18 20:24:57 2018 +++ src/external/bsd/file/dist/src/readelf.c Thu Oct 18 20:32:47 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: readelf.c,v 1.19 2018/10/19 00:24:57 christos Exp $ */ +/* $NetBSD: readelf.c,v 1.20 2018/10/19 00:32:47 christos Exp $ */ /* * Copyright (c) Christos Zoulas 2003. @@ -32,7 +32,7 @@ #if 0 FILE_RCSID("@(#)$File: readelf.c,v 1.154 2018/10/15 16:29:16 christos Exp $") #else -__RCSID("$NetBSD: readelf.c,v 1.19 2018/10/19 00:24:57 christos Exp $"); +__RCSID("$NetBSD: readelf.c,v 1.20 2018/10/19 00:32:47 christos Exp $"); #endif #endif @@ -792,7 +792,7 @@ do_core_note(struct magic_set *ms, unsig pidoff = argoff + 81 + 2; if (doff + pidoff + 4 <= size) { if (file_printf(ms, ", pid=%u", -elf_getu32(swap, *RCAST(uint32 *, (nbuf + +elf_getu32(swap, *RCAST(uint32_t *, (nbuf + doff + pidoff == -1) return 1; } Index: src/external/bsd/file/dist/src/softmagic.c diff -u src/external/bsd/file/dist/src/softmagic.c:1.20 src/external/bsd/file/dist/src/softmagic.c:1.21 --- src/external/bsd/file/dist/src/softmagic.c:1.20 Thu Oct 18 20:11:48 2018 +++ src/external/bsd/file/dist/src/softmagic.c Thu Oct 18 20:32:47 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: softmagic.c,v 1.20 2018/10/19 00:11:48 christos Exp $ */ +/* $NetBSD: softmagic.c,v 1.21 2018/10/19 00:32:47 christos Exp $ */ /* * Copyright (c) Ian F. Darwin 1986-1995. @@ -37,7 +37,7 @@ #if 0 FILE_RCSID("@(#)$File: softmagic.c,v 1.271 2018/10/15 16:29:16 christos Exp $") #else -__RCSID("$NetBSD: softmagic.c,v 1.20 2018/10/19 00:11:48 christos Exp $"); +__RCSID("$NetBSD: softmagic.c,v 1.21 2018/10/19 00:32:47 christos Exp $"); #endif #endif /* lint */ @@ -1441,7 +1441,7 @@ msetoffset(struct magic_set *ms, struct if ((size_t)-m->offset > b->elen) return -1; buffer_init(bb, -1, b->ebuf, b->elen); - ms->eoffset = ms->offset = b->elen + m->offset; + ms->eoffset = ms->offset = (int32_t)(b->elen + m->offset); } else { if (cont_level == 0) { normal:
CVS commit: src/external/bsd/file/dist/doc
Module Name:src Committed By: abhinav Date: Tue Jan 3 11:34:41 UTC 2017 Modified Files: src/external/bsd/file/dist/doc: file.1 Log Message: Correct a sentence in the HISTORY section. Remove a mention of "1989" at the end of the 4th paragraph in HISTORY section, probably leftover because of copy-paste from the paragraph above. Sort SEE ALSO. Remove trailing white spaces at some places. Remove Pp after Sh at few places as pointed out by mandoc. ok christos@ To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/external/bsd/file/dist/doc/file.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/doc/file.1 diff -u src/external/bsd/file/dist/doc/file.1:1.16 src/external/bsd/file/dist/doc/file.1:1.17 --- src/external/bsd/file/dist/doc/file.1:1.16 Fri Jan 2 21:15:32 2015 +++ src/external/bsd/file/dist/doc/file.1 Tue Jan 3 11:34:41 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: file.1,v 1.16 2015/01/02 21:15:32 christos Exp $ +.\" $NetBSD: file.1,v 1.17 2017/01/03 11:34:41 abhinav Exp $ .\" .\" $File: file.man,v 1.111 2014/12/16 23:18:40 christos Exp $ .Dd December 16, 2014 @@ -231,8 +231,8 @@ or at least one filename argument must b to test the standard input, use .Sq - as a filename argument. -Please note that -.Ar namefile +Please note that +.Ar namefile is unwrapped and the enclosed filenames are processed when this option is encountered and before any further options processing is done. This allows one to process multiple lists of files with different command line @@ -394,10 +394,10 @@ and .Fl h options. .Sh SEE ALSO -.Xr magic 5 , .Xr hexdump 1 , .Xr od 1 , .Xr strings 1 , +.Xr magic 5 .Sh STANDARDS CONFORMANCE This program is believed to exceed the System V Interface Definition of FILE(CMD), as near as one can determine from the vague language @@ -513,16 +513,15 @@ John Gilmore revised the code extensivel the first version. Geoff Collyer found several inadequacies and provided some magic file entries. -Contributions by the +Contribution of the .Sq \*[Am] -operator by Rob McMahon, +operator by Rob McMahon, .Aq cu...@warwick.ac.uk , 1989. .Pp -Guy Harris, +Guy Harris, .Aq g...@netapp.com , made many changes from 1993 to the present. -1989. .Pp Primary development and maintenance from 1990 to the present by Christos Zoulas @@ -570,7 +569,6 @@ program, and are not covered by the abov .Nm returns 0 on success, and non-zero on error. .Sh BUGS -.Pp Please report bugs and send patches to the bug tracker at .Pa http://bugs.gw.com/ or the mailing list at @@ -579,7 +577,6 @@ or the mailing list at .Pa http://mx.gw.com/mailman/listinfo/file first to subscribe). .Sh TODO -.Pp Fix output so that tests for MIME and APPLE flags are not needed all over the place, and actual output is only done in one place. This needs a design. @@ -615,16 +612,16 @@ Fix .Dq name and .Dq use -to check for consistency at compile time (duplicate +to check for consistency at compile time (duplicate .Dq name , .Dq use pointing to undefined .Dq name ). -Make +Make .Dq name / -.Dq use +.Dq use more efficient by keeping a sorted list of names. Special-case ^ to flip endianness in the parser so that it does not have to be escaped, and document it.
CVS commit: src/external/bsd/file/dist/src
Module Name:src Committed By: christos Date: Fri Feb 10 18:06:59 UTC 2017 Modified Files: src/external/bsd/file/dist/src: apprentice.c cdf.c compress.c print.c readelf.c softmagic.c Log Message: pacify lint. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/external/bsd/file/dist/src/apprentice.c cvs rdiff -u -r1.12 -r1.13 src/external/bsd/file/dist/src/cdf.c \ src/external/bsd/file/dist/src/readelf.c cvs rdiff -u -r1.11 -r1.12 src/external/bsd/file/dist/src/compress.c cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/src/print.c cvs rdiff -u -r1.14 -r1.15 src/external/bsd/file/dist/src/softmagic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/src/apprentice.c diff -u src/external/bsd/file/dist/src/apprentice.c:1.15 src/external/bsd/file/dist/src/apprentice.c:1.16 --- src/external/bsd/file/dist/src/apprentice.c:1.15 Fri Feb 10 12:53:24 2017 +++ src/external/bsd/file/dist/src/apprentice.c Fri Feb 10 13:06:59 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: apprentice.c,v 1.15 2017/02/10 17:53:24 christos Exp $ */ +/* $NetBSD: apprentice.c,v 1.16 2017/02/10 18:06:59 christos Exp $ */ /* * Copyright (c) Ian F. Darwin 1986-1995. @@ -37,7 +37,7 @@ #if 0 FILE_RCSID("@(#)$File: apprentice.c,v 1.257 2017/02/04 16:46:16 christos Exp $") #else -__RCSID("$NetBSD: apprentice.c,v 1.15 2017/02/10 17:53:24 christos Exp $"); +__RCSID("$NetBSD: apprentice.c,v 1.16 2017/02/10 18:06:59 christos Exp $"); #endif #endif /* lint */ @@ -555,8 +555,10 @@ apprentice_unmap(struct magic_map *map) break; case MAP_TYPE_MALLOC: for (i = 0; i < MAGIC_SETS; i++) { - if ((char *)map->magic[i] >= (char *)map->p && - (char *)map->magic[i] <= (char *)map->p + map->len) + void *b = map->magic[i]; + void *p = map->p; + if (CAST(char *, b) >= CAST(char *, p) && + CAST(char *, b) <= CAST(char *, p) + map->len) continue; free(map->magic[i]); } Index: src/external/bsd/file/dist/src/cdf.c diff -u src/external/bsd/file/dist/src/cdf.c:1.12 src/external/bsd/file/dist/src/cdf.c:1.13 --- src/external/bsd/file/dist/src/cdf.c:1.12 Fri Feb 10 12:53:24 2017 +++ src/external/bsd/file/dist/src/cdf.c Fri Feb 10 13:06:59 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: cdf.c,v 1.12 2017/02/10 17:53:24 christos Exp $ */ +/* $NetBSD: cdf.c,v 1.13 2017/02/10 18:06:59 christos Exp $ */ /*- * Copyright (c) 2008 Christos Zoulas @@ -40,7 +40,7 @@ #if 0 FILE_RCSID("@(#)$File: cdf.c,v 1.88 2017/02/07 23:21:29 christos Exp $") #else -__RCSID("$NetBSD: cdf.c,v 1.12 2017/02/10 17:53:24 christos Exp $"); +__RCSID("$NetBSD: cdf.c,v 1.13 2017/02/10 18:06:59 christos Exp $"); #endif #endif @@ -817,7 +817,7 @@ cdf_find_stream(const cdf_dir_t *dir, co == 0) break; if (i > 0) - return i; + return CAST(int, i); DPRINTF(("Cannot find type %d `%s'\n", type, name)); errno = ESRCH; @@ -1074,7 +1074,7 @@ cdf_unpack_catalog(const cdf_header_t *h { size_t ss = cdf_check_stream(sst, h); const char *b = CAST(const char *, sst->sst_tab); - const char *eb = b + ss * sst->sst_len; + const char *nb, *eb = b + ss * sst->sst_len; size_t nr, i, j, k; cdf_catalog_entry_t *ce; uint16_t reclen; @@ -1119,7 +1119,9 @@ cdf_unpack_catalog(const cdf_header_t *h cep->ce_namlen = rlen; np = CAST(const uint16_t *, CAST(const void *, (b + 16))); - if (RCAST(const char *, np + cep->ce_namlen) > eb) { + nb = CAST(const char *, CAST(const void *, + (np + cep->ce_namlen))); + if (nb > eb) { cep->ce_namlen = 0; break; } Index: src/external/bsd/file/dist/src/readelf.c diff -u src/external/bsd/file/dist/src/readelf.c:1.12 src/external/bsd/file/dist/src/readelf.c:1.13 --- src/external/bsd/file/dist/src/readelf.c:1.12 Fri Feb 10 12:53:24 2017 +++ src/external/bsd/file/dist/src/readelf.c Fri Feb 10 13:06:59 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: readelf.c,v 1.12 2017/02/10 17:53:24 christos Exp $ */ +/* $NetBSD: readelf.c,v 1.13 2017/02/10 18:06:59 christos Exp $ */ /* * Copyright (c) Christos Zoulas 2003. @@ -32,7 +32,7 @@ #if 0 FILE_RCSID("@(#)$File: readelf.c,v 1.130 2017/01/29 19:34:24 christos Exp $") #else -__RCSID("$NetBSD: readelf.c,v 1.12 2017/02/10 17:53:24 christos Exp $"); +__RCSID("$NetBSD: readelf.c,v 1.13 2017/02/10 18:06:59 christos Exp $"); #endif #endif @@ -896,7 +896,7 @@ get_string_on_virtaddr(struct magic_set offset = get_offset_from_virtaddr(ms, swap, clazz, fd, ph_off, ph_num, fsize, virtaddr); - if ((buflen = pread(fd, buf, buflen, offset)) <= 0) { + if ((buflen = pread(fd, buf, CAST(size_t, buflen), offset)) <= 0) { file_badread(ms); return 0; } Index: src/external/bsd/file/dist/src/compress.c diff -u src/external/bsd/file/dist/src/compress.c:1.11 src/external/bsd/file/dist/src/compress.c:1.12 --- src/external/bsd/file/dist/src/compress.c:1.11 Fri Feb 10 12:53:24 2017 +++ src/external/bsd/file/dis
CVS commit: src/external/bsd/file/dist/src
Module Name:src Committed By: christos Date: Sat Feb 11 18:17:29 UTC 2017 Modified Files: src/external/bsd/file/dist/src: readelf.c Log Message: fix reversed logic To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/bsd/file/dist/src/readelf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/src/readelf.c diff -u src/external/bsd/file/dist/src/readelf.c:1.13 src/external/bsd/file/dist/src/readelf.c:1.14 --- src/external/bsd/file/dist/src/readelf.c:1.13 Fri Feb 10 13:06:59 2017 +++ src/external/bsd/file/dist/src/readelf.c Sat Feb 11 13:17:29 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: readelf.c,v 1.13 2017/02/10 18:06:59 christos Exp $ */ +/* $NetBSD: readelf.c,v 1.14 2017/02/11 18:17:29 christos Exp $ */ /* * Copyright (c) Christos Zoulas 2003. @@ -32,7 +32,7 @@ #if 0 FILE_RCSID("@(#)$File: readelf.c,v 1.130 2017/01/29 19:34:24 christos Exp $") #else -__RCSID("$NetBSD: readelf.c,v 1.13 2017/02/10 18:06:59 christos Exp $"); +__RCSID("$NetBSD: readelf.c,v 1.14 2017/02/11 18:17:29 christos Exp $"); #endif #endif @@ -1191,7 +1191,7 @@ doshn(struct magic_set *ms, int clazz, i { Elf32_Shdr sh32; Elf64_Shdr sh64; - int stripped = 1, has_debug_info = 1; + int stripped = 1, has_debug_info = 0; size_t nbadcap = 0; void *nbuf; off_t noff, coff, name_off;
CVS commit: src/external/bsd/file/dist/src
Module Name:src Committed By: christos Date: Fri Feb 17 17:33:00 UTC 2017 Modified Files: src/external/bsd/file/dist/src: apprentice.c Log Message: Ignore files that start with . To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/external/bsd/file/dist/src/apprentice.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/src/apprentice.c diff -u src/external/bsd/file/dist/src/apprentice.c:1.16 src/external/bsd/file/dist/src/apprentice.c:1.17 --- src/external/bsd/file/dist/src/apprentice.c:1.16 Fri Feb 10 13:06:59 2017 +++ src/external/bsd/file/dist/src/apprentice.c Fri Feb 17 12:33:00 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: apprentice.c,v 1.16 2017/02/10 18:06:59 christos Exp $ */ +/* $NetBSD: apprentice.c,v 1.17 2017/02/17 17:33:00 christos Exp $ */ /* * Copyright (c) Ian F. Darwin 1986-1995. @@ -37,7 +37,7 @@ #if 0 FILE_RCSID("@(#)$File: apprentice.c,v 1.257 2017/02/04 16:46:16 christos Exp $") #else -__RCSID("$NetBSD: apprentice.c,v 1.16 2017/02/10 18:06:59 christos Exp $"); +__RCSID("$NetBSD: apprentice.c,v 1.17 2017/02/17 17:33:00 christos Exp $"); #endif #endif /* lint */ @@ -1322,6 +1322,8 @@ apprentice_load(struct magic_set *ms, co goto out; } while ((d = readdir(dir)) != NULL) { + if (d->d_name[0] == '.') +continue; if (asprintf(&mfn, "%s/%s", fn, d->d_name) < 0) { file_oomem(ms, strlen(fn) + strlen(d->d_name) + 2);
CVS commit: src/external/bsd/file/dist/doc
Module Name:src Committed By: christos Date: Fri Jan 4 15:37:54 UTC 2013 Modified Files: src/external/bsd/file/dist/doc: file.1 magic.5 Log Message: fix the version string manually. new sentence, new line. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/bsd/file/dist/doc/file.1 cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/doc/magic.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/doc/file.1 diff -u src/external/bsd/file/dist/doc/file.1:1.10 src/external/bsd/file/dist/doc/file.1:1.11 --- src/external/bsd/file/dist/doc/file.1:1.10 Thu Jan 3 18:05:37 2013 +++ src/external/bsd/file/dist/doc/file.1 Fri Jan 4 10:37:53 2013 @@ -1,4 +1,4 @@ -.\" $NetBSD: file.1,v 1.10 2013/01/03 23:05:37 christos Exp $ +.\" $NetBSD: file.1,v 1.11 2013/01/04 15:37:53 christos Exp $ .\" .\" $File: file.man,v 1.101 2012/11/01 04:31:53 christos Exp $ .Dd October 25, 2012 @@ -26,7 +26,7 @@ .Nm .Op Fl Fl help .Sh DESCRIPTION -This manual page documents version of the +This manual page documents version 5.12 of the .Nm command. .Pp @@ -559,15 +559,20 @@ or the mailing list at .Sh TODO .Pp Fix output so that tests for MIME and APPLE flags are not needed all -over the place, and actual output is only done in one place. This -needs a design. Suggestion: push possible outputs on to a list, then +over the place, and actual output is only done in one place. +This needs a design. +Suggestion: push possible outputs on to a list, then pick the last-pushed (most specific, one hopes) value at the end, or -use a default if the list is empty. This should not slow down evaluation. +use a default if the list is empty. +This should not slow down evaluation. .Pp -Continue to squash all magic bugs. See Debian BTS for a good source. +Continue to squash all magic bugs. +See Debian BTS for a good source. .Pp Store arbitrarily long strings, for example for %s patterns, so that -they can be printed out. Fixes Debian bug #271672. Would require more +they can be printed out. +Fixes Debian bug #271672. +Would require more complex store/load code in apprentice. .Pp Add syntax for relative offsets after current level (Debian bug #466037). @@ -581,8 +586,9 @@ Add an option to print URLs for the sour .Pp Combine script searches and add a way to map executable names to MIME types (e.g. have a magic value for !:mime which causes the resulting -string to be looked up in a table). This would avoid adding the same -magic repeatedly for each new hash-bang interpreter. +string to be looked up in a table). +This would avoid adding the same magic repeatedly for each new hash-bang +interpreter. .Pp Fix .Dq name Index: src/external/bsd/file/dist/doc/magic.5 diff -u src/external/bsd/file/dist/doc/magic.5:1.8 src/external/bsd/file/dist/doc/magic.5:1.9 --- src/external/bsd/file/dist/doc/magic.5:1.8 Thu Jan 3 18:05:37 2013 +++ src/external/bsd/file/dist/doc/magic.5 Fri Jan 4 10:37:53 2013 @@ -1,4 +1,4 @@ -.\" $NetBSD: magic.5,v 1.8 2013/01/03 23:05:37 christos Exp $ +.\" $NetBSD: magic.5,v 1.9 2013/01/04 15:37:53 christos Exp $ .\" .\" $File: magic.man,v 1.76 2012/11/07 20:29:27 christos Exp $ .Dd November 7, 2012 @@ -12,7 +12,7 @@ This manual page documents the format of the magic file as used by the .Xr file 1 -command, version . +command, version 5.12. The .Xr file 1 command identifies the type of a file using,
CVS commit: src/external/bsd/file/dist/src
Module Name:src Committed By: christos Date: Fri Jan 4 17:03:13 UTC 2013 Modified Files: src/external/bsd/file/dist/src: softmagic.c Log Message: bring return value fixes from head. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/bsd/file/dist/src/softmagic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/src/softmagic.c diff -u src/external/bsd/file/dist/src/softmagic.c:1.7 src/external/bsd/file/dist/src/softmagic.c:1.8 --- src/external/bsd/file/dist/src/softmagic.c:1.7 Thu Jan 3 18:05:38 2013 +++ src/external/bsd/file/dist/src/softmagic.c Fri Jan 4 12:03:13 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: softmagic.c,v 1.7 2013/01/03 23:05:38 christos Exp $ */ +/* $NetBSD: softmagic.c,v 1.8 2013/01/04 17:03:13 christos Exp $ */ /* * Copyright (c) Ian F. Darwin 1986-1995. @@ -37,7 +37,7 @@ #if 0 FILE_RCSID("@(#)$File: softmagic.c,v 1.155 2012/11/01 04:21:27 christos Exp $") #else -__RCSID("$NetBSD: softmagic.c,v 1.7 2013/01/03 23:05:38 christos Exp $"); +__RCSID("$NetBSD: softmagic.c,v 1.8 2013/01/04 17:03:13 christos Exp $"); #endif #endif /* lint */ @@ -49,9 +49,9 @@ __RCSID("$NetBSD: softmagic.c,v 1.7 2013 private int match(struct magic_set *, struct magic *, uint32_t, -const unsigned char *, size_t, size_t, int, int, int); +const unsigned char *, size_t, size_t, int, int, int, int *); private int mget(struct magic_set *, const unsigned char *, -struct magic *, size_t, size_t, unsigned int, int, int, int); +struct magic *, size_t, size_t, unsigned int, int, int, int, int *); private int magiccheck(struct magic_set *, struct magic *); private int32_t mprint(struct magic_set *, struct magic *); private int32_t moffset(struct magic_set *, struct magic *); @@ -79,7 +79,7 @@ file_softmagic(struct magic_set *ms, con int rv; for (ml = ms->mlist[0]->next; ml != ms->mlist[0]; ml = ml->next) if ((rv = match(ms, ml->magic, ml->nmagic, buf, nbytes, 0, mode, - text, 0)) != 0) + text, 0, NULL)) != 0) return rv; return 0; @@ -115,16 +115,19 @@ file_softmagic(struct magic_set *ms, con private int match(struct magic_set *ms, struct magic *magic, uint32_t nmagic, const unsigned char *s, size_t nbytes, size_t offset, int mode, int text, -int flip) +int flip, int *returnval) { uint32_t magindex = 0; unsigned int cont_level = 0; int need_separator = 0; - int returnval = 0, e; /* if a match is found it is set to 1*/ + int returnvalv = 0, e; /* if a match is found it is set to 1*/ int firstline = 1; /* a flag to print X\n X\n- X */ int printed_something = 0; int print = (ms->flags & (MAGIC_MIME|MAGIC_APPLE)) == 0; + if (returnval == NULL) + returnval = &returnvalv; + if (file_check_mem(ms, cont_level) == -1) return -1; @@ -150,7 +153,7 @@ match(struct magic_set *ms, struct magic /* if main entry matches, print it... */ switch (mget(ms, s, m, nbytes, offset, cont_level, mode, text, - flip)) { + flip, returnval)) { case -1: return -1; case 0: @@ -158,7 +161,7 @@ match(struct magic_set *ms, struct magic break; default: if (m->type == FILE_INDIRECT) -returnval = 1; +*returnval = 1; switch (magiccheck(ms, m)) { case -1: @@ -184,6 +187,7 @@ match(struct magic_set *ms, struct magic } if ((e = handle_annotation(ms, m)) != 0) { + *returnval = 1; return e; } /* @@ -235,7 +239,7 @@ match(struct magic_set *ms, struct magic } #endif switch (mget(ms, s, m, nbytes, offset, cont_level, mode, - text, flip)) { + text, flip, returnval)) { case -1: return -1; case 0: @@ -245,7 +249,7 @@ match(struct magic_set *ms, struct magic break; default: if (m->type == FILE_INDIRECT) - returnval = 1; + *returnval = 1; flush = 0; break; } @@ -268,8 +272,10 @@ match(struct magic_set *ms, struct magic ms->c.li[cont_level].got_match = 0; break; } -if ((e = handle_annotation(ms, m)) != 0) +if ((e = handle_annotation(ms, m)) != 0) { + *returnval = 1; return e; +} /* * If we are going to print something, * make sure that we have a separator first. @@ -318,13 +324,13 @@ match(struct magic_set *ms, struct magic if (printed_something) { firstline = 0; if (print) -returnval = 1; +*returnval = 1; } if ((ms->flags & MAGIC_CONTINUE) == 0 && printed_something) { - return returnval; /* don't keep searching */ + return *returnval; /* don't keep searching */ } } - return returnval; /* This is hit if -k is set or there is no match */ + return *returnval; /* This is hit if -k is set or there is no match */ } private int @@ -1116,7 +1122,7 @@ mcopy(struct magic_set *ms, union VALUET private int mget(struct magic_set *ms, const unsigned char *s, struct magic *m, size_t nbytes, s
CVS commit: src/external/bsd/file/dist/src
Module Name:src Committed By: joerg Date: Thu Nov 28 14:40:00 UTC 2013 Modified Files: src/external/bsd/file/dist/src: compress.c Log Message: Spell the null pointer as NULL, not as nul. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/src/compress.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/src/compress.c diff -u src/external/bsd/file/dist/src/compress.c:1.6 src/external/bsd/file/dist/src/compress.c:1.7 --- src/external/bsd/file/dist/src/compress.c:1.6 Thu Jan 3 23:05:38 2013 +++ src/external/bsd/file/dist/src/compress.c Thu Nov 28 14:40:00 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: compress.c,v 1.6 2013/01/03 23:05:38 christos Exp $ */ +/* $NetBSD: compress.c,v 1.7 2013/11/28 14:40:00 joerg Exp $ */ /* * Copyright (c) Ian F. Darwin 1986-1995. @@ -40,7 +40,7 @@ #if 0 FILE_RCSID("@(#)$File: compress.c,v 1.70 2012/11/07 17:54:48 christos Exp $") #else -__RCSID("$NetBSD: compress.c,v 1.6 2013/01/03 23:05:38 christos Exp $"); +__RCSID("$NetBSD: compress.c,v 1.7 2013/11/28 14:40:00 joerg Exp $"); #endif #endif @@ -487,7 +487,7 @@ uncompressbuf(struct magic_set *ms, int #endif free(*newch); n = 0; - newch[0] = '\0'; + *newch = NULL; goto err; } else { n = r;
CVS commit: src/external/bsd/file/dist/doc
Module Name:src Committed By: christos Date: Fri May 8 16:39:46 UTC 2009 Modified Files: src/external/bsd/file/dist/doc: file.1 magic.5 Log Message: unmiff version To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/file/dist/doc/file.1 \ src/external/bsd/file/dist/doc/magic.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/doc/file.1 diff -u src/external/bsd/file/dist/doc/file.1:1.1.1.1 src/external/bsd/file/dist/doc/file.1:1.2 --- src/external/bsd/file/dist/doc/file.1:1.1.1.1 Fri May 8 12:35:10 2009 +++ src/external/bsd/file/dist/doc/file.1 Fri May 8 12:39:46 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: file.1,v 1.1.1.1 2009/05/08 16:35:10 christos Exp $ +.\" $NetBSD: file.1,v 1.2 2009/05/08 16:39:46 christos Exp $ .\" .\" $File: file.man,v 1.79 2008/11/06 22:49:08 rrt Exp $ .Dd October 9, 2008 @@ -22,7 +22,7 @@ .Nm .Op Fl -help .Sh DESCRIPTION -This manual page documents version 4.21 of the +This manual page documents version 5.03 of the .Nm command. .Pp Index: src/external/bsd/file/dist/doc/magic.5 diff -u src/external/bsd/file/dist/doc/magic.5:1.1.1.1 src/external/bsd/file/dist/doc/magic.5:1.2 --- src/external/bsd/file/dist/doc/magic.5:1.1.1.1 Fri May 8 12:35:10 2009 +++ src/external/bsd/file/dist/doc/magic.5 Fri May 8 12:39:46 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: magic.5,v 1.1.1.1 2009/05/08 16:35:10 christos Exp $ +.\" $NetBSD: magic.5,v 1.2 2009/05/08 16:39:46 christos Exp $ .\" .\" $File: magic.man,v 1.59 2008/11/06 23:22:53 christos Exp $ .Dd August 30, 2008 @@ -12,7 +12,7 @@ This manual page documents the format of the magic file as used by the .Xr file 1 -command, version 4.21. +command, version 5.03. The .Xr file 1 command identifies the type of a file using,
CVS commit: src/external/bsd/file/dist/doc
Module Name:src Committed By: wiz Date: Fri May 8 20:19:39 UTC 2009 Modified Files: src/external/bsd/file/dist/doc: libmagic.3 magic.5 Log Message: Drop trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/file/dist/doc/libmagic.3 cvs rdiff -u -r1.2 -r1.3 src/external/bsd/file/dist/doc/magic.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/doc/libmagic.3 diff -u src/external/bsd/file/dist/doc/libmagic.3:1.1.1.1 src/external/bsd/file/dist/doc/libmagic.3:1.2 --- src/external/bsd/file/dist/doc/libmagic.3:1.1.1.1 Fri May 8 16:35:10 2009 +++ src/external/bsd/file/dist/doc/libmagic.3 Fri May 8 20:19:39 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: libmagic.3,v 1.1.1.1 2009/05/08 16:35:10 christos Exp $ +.\" $NetBSD: libmagic.3,v 1.2 2009/05/08 20:19:39 wiz Exp $ .\" .\" $File: libmagic.man,v 1.19 2008/10/06 20:16:04 christos Exp $ .\" @@ -14,7 +14,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\"notice, this list of conditions and the following disclaimer in the .\"documentation and/or other materials provided with the distribution. -.\" +.\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -75,7 +75,7 @@ The function .Fn magic_open creates a magic cookie pointer and returns it. It returns NULL if -there was an error allocating the magic cookie. The +there was an error allocating the magic cookie. The .Ar flags argument specifies how the other magic functions should behave: .Bl -tag -width MAGIC_COMPRESS @@ -167,7 +167,7 @@ .Pp The .Fn magic_setflags -function sets the +function sets the .Ar flags described above. Note that using both MIME flags together can also return extra information on the charset. @@ -221,7 +221,7 @@ The .Fn magic_file , and -.Fn magic_buffer +.Fn magic_buffer functions return a string on success and NULL on failure. The .Fn magic_error function returns a textual description of the errors of the above @@ -244,7 +244,7 @@ .El .Sh SEE ALSO .Xr file 1 , -.Xr magic 5 +.Xr magic 5 .Sh AUTHORS Måns Rullgård Initial libmagic implementation, and configuration. Index: src/external/bsd/file/dist/doc/magic.5 diff -u src/external/bsd/file/dist/doc/magic.5:1.2 src/external/bsd/file/dist/doc/magic.5:1.3 --- src/external/bsd/file/dist/doc/magic.5:1.2 Fri May 8 16:39:46 2009 +++ src/external/bsd/file/dist/doc/magic.5 Fri May 8 20:19:39 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: magic.5,v 1.2 2009/05/08 16:39:46 christos Exp $ +.\" $NetBSD: magic.5,v 1.3 2009/05/08 20:19:39 wiz Exp $ .\" .\" $File: magic.man,v 1.59 2008/11/06 23:22:53 christos Exp $ .Dd August 30, 2008 @@ -299,14 +299,14 @@ .El .Pp An APPLE 4+4 character APPLE creator and type can be specified as: -.Bd -literal -offset indent +.Bd -literal -offset indent !:apple CREATYPE .Ed .Pp A MIME type is given on a separate line, which must be the next non-blank or comment line after the magic line that identifies the file type, and has the following format: -.Bd -literal -offset indent +.Bd -literal -offset indent !:mime MIMETYPE .Ed .Pp @@ -316,13 +316,13 @@ .Pp An optional strength can be supplied on a separate line which refers to the current magic description using the following format: -.Bd -literal -offset indent +.Bd -literal -offset indent !:strength OP VALUE .Ed .Pp The operand .Dv OP -can be: +can be: .Dv + , .Dv - , .Dv * ,
CVS commit: src/external/bsd/file/dist/doc
Module Name:src Committed By: wiz Date: Fri May 8 20:20:40 UTC 2009 Modified Files: src/external/bsd/file/dist/doc: magic.5 Log Message: New sentence, new line. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/file/dist/doc/magic.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/doc/magic.5 diff -u src/external/bsd/file/dist/doc/magic.5:1.3 src/external/bsd/file/dist/doc/magic.5:1.4 --- src/external/bsd/file/dist/doc/magic.5:1.3 Fri May 8 20:19:39 2009 +++ src/external/bsd/file/dist/doc/magic.5 Fri May 8 20:20:39 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: magic.5,v 1.3 2009/05/08 20:19:39 wiz Exp $ +.\" $NetBSD: magic.5,v 1.4 2009/05/08 20:20:39 wiz Exp $ .\" .\" $File: magic.man,v 1.59 2008/11/06 23:22:53 christos Exp $ .Dd August 30, 2008 @@ -155,11 +155,12 @@ Starting at the given offset, consult the magic database again. .It Dv regex A regular expression match in extended POSIX regular expression syntax -(like egrep). Regular expressions can take exponential time to -process, and their performance is hard to predict, so their use is -discouraged. When used in production environments, their performance -should be carefully checked. The type specification can be optionally -followed by +(like egrep). +Regular expressions can take exponential time to process, and their +performance is hard to predict, so their use is discouraged. +When used in production environments, their performance +should be carefully checked. +The type specification can be optionally followed by .Dv /[c][s] . The .Dq c @@ -178,15 +179,17 @@ match the beginning and end of individual lines, respectively, not beginning and end of file. .It Dv search -A literal string search starting at the given offset. The same -modifier flags can be used as for string patterns. The modifier flags -(if any) must be followed by +A literal string search starting at the given offset. +The same modifier flags can be used as for string patterns. +The modifier flags (if any) must be followed by .Dv /number the range, that is, the number of positions at which the match will be -attempted, starting from the start offset. This is suitable for +attempted, starting from the start offset. +This is suitable for searching larger binary expressions with variable offsets, using .Dv \e -escapes for special characters. The offset works as for regex. +escapes for special characters. +The offset works as for regex. .It Dv default This is intended to be used with the test .Em x @@ -195,14 +198,18 @@ .El .Pp Each top-level magic pattern (see below for an explanation of levels) -is classified as text or binary according to the types used. Types +is classified as text or binary according to the types used. +Types .Dq regex and .Dq search are classified as text tests, unless non-printable characters are used -in the pattern. All other tests are classified as binary. A top-level +in the pattern. +All other tests are classified as binary. +A top-level pattern is considered to be a test text when all its patterns are text -patterns; otherwise, it is considered to be a binary pattern. When +patterns; otherwise, it is considered to be a binary pattern. +When matching a file, binary patterns are tried first; if no match is found, and the file looks like text, then its encoding is determined and the text patterns are tried.
CVS commit: src/external/bsd/file/dist/doc
Module Name:src Committed By: wiz Date: Fri May 8 20:26:48 UTC 2009 Modified Files: src/external/bsd/file/dist/doc: libmagic.3 Log Message: Various fixes. More formatting. New sentence, new line. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/file/dist/doc/libmagic.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/doc/libmagic.3 diff -u src/external/bsd/file/dist/doc/libmagic.3:1.2 src/external/bsd/file/dist/doc/libmagic.3:1.3 --- src/external/bsd/file/dist/doc/libmagic.3:1.2 Fri May 8 20:19:39 2009 +++ src/external/bsd/file/dist/doc/libmagic.3 Fri May 8 20:26:48 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: libmagic.3,v 1.2 2009/05/08 20:19:39 wiz Exp $ +.\" $NetBSD: libmagic.3,v 1.3 2009/05/08 20:26:48 wiz Exp $ .\" .\" $File: libmagic.man,v 1.19 2008/10/06 20:16:04 christos Exp $ .\" @@ -40,7 +40,7 @@ .Nm magic_check , .Nm magic_compile , .Nm magic_load -.Nd Magic number recognition library. +.Nd Magic number recognition library .Sh LIBRARY .Lb libmagic .Sh SYNOPSIS @@ -54,17 +54,17 @@ .Ft int .Fn magic_errno "magic_t cookie" .Ft const char * -.Fn magic_file "magic_t cookie, const char *filename" +.Fn magic_file "magic_t cookie" "const char *filename" .Ft const char * -.Fn magic_buffer "magic_t cookie, const void *buffer, size_t length" +.Fn magic_buffer "magic_t cookie" "const void *buffer" "size_t length" .Ft int -.Fn magic_setflags "magic_t cookie, int flags" +.Fn magic_setflags "magic_t cookie" "int flags" .Ft int -.Fn magic_check "magic_t cookie, const char *filename" +.Fn magic_check "magic_t cookie" "const char *filename" .Ft int -.Fn magic_compile "magic_t cookie, const char *filename" +.Fn magic_compile "magic_t cookie" "const char *filename" .Ft int -.Fn magic_load "magic_t cookie, const char *filename" +.Fn magic_load "magic_t cookie" "const char *filename" .Sh DESCRIPTION These functions operate on the magic database file @@ -74,8 +74,11 @@ .Pp The function .Fn magic_open -creates a magic cookie pointer and returns it. It returns NULL if -there was an error allocating the magic cookie. The +creates a magic cookie pointer and returns it. +It returns +.Dv NULL +if there was an error allocating the magic cookie. +The .Ar flags argument specifies how the other magic functions should behave: .Bl -tag -width MAGIC_COMPRESS @@ -100,7 +103,7 @@ Check the magic database for consistency and print warnings to stderr. .It Dv MAGIC_PRESERVE_ATIME On systems that support -.Xr utime 2 +.Xr utime 3 or .Xr utimes 2 , attempt to preserve the access time of files analyzed. @@ -139,8 +142,9 @@ .Pp The .Fn magic_error -function returns a textual explanation of the last error, or NULL if there was -no error. +function returns a textual explanation of the last error, or +.Dv NULL +if there was no error. .Pp The .Fn magic_errno @@ -152,10 +156,14 @@ .Fn magic_file function returns a textual description of the contents of the .Ar filename -argument, or NULL if an error occurred. +argument, or +.Dv NULL +if an error occurred. If the .Ar filename -is NULL, then stdin is used. +is +.Dv NULL , +then stdin is used. .Pp The .Fn magic_buffer @@ -169,7 +177,8 @@ .Fn magic_setflags function sets the .Ar flags -described above. Note that using both MIME flags together can also +described above. +Note that using both MIME flags together can also return extra information on the charset. .Pp The @@ -177,16 +186,21 @@ function can be used to check the validity of entries in the colon separated database files passed in as .Ar filename , -or NULL for the default database. It returns 0 on success and -1 on -failure. +or +.Dv NULL +for the default database. +It returns 0 on success and \-1 on failure. .Pp The .Fn magic_compile function can be used to compile the the colon separated list of database files passed in as .Ar filename , -or NULL for the default database. It returns 0 on success and -1 on -failure. The compiled files created are named from the +or +.Dv NULL +for the default database. +It returns 0 on success and \-1 on failure. +The compiled files created are named from the .Xr basename 1 of each file argument with .Dq .mgc @@ -197,11 +211,13 @@ function must be used to load the the colon separated list of database files passed in as .Ar filename , -or NULL for the default database file -before any magic queries can performed. +or +.Dv NULL +for the default database file before any magic queries can performed. .Pp -The default database file is named by the MAGIC environment variable. If -that variable is not set, the default database file name is /usr/share/misc/magic. +The default database file is named by the MAGIC environment variable. +If that variable is not set, the default database file name is +.Pa /usr/share/misc/magic . .Fn magic_load adds .Dq .mgc @@ -209,27 +225,35 @@ .Sh RETU
CVS commit: src/external/bsd/file/dist/doc
Module Name:src Committed By: wiz Date: Fri May 8 21:45:52 UTC 2009 Modified Files: src/external/bsd/file/dist/doc: file.1 Log Message: Use more markup, use more appropriate markup. Improve wording. Sort options and sections. Make ready for HTML output. Fix xref. Add -0 to SYNOPSIS. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/file/dist/doc/file.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/doc/file.1 diff -u src/external/bsd/file/dist/doc/file.1:1.3 src/external/bsd/file/dist/doc/file.1:1.4 --- src/external/bsd/file/dist/doc/file.1:1.3 Fri May 8 17:34:34 2009 +++ src/external/bsd/file/dist/doc/file.1 Fri May 8 21:45:52 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: file.1,v 1.3 2009/05/08 17:34:34 christos Exp $ +.\" $NetBSD: file.1,v 1.4 2009/05/08 21:45:52 wiz Exp $ .\" .\" $File: file.man,v 1.79 2008/11/06 22:49:08 rrt Exp $ .Dd October 9, 2008 @@ -9,18 +9,18 @@ .Nd determine file type .Sh SYNOPSIS .Nm -.Op Fl bchikLnNprsvz -.Op Fl -mime-type -.Op Fl -mime-encoding -.Op Fl f Ar namefile +.Op Fl 0bchikLNnprsvz .Op Fl F Ar separator +.Op Fl f Ar namefile .Op Fl m Ar magicfiles +.Op Fl Fl mime-encoding +.Op Fl Fl mime-type .Ar file .Nm .Fl C .Op Fl m Ar magicfile .Nm -.Op Fl -help +.Op Fl Fl help .Sh DESCRIPTION This manual page documents version 5.03 of the .Nm @@ -44,12 +44,12 @@ .Em executable (the file contains the result of compiling a program in a form understandable to some -.Dv UNIX +.Tn UNIX kernel or another), or .Em data meaning anything else (data is usually -.Sq binary +.Dq binary or non-printable). Exceptions are well-known file formats (core files, tar archives) that are known to contain binary data. @@ -57,12 +57,12 @@ .Em "preserve these keywords" . Users depend on knowing that all the readable files in a directory have the word -.Sq text +.Dq text printed. Don't do as Berkeley did and change -.Sq shell commands text +.Dq shell commands text to -.Sq shell script . +.Dq shell script . .Pp The filesystem tests are based on examining the return from a .Xr stat 2 @@ -72,8 +72,7 @@ Any known file types appropriate to the system you are running on (sockets, symbolic links, or named pipes (FIFOs) on those systems that implement them) -are intuited if they are defined in -the system header file +are intuited if they are defined in the system header file .In sys/stat.h . .Pp The magic tests are used to check for files with data in @@ -87,13 +86,14 @@ .In exec.h in the standard include directory. These files have a -.Sq "magic number" +.Dq "magic number" stored in a particular place near the beginning of the file that tells the -.Dv UNIX operating system +.Tn UNIX +operating system that the file is a binary executable, and which of several types thereof. The concept of a -.Sq "magic" +.Dq "magic" has been applied by extension to data files. Any file with some invariant identifier at a small fixed offset into the file can usually be described in this way. @@ -102,7 +102,8 @@ .Pa /usr/share/misc/magic.mgc , or the files in the directory .Pa /usr/share/misc/magic -if the compiled file does not exist. In addition, if +if the compiled file does not exist. +In addition, if .Pa $HOME/.magic.mgc or .Pa $HOME/.magic @@ -119,10 +120,10 @@ If a file passes any of these tests, its character set is reported. ASCII, ISO-8859-x, UTF-8, and extended-ASCII files are identified as -.Sq text +.Dq text because they will be mostly readable on nearly any terminal; UTF-16 and EBCDIC are only -.Sq character data +.Dq character data because, while they contain text, it is text that will require translation before it can be read. @@ -140,8 +141,8 @@ it will attempt to determine in what language the file is written. The language tests look for particular strings (cf. -.In names.h -) that can appear anywhere in the first few blocks of a file. +.In names.h ) +that can appear anywhere in the first few blocks of a file. For example, the keyword .Em .br indicates that the file is most likely a @@ -158,32 +159,41 @@ .Pp Any file that cannot be identified as having been written in any of the character sets listed above is simply said to be -.Sq data . +.Dq data . .Sh OPTIONS .Bl -tag -width indent -.It Fl b , -brief +.It Fl 0 , -print0 +Output a null character +.Sq \e0 +after the end of the filename. +Nice to +.Xr cut 1 +the output. +This does not affect the separator which is still printed. +.It Fl b , Fl Fl brief Do not prepend filenames to output lines (brief mode). -.It Fl c , -checking-printout +.It Fl c , Fl Fl checking-printout Cause a checking printout of the parsed form of the magic file. This is usually used in conjunction with the .Fl m flag to debug a new magic file before installing it. -.It Fl C , -compile +.It Fl C , Fl Fl compile Write a .Pa magic.mgc output file th
CVS commit: src/external/bsd/file/dist/src
Module Name:src Committed By: christos Date: Fri May 15 12:06:09 UTC 2009 Modified Files: src/external/bsd/file/dist/src: file.h Log Message: define __RCSID if nobody did. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/file/dist/src/file.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/src/file.h diff -u src/external/bsd/file/dist/src/file.h:1.2 src/external/bsd/file/dist/src/file.h:1.3 --- src/external/bsd/file/dist/src/file.h:1.2 Fri May 8 13:28:01 2009 +++ src/external/bsd/file/dist/src/file.h Fri May 15 08:06:09 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: file.h,v 1.2 2009/05/08 17:28:01 christos Exp $ */ +/* $NetBSD: file.h,v 1.3 2009/05/15 12:06:09 christos Exp $ */ /* * Copyright (c) Ian F. Darwin 1986-1995. @@ -448,5 +448,8 @@ #else #define FILE_RCSID(id) #endif +#ifndef __RCSID +#define __RCSID(a) +#endif #endif /* __file_h__ */
CVS commit: src/external/bsd/file/dist/src
Module Name:src Committed By: riz Date: Thu Jun 23 16:12:36 UTC 2011 Modified Files: src/external/bsd/file/dist/src: apprentice.c Log Message: Remove a noisy debugging printf that triggers on bigendian platforms. (Reported upstream as well) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/file/dist/src/apprentice.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/src/apprentice.c diff -u src/external/bsd/file/dist/src/apprentice.c:1.3 src/external/bsd/file/dist/src/apprentice.c:1.4 --- src/external/bsd/file/dist/src/apprentice.c:1.3 Fri May 13 01:52:13 2011 +++ src/external/bsd/file/dist/src/apprentice.c Thu Jun 23 16:12:36 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: apprentice.c,v 1.3 2011/05/13 01:52:13 christos Exp $ */ +/* $NetBSD: apprentice.c,v 1.4 2011/06/23 16:12:36 riz Exp $ */ /* * Copyright (c) Ian F. Darwin 1986-1995. @@ -37,7 +37,7 @@ #if 0 FILE_RCSID("@(#)$File: apprentice.c,v 1.169 2011/05/10 17:08:13 christos Exp $") #else -__RCSID("$NetBSD: apprentice.c,v 1.3 2011/05/13 01:52:13 christos Exp $"); +__RCSID("$NetBSD: apprentice.c,v 1.4 2011/06/23 16:12:36 riz Exp $"); #endif #endif /* lint */ @@ -2472,8 +2472,6 @@ m->in_offset = swap4((uint32_t)m->in_offset); m->lineno = swap4((uint32_t)m->lineno); if (IS_STRING(m->type)) { - if (m->type == FILE_PSTRING) - printf("flags! %d\n", m->str_flags); m->str_range = swap4(m->str_range); m->str_flags = swap4(m->str_flags); }
CVS commit: src/external/bsd/file/dist/doc
Module Name:src Committed By: joerg Date: Fri May 14 03:14:41 UTC 2010 Modified Files: src/external/bsd/file/dist/doc: libmagic.3 Log Message: ASCII cleaness To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/dist/doc/libmagic.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/doc/libmagic.3 diff -u src/external/bsd/file/dist/doc/libmagic.3:1.4 src/external/bsd/file/dist/doc/libmagic.3:1.5 --- src/external/bsd/file/dist/doc/libmagic.3:1.4 Tue Nov 24 14:07:30 2009 +++ src/external/bsd/file/dist/doc/libmagic.3 Fri May 14 03:14:41 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: libmagic.3,v 1.4 2009/11/24 14:07:30 wiz Exp $ +.\" $NetBSD: libmagic.3,v 1.5 2010/05/14 03:14:41 joerg Exp $ .\" .\" $File: libmagic.man,v 1.19 2008/10/06 20:16:04 christos Exp $ .\" @@ -270,7 +270,7 @@ .Xr file 1 , .Xr magic 5 .Sh AUTHORS -.An Måns Rullgård +.An M\(oans Rullg\(oard Initial libmagic implementation, and configuration. .An Christos Zoulas API cleanup, error code and allocation handling.
CVS commit: src/external/bsd/file/dist/doc
Module Name:src Committed By: joerg Date: Fri May 14 16:51:32 UTC 2010 Modified Files: src/external/bsd/file/dist/doc: file.1 Log Message: Reorder section. Use .Ex -std. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/dist/doc/file.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/doc/file.1 diff -u src/external/bsd/file/dist/doc/file.1:1.4 src/external/bsd/file/dist/doc/file.1:1.5 --- src/external/bsd/file/dist/doc/file.1:1.4 Fri May 8 21:45:52 2009 +++ src/external/bsd/file/dist/doc/file.1 Fri May 14 16:51:32 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: file.1,v 1.4 2009/05/08 21:45:52 wiz Exp $ +.\" $NetBSD: file.1,v 1.5 2010/05/14 16:51:32 joerg Exp $ .\" .\" $File: file.man,v 1.79 2008/11/06 22:49:08 rrt Exp $ .Dd October 9, 2008 @@ -321,9 +321,6 @@ .It Fl z , Fl Fl uncompress Try to look inside compressed files. .El -.Sh RETURN VALUES -.Nm -returns 0 on success, and non-zero on error. .Sh ENVIRONMENT The environment variable .Ev MAGIC @@ -356,6 +353,8 @@ .It Pa /usr/share/misc/magic Directory containing default magic files. .El +.Sh EXIT STATUS +.Ex -std .Sh EXAMPLES .Bd -literal -offset indent $ file file.c file /dev/{wd0a,hda}
CVS commit: src/external/bsd/file/dist/doc
Module Name:src Committed By: christos Date: Fri May 13 21:15:34 UTC 2011 Modified Files: src/external/bsd/file/dist/doc: file.1 Log Message: remove dup code. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/doc/file.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/doc/file.1 diff -u src/external/bsd/file/dist/doc/file.1:1.6 src/external/bsd/file/dist/doc/file.1:1.7 --- src/external/bsd/file/dist/doc/file.1:1.6 Thu May 12 21:52:13 2011 +++ src/external/bsd/file/dist/doc/file.1 Fri May 13 17:15:34 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: file.1,v 1.6 2011/05/13 01:52:13 christos Exp $ +.\" $NetBSD: file.1,v 1.7 2011/05/13 21:15:34 christos Exp $ .\" .\" $File: file.man,v 1.94 2011/04/20 19:08:44 christos Exp $ .Dd April 20, 2011 @@ -166,14 +166,6 @@ .Dq data . .Sh OPTIONS .Bl -tag -width indent -.It Fl 0 , Fl Fl print0 -Output a null character -.Sq \e0 -after the end of the filename. -Nice to -.Xr cut 1 -the output. -This does not affect the separator which is still printed. .It Fl b , Fl Fl brief Do not prepend filenames to output lines (brief mode). .It Fl C , Fl Fl compile @@ -373,48 +365,6 @@ and .Fl h options. -.Sh FILES -.Bl -tag -width /usr/share/misc/magic.mgc -compact -.It Pa /usr/share/misc/magic.mgc -Default compiled list of magic. -.It Pa /usr/share/misc/magic -Directory containing default magic files. -.El -.Sh EXIT STATUS -.Ex -std -.Sh EXAMPLES -.Bd -literal -offset indent -$ file file.c file /dev/{wd0a,hda} -file.c: C program text -file: ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV), - dynamically linked (uses shared libs), stripped -/dev/wd0a: block special (0/0) -/dev/hda: block special (3/0) - -$ file -s /dev/wd0{b,d} -/dev/wd0b: data -/dev/wd0d: x86 boot sector - -$ file -s /dev/hda{,1,2,3,4,5,6,7,8,9,10} -/dev/hda: x86 boot sector -/dev/hda1: Linux/i386 ext2 filesystem -/dev/hda2: x86 boot sector -/dev/hda3: x86 boot sector, extended partition table -/dev/hda4: Linux/i386 ext2 filesystem -/dev/hda5: Linux/i386 swap file -/dev/hda6: Linux/i386 swap file -/dev/hda7: Linux/i386 swap file -/dev/hda8: Linux/i386 swap file -/dev/hda9: empty -/dev/hda10: empty - -$ file -i file.c file /dev/{wd0a,hda} -file.c: text/x-c -file:application/x-executable -/dev/hda:application/x-not-regular-file -/dev/wd0a: application/x-not-regular-file - -.Ed .Sh SEE ALSO .Xr hexdump 1 , .Xr od 1 ,
CVS commit: src/external/bsd/file/dist/src
Module Name:src Committed By: joerg Date: Sat Sep 17 10:46:52 UTC 2011 Modified Files: src/external/bsd/file/dist/src: readcdf.c Log Message: Define __arraycount if it doesn't exist. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/dist/src/readcdf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/src/readcdf.c diff -u src/external/bsd/file/dist/src/readcdf.c:1.4 src/external/bsd/file/dist/src/readcdf.c:1.5 --- src/external/bsd/file/dist/src/readcdf.c:1.4 Fri Sep 16 21:06:27 2011 +++ src/external/bsd/file/dist/src/readcdf.c Sat Sep 17 10:46:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: readcdf.c,v 1.4 2011/09/16 21:06:27 christos Exp $ */ +/* $NetBSD: readcdf.c,v 1.5 2011/09/17 10:46:52 joerg Exp $ */ /*- * Copyright (c) 2008 Christos Zoulas @@ -31,7 +31,7 @@ #if 0 FILE_RCSID("@(#)$File: readcdf.c,v 1.26 2011/08/26 13:38:28 christos Exp $") #else -__RCSID("$NetBSD: readcdf.c,v 1.4 2011/09/16 21:06:27 christos Exp $"); +__RCSID("$NetBSD: readcdf.c,v 1.5 2011/09/17 10:46:52 joerg Exp $"); #endif #endif @@ -44,6 +44,10 @@ #include "cdf.h" #include "magic.h" +#ifndef __arraycount +#define __arraycount(a) (sizeof(a) / sizeof(a[0])) +#endif + #define NOTMIME(ms) (((ms)->flags & MAGIC_MIME) == 0) private int
CVS commit: src/external/bsd/file/dist/src
Module Name:src Committed By: christos Date: Wed Sep 28 13:50:09 UTC 2011 Modified Files: src/external/bsd/file/dist/src: readcdf.c Log Message: fix cdf mime output on cdf files (from file HEAD) To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/dist/src/readcdf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/src/readcdf.c diff -u src/external/bsd/file/dist/src/readcdf.c:1.5 src/external/bsd/file/dist/src/readcdf.c:1.6 --- src/external/bsd/file/dist/src/readcdf.c:1.5 Sat Sep 17 06:46:52 2011 +++ src/external/bsd/file/dist/src/readcdf.c Wed Sep 28 09:50:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: readcdf.c,v 1.5 2011/09/17 10:46:52 joerg Exp $ */ +/* $NetBSD: readcdf.c,v 1.6 2011/09/28 13:50:09 christos Exp $ */ /*- * Copyright (c) 2008 Christos Zoulas @@ -31,7 +31,7 @@ #if 0 FILE_RCSID("@(#)$File: readcdf.c,v 1.26 2011/08/26 13:38:28 christos Exp $") #else -__RCSID("$NetBSD: readcdf.c,v 1.5 2011/09/17 10:46:52 joerg Exp $"); +__RCSID("$NetBSD: readcdf.c,v 1.6 2011/09/28 13:50:09 christos Exp $"); #endif #endif @@ -154,6 +154,9 @@ cdf_file_property_info(struct magic_set if (!NOTMIME(ms)) { if (str == NULL) return 0; + if (file_printf(ms, "application/%s", str) == -1) + return -1; + } return 1; }
CVS commit: src/external/bsd/file/dist/doc
Module Name:src Committed By: njoly Date: Mon Oct 3 15:43:55 UTC 2011 Modified Files: src/external/bsd/file/dist/doc: libmagic.3 Log Message: Fix magic_descriptor/magic_file quoting in SYNOPSIS. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/bsd/file/dist/doc/libmagic.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/doc/libmagic.3 diff -u src/external/bsd/file/dist/doc/libmagic.3:1.7 src/external/bsd/file/dist/doc/libmagic.3:1.8 --- src/external/bsd/file/dist/doc/libmagic.3:1.7 Fri Sep 16 21:06:25 2011 +++ src/external/bsd/file/dist/doc/libmagic.3 Mon Oct 3 15:43:55 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: libmagic.3,v 1.7 2011/09/16 21:06:25 christos Exp $ +.\" $NetBSD: libmagic.3,v 1.8 2011/10/03 15:43:55 njoly Exp $ .\" .\" $File: libmagic.man,v 1.24 2011/05/13 22:11:44 christos Exp $ .\" @@ -54,9 +54,9 @@ .Ft int .Fn magic_errno "magic_t cookie" .Ft const char * -.Fn magic_descriptor "magic_t cookie, "int fd" +.Fn magic_descriptor "magic_t cookie" "int fd" .Ft const char * -.Fn magic_file "magic_t cookie, const char *filename" +.Fn magic_file "magic_t cookie" "const char *filename" .Ft const char * .Fn magic_buffer "magic_t cookie" "const void *buffer" "size_t length" .Ft int
CVS commit: src/external/bsd/file/dist/doc
Module Name:src Committed By: christos Date: Thu Nov 10 13:41:01 UTC 2011 Modified Files: src/external/bsd/file/dist/doc: libmagic.3 Log Message: PR/45595: bch: fix missing magic prefix To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/doc/libmagic.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/doc/libmagic.3 diff -u src/external/bsd/file/dist/doc/libmagic.3:1.8 src/external/bsd/file/dist/doc/libmagic.3:1.9 --- src/external/bsd/file/dist/doc/libmagic.3:1.8 Mon Oct 3 11:43:55 2011 +++ src/external/bsd/file/dist/doc/libmagic.3 Thu Nov 10 08:41:00 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: libmagic.3,v 1.8 2011/10/03 15:43:55 njoly Exp $ +.\" $NetBSD: libmagic.3,v 1.9 2011/11/10 13:41:00 christos Exp $ .\" .\" $File: libmagic.man,v 1.24 2011/05/13 22:11:44 christos Exp $ .\" @@ -128,7 +128,7 @@ Don't get extra information on MS Compos Don't look inside compressed files. .It Dv MAGIC_NO_CHECK_ELF Don't print ELF details. -.It Dv NO_CHECK_ENCODING +.It Dv MAGIC_NO_CHECK_ENCODING Don't check text encodings. .It Dv MAGIC_NO_CHECK_SOFT Don't consult magic files.
CVS commit: src/external/bsd/file/dist/doc
Module Name:src Committed By: wiz Date: Tue Nov 24 14:07:30 UTC 2009 Modified Files: src/external/bsd/file/dist/doc: libmagic.3 Log Message: Make Dt match installed file name. Addresses that part of misc/42349 that applies on -current. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/file/dist/doc/libmagic.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/doc/libmagic.3 diff -u src/external/bsd/file/dist/doc/libmagic.3:1.3 src/external/bsd/file/dist/doc/libmagic.3:1.4 --- src/external/bsd/file/dist/doc/libmagic.3:1.3 Fri May 8 20:26:48 2009 +++ src/external/bsd/file/dist/doc/libmagic.3 Tue Nov 24 14:07:30 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: libmagic.3,v 1.3 2009/05/08 20:26:48 wiz Exp $ +.\" $NetBSD: libmagic.3,v 1.4 2009/11/24 14:07:30 wiz Exp $ .\" .\" $File: libmagic.man,v 1.19 2008/10/06 20:16:04 christos Exp $ .\" @@ -28,7 +28,7 @@ .\" SUCH DAMAGE. .\" .Dd October 6, 2008 -.Dt MAGIC 3 +.Dt LIBMAGIC 3 .Os .Sh NAME .Nm magic_open ,
CVS commit: src/external/bsd/file/dist/src
Module Name:src Committed By: joerg Date: Fri Jun 13 13:38:53 UTC 2014 Modified Files: src/external/bsd/file/dist/src: readelf.c Log Message: Initialise all fields. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/src/readelf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/src/readelf.c diff -u src/external/bsd/file/dist/src/readelf.c:1.8 src/external/bsd/file/dist/src/readelf.c:1.9 --- src/external/bsd/file/dist/src/readelf.c:1.8 Fri Jun 13 02:08:06 2014 +++ src/external/bsd/file/dist/src/readelf.c Fri Jun 13 13:38:52 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: readelf.c,v 1.8 2014/06/13 02:08:06 christos Exp $ */ +/* $NetBSD: readelf.c,v 1.9 2014/06/13 13:38:52 joerg Exp $ */ /* * Copyright (c) Christos Zoulas 2003. * All Rights Reserved. @@ -31,7 +31,7 @@ #if 0 FILE_RCSID("@(#)$File: readelf.c,v 1.103 2014/05/02 02:25:10 christos Exp $") #else -__RCSID("$NetBSD: readelf.c,v 1.8 2014/06/13 02:08:06 christos Exp $"); +__RCSID("$NetBSD: readelf.c,v 1.9 2014/06/13 13:38:52 joerg Exp $"); #endif #endif @@ -473,8 +473,8 @@ private size_t donote(struct magic_set *ms, void *vbuf, size_t offset, size_t size, int clazz, int swap, size_t align, int *flags) { - Elf32_Nhdr nh32 = { 0 }; - Elf64_Nhdr nh64 = { 0 }; + Elf32_Nhdr nh32 = { 0, 0, 0 }; + Elf64_Nhdr nh64 = { 0, 0, 0 }; size_t noff, doff; #ifdef ELFCORE int os_style = -1;
CVS commit: src/external/bsd/file/dist/src
Module Name:src Committed By: christos Date: Thu Sep 11 13:30:04 UTC 2014 Modified Files: src/external/bsd/file/dist/src: encoding.c Log Message: PR/49192: remove dup assignment. To generate a diff of this commit: cvs rdiff -u -r1.1.1.5 -r1.2 src/external/bsd/file/dist/src/encoding.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/src/encoding.c diff -u src/external/bsd/file/dist/src/encoding.c:1.1.1.5 src/external/bsd/file/dist/src/encoding.c:1.2 --- src/external/bsd/file/dist/src/encoding.c:1.1.1.5 Thu Jun 12 21:48:22 2014 +++ src/external/bsd/file/dist/src/encoding.c Thu Sep 11 09:30:04 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: encoding.c,v 1.1.1.5 2014/06/13 01:48:22 christos Exp $ */ +/* $NetBSD: encoding.c,v 1.2 2014/09/11 13:30:04 christos Exp $ */ /* * Copyright (c) Ian F. Darwin 1986-1995. * Software written by Ian F. Darwin and others; @@ -39,7 +39,7 @@ #if 0 FILE_RCSID("@(#)$File: encoding.c,v 1.9 2013/11/19 20:45:50 christos Exp $") #else -__RCSID("$NetBSD: encoding.c,v 1.1.1.5 2014/06/13 01:48:22 christos Exp $"); +__RCSID("$NetBSD: encoding.c,v 1.2 2014/09/11 13:30:04 christos Exp $"); #endif #endif /* lint */ @@ -102,7 +102,6 @@ file_encoding(struct magic_set *ms, cons *code_mime = "utf-8"; } else if (file_looks_utf8(buf, nbytes, *ubuf, ulen) > 1) { DPRINTF(("utf8 %" SIZE_T_FORMAT "u\n", *ulen)); - *code = "UTF-8 Unicode (with BOM)"; *code = "UTF-8 Unicode"; *code_mime = "utf-8"; } else if ((ucs_type = looks_ucs16(buf, nbytes, *ubuf, ulen)) != 0) {
CVS commit: src/external/bsd/file/dist/src
Module Name:src Committed By: joerg Date: Tue Jan 7 02:12:07 UTC 2014 Modified Files: src/external/bsd/file/dist/src: file.h funcs.c Log Message: Format string checks for file_vprintf and file_error_core To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/src/file.h cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/src/funcs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/src/file.h diff -u src/external/bsd/file/dist/src/file.h:1.9 src/external/bsd/file/dist/src/file.h:1.10 --- src/external/bsd/file/dist/src/file.h:1.9 Sun Dec 1 19:32:15 2013 +++ src/external/bsd/file/dist/src/file.h Tue Jan 7 02:12:07 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: file.h,v 1.9 2013/12/01 19:32:15 christos Exp $ */ +/* $NetBSD: file.h,v 1.10 2014/01/07 02:12:07 joerg Exp $ */ /* * Copyright (c) Ian F. Darwin 1986-1995. @@ -417,7 +417,8 @@ protected int file_buffer(struct magic_s size_t); protected int file_fsmagic(struct magic_set *, const char *, struct stat *); protected int file_pipe2file(struct magic_set *, int, const void *, size_t); -protected int file_vprintf(struct magic_set *, const char *, va_list); +protected int file_vprintf(struct magic_set *, const char *, va_list) +__attribute__((__format__(__printf__, 2, 0))); protected size_t file_printedlen(const struct magic_set *); protected int file_replace(struct magic_set *, const char *, const char *); protected int file_printf(struct magic_set *, const char *, ...) Index: src/external/bsd/file/dist/src/funcs.c diff -u src/external/bsd/file/dist/src/funcs.c:1.6 src/external/bsd/file/dist/src/funcs.c:1.7 --- src/external/bsd/file/dist/src/funcs.c:1.6 Sun Dec 1 19:32:15 2013 +++ src/external/bsd/file/dist/src/funcs.c Tue Jan 7 02:12:07 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: funcs.c,v 1.6 2013/12/01 19:32:15 christos Exp $ */ +/* $NetBSD: funcs.c,v 1.7 2014/01/07 02:12:07 joerg Exp $ */ /* * Copyright (c) Christos Zoulas 2003. @@ -32,7 +32,7 @@ #if 0 FILE_RCSID("@(#)$File: funcs.c,v 1.64 2013/11/19 23:49:44 christos Exp $") #else -__RCSID("$NetBSD: funcs.c,v 1.6 2013/12/01 19:32:15 christos Exp $"); +__RCSID("$NetBSD: funcs.c,v 1.7 2014/01/07 02:12:07 joerg Exp $"); #endif #endif /* lint */ @@ -101,6 +101,7 @@ file_printf(struct magic_set *ms, const * error - print best error message possible */ /*VARARGS*/ +__attribute__((__format__(__printf__, 3, 0))) private void file_error_core(struct magic_set *ms, int error, const char *f, va_list va, size_t lineno)
CVS commit: src/external/bsd/file/dist/src
Module Name:src Committed By: joerg Date: Thu Jan 16 23:35:54 UTC 2014 Modified Files: src/external/bsd/file/dist/src: file.c Log Message: Mark some more dead functions. To generate a diff of this commit: cvs rdiff -u -r1.1.1.6 -r1.2 src/external/bsd/file/dist/src/file.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/src/file.c diff -u src/external/bsd/file/dist/src/file.c:1.1.1.6 src/external/bsd/file/dist/src/file.c:1.2 --- src/external/bsd/file/dist/src/file.c:1.1.1.6 Sun Dec 1 19:28:17 2013 +++ src/external/bsd/file/dist/src/file.c Thu Jan 16 23:35:54 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: file.c,v 1.1.1.6 2013/12/01 19:28:17 christos Exp $ */ +/* $NetBSD: file.c,v 1.2 2014/01/16 23:35:54 joerg Exp $ */ /* * Copyright (c) Ian F. Darwin 1986-1995. @@ -37,7 +37,7 @@ #if 0 FILE_RCSID("@(#)$File: file.c,v 1.152 2013/06/26 14:46:54 christos Exp $") #else -__RCSID("$NetBSD: file.c,v 1.1.1.6 2013/12/01 19:28:17 christos Exp $"); +__RCSID("$NetBSD: file.c,v 1.2 2014/01/16 23:35:54 joerg Exp $"); #endif #endif /* lint */ @@ -127,9 +127,9 @@ private const struct { private char *progname; /* used throughout */ -private void usage(void); +private void usage(void) __dead; private void docprint(const char *); -private void help(void); +private void help(void) __dead; private int unwrap(struct magic_set *, const char *); private int process(struct magic_set *ms, const char *, int);
CVS commit: src/external/bsd/file/dist/src
Module Name:src Committed By: joerg Date: Thu Jan 16 23:36:52 UTC 2014 Modified Files: src/external/bsd/file/dist/src: file.c Log Message: Only use __dead if it exists. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/file/dist/src/file.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/src/file.c diff -u src/external/bsd/file/dist/src/file.c:1.2 src/external/bsd/file/dist/src/file.c:1.3 --- src/external/bsd/file/dist/src/file.c:1.2 Thu Jan 16 23:35:54 2014 +++ src/external/bsd/file/dist/src/file.c Thu Jan 16 23:36:52 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: file.c,v 1.2 2014/01/16 23:35:54 joerg Exp $ */ +/* $NetBSD: file.c,v 1.3 2014/01/16 23:36:52 joerg Exp $ */ /* * Copyright (c) Ian F. Darwin 1986-1995. @@ -37,7 +37,7 @@ #if 0 FILE_RCSID("@(#)$File: file.c,v 1.152 2013/06/26 14:46:54 christos Exp $") #else -__RCSID("$NetBSD: file.c,v 1.2 2014/01/16 23:35:54 joerg Exp $"); +__RCSID("$NetBSD: file.c,v 1.3 2014/01/16 23:36:52 joerg Exp $"); #endif #endif /* lint */ @@ -127,9 +127,15 @@ private const struct { private char *progname; /* used throughout */ -private void usage(void) __dead; +#ifdef __dead +__dead +#endif +private void usage(void); private void docprint(const char *); -private void help(void) __dead; +#ifdef __dead +__dead +#endif +private void help(void); private int unwrap(struct magic_set *, const char *); private int process(struct magic_set *ms, const char *, int);
CVS commit: src/external/bsd/file/dist/magic/magdir
Module Name:src Committed By: mlelstv Date: Wed Sep 27 21:04:05 UTC 2017 Modified Files: src/external/bsd/file/dist/magic/magdir: netbsd Log Message: fix offset of segment count in NetBSD crashdump header. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/dist/magic/magdir/netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/magic/magdir/netbsd diff -u src/external/bsd/file/dist/magic/magdir/netbsd:1.4 src/external/bsd/file/dist/magic/magdir/netbsd:1.5 --- src/external/bsd/file/dist/magic/magdir/netbsd:1.4 Thu May 25 00:11:26 2017 +++ src/external/bsd/file/dist/magic/magdir/netbsd Wed Sep 27 21:04:05 2017 @@ -285,7 +285,7 @@ >0 belong&0xfc00 0x1000 \b, STACK >4 leshort x \b, (headersize = %d >6 leshort x \b, segmentsize = %d ->6 lelong x \b, segments = %d) +>8 lelong x \b, segments = %d) # little endian only for now. 0 name ktrace
CVS commit: src/external/bsd/file/dist/magic/magdir
Module Name:src Committed By: is Date: Sun Mar 8 17:54:23 UTC 2020 Modified Files: src/external/bsd/file/dist/magic/magdir: parix Log Message: mask was too loose, creating false positives. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/file/dist/magic/magdir/parix Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/magic/magdir/parix diff -u src/external/bsd/file/dist/magic/magdir/parix:1.1.1.2 src/external/bsd/file/dist/magic/magdir/parix:1.2 --- src/external/bsd/file/dist/magic/magdir/parix:1.1.1.2 Thu May 12 20:47:04 2011 +++ src/external/bsd/file/dist/magic/magdir/parix Sun Mar 8 17:54:23 2020 @@ -5,7 +5,7 @@ # Parix COFF executables # From: Ignatios Souvatzis # -0 beshort&0xfff 0xACE PARIX +0 beshort&0xefff 0x8ACE PARIX >0 byte&0xf0 0x80 T800 >0 byte&0xf0 0x90 T9000 >19 byte&0x02 0x02 executable
CVS commit: src/external/bsd/file/dist/magic/magdir
Module Name:src Committed By: christos Date: Tue Jan 1 03:12:31 UTC 2019 Modified Files: src/external/bsd/file/dist/magic/magdir: netbsd Log Message: bring detail from HEAD To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/magic/magdir/netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/magic/magdir/netbsd diff -u src/external/bsd/file/dist/magic/magdir/netbsd:1.6 src/external/bsd/file/dist/magic/magdir/netbsd:1.7 --- src/external/bsd/file/dist/magic/magdir/netbsd:1.6 Sun Apr 15 15:45:32 2018 +++ src/external/bsd/file/dist/magic/magdir/netbsd Mon Dec 31 22:12:30 2018 @@ -9,184 +9,149 @@ # in aout. # -0 belong&03 041400413 a.out NetBSD/i386 demand paged +0 name netbsd-detail +>20 lelong x @%#x +>4 lelong >0 \b+T=%d +>8 lelong >0 \b+D=%d +>12 lelong >0 \b+B=%d +>16 lelong >0 \b+S=%d +>24 lelong >0 \b+TR=%d +>28 lelong >0 \b+TD=%d + +0 name netbsd-4096 >0 byte &0x80 >>20 lelong <4096 shared library >>20 lelong =4096 dynamically linked executable >>20 lelong >4096 dynamically linked executable >0 byte ^0x80 executable >16 lelong >0 not stripped -0 belong&03 041400410 a.out NetBSD/i386 pure ->0 byte &0x80 dynamically linked executable + +0 name netbsd-8192 +>0 byte &0x80 +>>20 lelong <8192 shared library +>>20 lelong =8192 dynamically linked executable +>>20 lelong >8192 dynamically linked executable >0 byte ^0x80 executable >16 lelong >0 not stripped -0 belong&03 041400407 a.out NetBSD/i386 +>0 use netbsd-detail + +0 name netbsd-normal >0 byte &0x80 dynamically linked executable >0 byte ^0x80 >>0 byte &0x40 position independent >>20 lelong !0 executable >>20 lelong =0 object file >16 lelong >0 not stripped -0 belong&03 041400507 a.out NetBSD/i386 core +>0 use netbsd-detail + +0 name netbsd-pure +>0 byte &0x80 dynamically linked executable +>0 byte ^0x80 executable +>16 lelong >0 not stripped +>0 use netbsd-detail + +0 name netbsd-core >12 string >\0 from '%s' >32 lelong !0 (signal %d) +0 belong&03 041400413 a.out NetBSD/i386 demand paged +>0 use netbsd-4096 + +0 belong&03 041400410 a.out NetBSD/i386 pure +>0 use netbsd-pure + +0 belong&03 041400407 a.out NetBSD/i386 +>0 use netbsd-normal + +0 belong&03 041400507 a.out NetBSD/i386 core +>0 use netbsd-core + 0 belong&03 041600413 a.out NetBSD/m68k demand paged ->0 byte &0x80 ->>20 belong <8192 shared library ->>20 belong =8192 dynamically linked executable ->>20 belong >8192 dynamically linked executable ->0 byte ^0x80 executable ->16 belong >0 not stripped +>0 use \^netbsd-8192 + 0 belong&03 041600410 a.out NetBSD/m68k pure ->0 byte &0x80 dynamically linked executable ->0 byte ^0x80 executable ->16 belong >0 not stripped +>0 use \^netbsd-pure + 0 belong&03 041600407 a.out NetBSD/m68k ->0 byte &0x80 dynamically linked executable ->0 byte ^0x80 ->>0 byte &0x40 position independent ->>20 belong !0 executable ->>20 belong =0 object file ->16 belong >0 not stripped +>0 use \^netbsd-normal + 0 belong&03 041600507 a.out NetBSD/m68k core ->12 string >\0 from '%s' ->32 belong !0 (signal %d) +>0 use \^netbsd-core 0 belong&03 042000413 a.out NetBSD/m68k4k demand paged ->0 byte &0x80 ->>20 belong <4096 shared library ->>20 belong =4096 dynamically linked executable ->>20 belong >4096 dynamically linked executable ->0 byte ^0x80 executable ->16 belong >0 not stripped +>0 use \^netbsd-4096 + 0 belong&03 042000410 a.out NetBSD/m68k4k pure ->0 byte &0x80 dynamically linked executable ->0 byte ^0x80 executable ->16 belong >0 not stripped +>0 use \^netbsd-pure + 0 belong&03 042000407 a.out NetBSD/m68k4k ->0 byte &0x80 dynamically linked executable ->0 byte ^0x80 ->>0 byte &0x40 position independent ->>20 belong !0 executable ->>20 belong =0 object file ->16 belong >0 not stripped +>0 use \^netbsd-normal + 0 belong&03 042000507 a.out NetBSD/m68k4k core ->12 string >\0 from '%s' ->32 belong !0 (signal %d) +>0 use \^netbsd-core 0 belong&03 042200413 a.out NetBSD/ns32532 demand paged ->0 byte &0x80 ->>20 lelong <4096 shared library ->>20 lelong =4096 dynamically linked executable ->>20 lelong >4096 dynamically linked executable ->0 byte ^0x80 executable ->16 lelong >0 not stripped +>0 use netbsd-4096 + 0 belong&03 042200410 a.out NetBSD/ns32532 pure ->0 byte &0x80 dynamically linked executable ->0 byte ^0x80 executable ->16 lelong >0 not stripped +>0 use netbsd-pure + 0 belong&03 042200407 a.out NetBSD/ns32532 ->0 byte &0x80 dynamically linked executable ->0 byte ^0x80 ->
CVS commit: src/external/bsd/file/dist/magic/magdir
Module Name:src Committed By: christos Date: Fri Jan 4 00:49:45 UTC 2013 Modified Files: src/external/bsd/file/dist/magic/magdir: geo Log Message: magic bug. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/file/dist/magic/magdir/geo Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/magic/magdir/geo diff -u src/external/bsd/file/dist/magic/magdir/geo:1.1.1.2 src/external/bsd/file/dist/magic/magdir/geo:1.2 --- src/external/bsd/file/dist/magic/magdir/geo:1.1.1.2 Thu Jan 3 11:27:54 2013 +++ src/external/bsd/file/dist/magic/magdir/geo Thu Jan 3 19:49:44 2013 @@ -106,12 +106,12 @@ # Geospatial Designs http://www.geospatialdesigns.com/surfer6_format.htm 0 string DSBB Surfer 6 binary grid file -4 leshort x \b, %d -6 leshort x \bx%d -8 ledouble x \b, minx=%g -16 ledouble x \b, maxx=%g -24 ledouble x \b, miny=%g -32 ledouble x \b, maxy=%g -40 ledouble x \b, minz=%g -48 ledouble x \b, maxz=%g +>4 leshort x \b, %d +>6 leshort x \bx%d +>8 ledouble x \b, minx=%g +>16 ledouble x \b, maxx=%g +>24 ledouble x \b, miny=%g +>32 ledouble x \b, maxy=%g +>40 ledouble x \b, minz=%g +>48 ledouble x \b, maxz=%g
CVS commit: src/external/bsd/file/dist/magic/magdir
Module Name:src Committed By: christos Date: Fri Jan 4 17:33:01 UTC 2013 Modified Files: src/external/bsd/file/dist/magic/magdir: assembler Log Message: fix quoting. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/bsd/file/dist/magic/magdir/assembler Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/magic/magdir/assembler diff -u src/external/bsd/file/dist/magic/magdir/assembler:1.1.1.2 src/external/bsd/file/dist/magic/magdir/assembler:1.2 --- src/external/bsd/file/dist/magic/magdir/assembler:1.1.1.2 Thu Jan 3 11:27:53 2013 +++ src/external/bsd/file/dist/magic/magdir/assembler Fri Jan 4 12:33:01 2013 @@ -2,17 +2,17 @@ # $File: assembler,v 1.2 2012/10/31 18:41:42 christos Exp $ # make: file(1) magic for assembler source # -0 regex \^[\020\t]*\.asciiz\? assembler source text +0 regex \^[\020\t]*\\.asciiz assembler source text !:mime text/x-asm -0 regex \^[\020\t]*\.byte assembler source text +0 regex \^[\020\t]*\\.byte assembler source text !:mime text/x-asm -0 regex \^[\020\t]*\.even assembler source text +0 regex \^[\020\t]*\\.even assembler source text !:mime text/x-asm -0 regex \^[\020\t]*\.globl assembler source text +0 regex \^[\020\t]*\\.globl assembler source text !:mime text/x-asm -0 regex \^[\020\t]*\.text assembler source text +0 regex \^[\020\t]*\\.text assembler source text !:mime text/x-asm -0 regex \^[\020\t]*\.file assembler source text +0 regex \^[\020\t]*\\.file assembler source text !:mime text/x-asm -0 regex \^[\020\t]*\.type assembler source text +0 regex \^[\020\t]*\\.type assembler source text !:mime text/x-asm
CVS commit: src/external/bsd/file/dist/magic/magdir
Module Name:src Committed By: matt Date: Sun Aug 4 07:49:07 UTC 2013 Modified Files: src/external/bsd/file/dist/magic/magdir: elf Log Message: Print out BE8 and LE8 for arm elf To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/magic/magdir/elf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/magic/magdir/elf diff -u src/external/bsd/file/dist/magic/magdir/elf:1.6 src/external/bsd/file/dist/magic/magdir/elf:1.7 --- src/external/bsd/file/dist/magic/magdir/elf:1.6 Sat Mar 23 16:23:46 2013 +++ src/external/bsd/file/dist/magic/magdir/elf Sun Aug 4 07:49:07 2013 @@ -109,6 +109,8 @@ >>4 byte 1 >>>36 lelong&0xff00 0x0400 EABI4 >>>36 lelong&0xff00 0x0500 EABI5 +>>>36 lelong &0x0080 BE8 +>>>36 lelong &0x0040 LE8 >18 leshort 41 Alpha, >18 leshort 0xa390 IBM S/390 (obsolete), >18 leshort 42 Renesas SH,
CVS commit: src/external/bsd/file/dist/magic/magdir
Module Name:src Committed By: christos Date: Wed Feb 22 18:25:12 UTC 2012 Modified Files: src/external/bsd/file/dist/magic/magdir: elf Log Message: Look at the proper offsets for MD info, depending on the size of the binary 32 or 64. To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/file/dist/magic/magdir/elf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/magic/magdir/elf diff -u src/external/bsd/file/dist/magic/magdir/elf:1.1.1.3 src/external/bsd/file/dist/magic/magdir/elf:1.2 --- src/external/bsd/file/dist/magic/magdir/elf:1.1.1.3 Wed Feb 22 12:48:32 2012 +++ src/external/bsd/file/dist/magic/magdir/elf Wed Feb 22 13:25:12 2012 @@ -40,9 +40,10 @@ >>18 leshort 2 SPARC - invalid byte order, >>18 leshort 3 Intel 80386, >>18 leshort 4 Motorola ->>>36 lelong &0x0100 68000 - invalid byte order, ->>>36 lelong &0x0081 CPU32 - invalid byte order, ->>>36 lelong 0 68020 - invalid byte order, +>>>4 byte 1 +36 lelong &0x0100 68000 - invalid byte order, +36 lelong &0x0081 CPU32 - invalid byte order, +36 lelong 0 68020 - invalid byte order, >>18 leshort 5 Motorola 88000 - invalid byte order, >>18 leshort 6 Intel 80486, >>18 leshort 7 Intel 80860, @@ -50,9 +51,11 @@ # The second number (#10) will be deprecated later. For now, we still # say something if #10 is encountered, but only gory details for #8. >>18 leshort 8 MIPS, ->>>36 lelong &0x20 N32 +>>>4 byte 1 +36 lelong &0x20 N32 >>18 leshort 10 MIPS, ->>>36 lelong &0x20 N32 +>>>4 byte 1 +36 lelong &0x20 N32 >>18 leshort 8 # only for 32-bit >>>4 byte 1 @@ -80,8 +83,14 @@ >>18 leshort 10 MIPS (deprecated), >>18 leshort 11 RS6000 - invalid byte order, >>18 leshort 15 PA-RISC - invalid byte order, ->>>50 leshort 0x0214 2.0 ->>>48 leshort &0x0008 (LP64), +# only for 32-bit +>>>4 byte 1 +38 leshort 0x0214 2.0 +36 leshort &0x0008 (LP64) +# only for 64-bit +>>>4 byte 2 +50 leshort 0x0214 2.0 +48 leshort &0x0008 (LP64) >>18 leshort 16 nCUBE, >>18 leshort 17 Fujitsu VPP500, >>18 leshort 18 SPARC32PLUS - invalid byte order, @@ -157,7 +166,6 @@ >>18 leshort 0x9026 Alpha (unofficial), >>20 lelong 0 invalid version >>20 lelong 1 version 1 ->>36 lelong 1 MathCoPro/FPU/MAU Required >5 byte 2 MSB >>16 beshort 0 no file type, !:mime application/octet-stream @@ -177,17 +185,20 @@ >>18 beshort 2 SPARC, >>18 beshort 3 Intel 80386 - invalid byte order, >>18 beshort 4 Motorola ->>>36 belong &0x0100 68000, ->>>36 belong &0x0081 CPU32, ->>>36 belong 0 68020, +>>>4 byte 1 +36 belong &0x0100 68000, +36 belong &0x0081 CPU32, +36 belong 0 68020, >>18 beshort 5 Motorola 88000, >>18 beshort 6 Intel 80486 - invalid byte order, >>18 beshort 7 Intel 80860, # only for MIPS - see comment in little-endian section above. >>18 beshort 8 MIPS, ->>>36 belong &0x20 N32 +>>>4 byte 1 +36 belong &0x20 N32 >>18 beshort 10 MIPS, ->>>36 belong &0x20 N32 +>>>4 byte 1 +36 belong &0x20 N32 >>18 beshort 8 # only for 32-bit >>>4 byte 1 @@ -215,15 +226,23 @@ >>18 beshort 10 MIPS (deprecated), >>18 beshort 11 RS6000, >>18 beshort 15 PA-RISC ->>>50 beshort 0x0214 2.0 ->>>48 beshort &0x0008 (LP64) +# only for 32-bit +>>>4 byte 1 +38 beshort 0x0214 2.0 +36 beshort &0x0008 (LP64) +# only for 64-bit +>>>4 byte 2 +50 beshort 0x0214 2.0 +48 beshort &0x0008 (LP64) >>18 beshort 16 nCUBE, >>18 beshort 17 Fujitsu VPP500, >>18 beshort 18 SPARC32PLUS, ->>>36 belong&0x00 0x000100 V8+ Required, ->>>36 belong&0x00 0x000200 Sun UltraSPARC1 Extensions Required, ->>>36 belong&0x00 0x000400 HaL R1 Extensions Required, ->>>36 belong&0x00 0x000800 Sun UltraSPARC3 Extensions Required, +# only for 32-bit +>>>4 byte 1 +36 belong&0x00 0x000100 V8+ Required, +36 belong&0x00 0x000200 Sun UltraSPARC1 Extensions Required, +36 belong&0x00 0x000400 HaL R1 Extensions Required, +36 belong&0x00 0x000800 Sun UltraSPARC3 Extensions Required, >>18 beshort 20 PowerPC or cisco 4500, >>18 beshort 21 64-bit PowerPC or cisco 7500, >>18 beshort 22 IBM S/390, @@ -238,12 +257,13 @@ >>18 beshort 41 Alpha, >>18 beshort 42 Renesas SH, >>18 beshort 43 SPARC V9, ->>>48 belong&0x00 0x000200 Sun UltraSPARC1 Extensions Required, ->>>48 belong&0x00 0x000400 HaL R1 Extensions Required, ->>>48 belong&0x00 0x000800 Sun UltraSPARC3 Extensions Required, ->>>48 belong&0x3 0 total store ordering, ->>>48 belong&0x3 1 partial store ordering, ->>>48 belong&0x3 2 relaxed memory ordering, +>>>4 byte 2 +48 belong&0x00 0x000200 Sun UltraSPARC1 Extensions Required, +48 belong&0x00 0x000400 HaL R1 Extensions Required, +48 belong&0x00 0x
CVS commit: src/external/bsd/file/dist/magic/magdir
Module Name:src Committed By: matt Date: Sat Aug 4 15:51:20 UTC 2012 Modified Files: src/external/bsd/file/dist/magic/magdir: elf Log Message: Add EABI4 and EABI5 for arm To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/file/dist/magic/magdir/elf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/magic/magdir/elf diff -u src/external/bsd/file/dist/magic/magdir/elf:1.2 src/external/bsd/file/dist/magic/magdir/elf:1.3 --- src/external/bsd/file/dist/magic/magdir/elf:1.2 Wed Feb 22 18:25:12 2012 +++ src/external/bsd/file/dist/magic/magdir/elf Sat Aug 4 15:51:20 2012 @@ -101,6 +101,9 @@ >>18 leshort 38 TRW RH-32, >>18 leshort 39 Motorola RCE, >>18 leshort 40 ARM, +>>>4 byte 1 +36 lelong&0xff00 0x0400 EABI4 +36 lelong&0xff00 0x0500 EABI5 >>18 leshort 41 Alpha, >>18 leshort 0xa390 IBM S/390 (obsolete), >>18 leshort 42 Renesas SH, @@ -254,6 +257,9 @@ >>18 beshort 38 TRW RH-32, >>18 beshort 39 Motorola RCE, >>18 beshort 40 ARM, +>>>4 byte 2 +36 belong&0xff00 0x0400 EABI4 +36 belong&0xff00 0x0500 EABI5 >>18 beshort 41 Alpha, >>18 beshort 42 Renesas SH, >>18 beshort 43 SPARC V9,
CVS commit: src/external/bsd/file/dist/magic/magdir
Module Name:src Committed By: wiz Date: Sun Sep 13 22:16:45 UTC 2009 Modified Files: src/external/bsd/file/dist/magic/magdir: diff Log Message: Recognize bsdiff(1) files. Patch already sent upstream. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/file/dist/magic/magdir/diff Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/magic/magdir/diff diff -u src/external/bsd/file/dist/magic/magdir/diff:1.1.1.1 src/external/bsd/file/dist/magic/magdir/diff:1.2 --- src/external/bsd/file/dist/magic/magdir/diff:1.1.1.1 Fri May 8 16:35:08 2009 +++ src/external/bsd/file/dist/magic/magdir/diff Sun Sep 13 22:16:45 2009 @@ -12,3 +12,8 @@ 0 search/1 Index: RCS/CVS diff output text !:mime text/x-diff +# +#-- +# bsdiff: file(1) magic for bsdiff(1) output +# +0 string BSDIFF40 bsdiff(1) patch file
CVS commit: src/external/bsd/file/dist/magic/magdir
Module Name:src Committed By: christos Date: Wed Sep 28 13:50:52 UTC 2011 Modified Files: src/external/bsd/file/dist/magic/magdir: archive Log Message: comment out weak magic, from file HEAD. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/dist/magic/magdir/archive Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/magic/magdir/archive diff -u src/external/bsd/file/dist/magic/magdir/archive:1.4 src/external/bsd/file/dist/magic/magdir/archive:1.5 --- src/external/bsd/file/dist/magic/magdir/archive:1.4 Fri Sep 16 17:06:25 2011 +++ src/external/bsd/file/dist/magic/magdir/archive Wed Sep 28 09:50:52 2011 @@ -183,7 +183,7 @@ # MAR 2 string =-ah MAR archive data # ACB -0 belong&0x00f800ff 0x0080 ACB archive data +#0 belong&0x00f800ff 0x0080 ACB archive data # CPZ # TODO, this is what idarc says: 0 string \0\0\0 CPZ archive data # JRC
CVS commit: src/external/bsd/file/dist/magic/magdir
Module Name:src Committed By: christos Date: Mon Dec 8 20:54:33 UTC 2014 Modified Files: src/external/bsd/file/dist/magic/magdir: netbsd Log Message: fix bogus kernel core magic entries from file HEAD. To generate a diff of this commit: cvs rdiff -u -r1.1.1.5 -r1.2 src/external/bsd/file/dist/magic/magdir/netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/magic/magdir/netbsd diff -u src/external/bsd/file/dist/magic/magdir/netbsd:1.1.1.5 src/external/bsd/file/dist/magic/magdir/netbsd:1.2 --- src/external/bsd/file/dist/magic/magdir/netbsd:1.1.1.5 Thu Jun 12 21:48:25 2014 +++ src/external/bsd/file/dist/magic/magdir/netbsd Mon Dec 8 15:54:33 2014 @@ -1,6 +1,6 @@ #-- -# $File: netbsd,v 1.21 2014/03/29 15:40:34 christos Exp $ +# $File: netbsd,v 1.22 2014/12/08 20:53:52 christos Exp $ # netbsd: file(1) magic for NetBSD objects # # All new-style magic numbers are in network byte order. @@ -247,7 +247,7 @@ # Kernel core dump format 0 belong&0x 0x8fca NetBSD kernel core file >0 belong&0x03ff 0x \b, Unknown ->0 belong&0x03ff 0x1000 \b, sun 68010/68020 +>0 belong&0x03ff 0x0001 \b, sun 68010/68020 >0 belong&0x03ff 0x0002 \b, sun 68020 >0 belong&0x03ff 0x0064 \b, 386 PC >0 belong&0x03ff 0x0086 \b, i386 BSD @@ -262,20 +262,24 @@ >0 belong&0x03ff 0x008f \b, arm6 BSD >0 belong&0x03ff 0x0090 \b, m68k BSD (2K pages) >0 belong&0x03ff 0x0091 \b, sh3 BSD ->0 belong&0x03ff 0x0092 \b, ppc BSD (Big Endian) ->0 belong&0x03ff 0x0093 \b, vax BSD (4K pages) ->0 belong&0x03ff 0x0094 \b, mips1 BSD ->0 belong&0x03ff 0x0095 \b, mips2 BSD ->0 belong&0x03ff 0x0096 \b, parisc BSD ->0 belong&0x03ff 0x0097 \b, sh5/64 BSD ->0 belong&0x03ff 0x0098 \b, SPARC/64 BSD ->0 belong&0x03ff 0x0099 \b, amd64 BSD ->0 belong&0x03ff 0x009a \b, hp200 (68010) BSD ->0 belong&0x03ff 0x009b \b, hp300 (68020+68881) BSD ->0 belong&0x03ff 0x009b \b, hp300 (68020+68881) BSD ->0 belong&0x03ff 0x00c8 \b, hp200 ->0 belong&0x03ff 0x020b \b, hp300 (68020+68881) HP-UX ->0 belong&0x03ff 0x020c \b, hp300 (68020+68881) HP-UX +>0 belong&0x03ff 0x0095 \b, ppc BSD (Big Endian) +>0 belong&0x03ff 0x0096 \b, vax BSD (4K pages) +>0 belong&0x03ff 0x0097 \b, mips1 BSD +>0 belong&0x03ff 0x0098 \b, mips2 BSD +>0 belong&0x03ff 0x0099 \b, m88k BSD +>0 belong&0x03ff 0x0092 \b, parisc BSD +>0 belong&0x03ff 0x009b \b, sh5/64 BSD +>0 belong&0x03ff 0x009c \b, SPARC/64 BSD +>0 belong&0x03ff 0x009d \b, amd64 BSD +>0 belong&0x03ff 0x009e \b, sh5/32 BSD +>0 belong&0x03ff 0x009f \b, ia64 BSD +>0 belong&0x03ff 0x00b7 \b, aarch64 BSD +>0 belong&0x03ff 0x00b8 \b, or1k BSD +>0 belong&0x03ff 0x00b9 \b, Risk-V BSD +>0 belong&0x03ff 0x00c8 \b, hp200 BSD +>0 belong&0x03ff 0x012c \b, hp300 BSD +>0 belong&0x03ff 0x020b \b, hp800 HP-UX +>0 belong&0x03ff 0x020c \b, hp200/hp300 HP-UX >0 belong&0xfc00 0x0400 \b, CPU >0 belong&0xfc00 0x0800 \b, DATA >0 belong&0xfc00 0x1000 \b, STACK
CVS commit: src/external/bsd/file/dist/magic/magdir
Module Name:src Committed By: christos Date: Fri Jan 2 23:27:46 UTC 2015 Modified Files: src/external/bsd/file/dist/magic/magdir: jpeg Log Message: fix recursion To generate a diff of this commit: cvs rdiff -u -r1.1.1.6 -r1.2 src/external/bsd/file/dist/magic/magdir/jpeg Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/magic/magdir/jpeg diff -u src/external/bsd/file/dist/magic/magdir/jpeg:1.1.1.6 src/external/bsd/file/dist/magic/magdir/jpeg:1.2 --- src/external/bsd/file/dist/magic/magdir/jpeg:1.1.1.6 Fri Jan 2 15:34:28 2015 +++ src/external/bsd/file/dist/magic/magdir/jpeg Fri Jan 2 18:27:46 2015 @@ -1,6 +1,6 @@ #-- -# $File: jpeg,v 1.25 2015/01/02 16:56:50 christos Exp $ +# $File: jpeg,v 1.26 2015/01/02 22:40:27 christos Exp $ # JPEG images # SunOS 5.5.1 had # @@ -41,7 +41,8 @@ # This uses recursion... 0 name jpeg_segment >0 beshort 0xFFFE ->>(2.S+2) use jpeg_segment +# Recursion handled by FFE0 +#>>(2.S+2) use jpeg_segment >>2 pstring/HJ x \b, comment: "%s" >0 beshort 0xFFC0 @@ -70,6 +71,7 @@ >>(2.S+2) use jpeg_segment >0 beshort 0xFFE1 +# Recursion handled by FFE0 #>>(2.S+2) use jpeg_segment >>4 string Exif \b, Exif Standard: [ >>>10 indirect/r x @@ -85,7 +87,8 @@ # D9: End of image # Dn: Restart >0 beshort&0xFFD0 =0xFFD0 ->>(2.S+2) use jpeg_segment +>>0 beshort&0xFFE0 !0xFFE0 +>>>(2.S+2) use jpeg_segment #>0 beshort x unknown 0x%x #>>(2.S+2) use jpeg_segment
CVS commit: src/external/bsd/file/dist/magic/magdir
Module Name:src Committed By: christos Date: Fri Jan 2 23:38:45 UTC 2015 Modified Files: src/external/bsd/file/dist/magic/magdir: elf Log Message: add a clear that did not merge. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/external/bsd/file/dist/magic/magdir/elf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/magic/magdir/elf diff -u src/external/bsd/file/dist/magic/magdir/elf:1.12 src/external/bsd/file/dist/magic/magdir/elf:1.13 --- src/external/bsd/file/dist/magic/magdir/elf:1.12 Mon Oct 20 17:48:57 2014 +++ src/external/bsd/file/dist/magic/magdir/elf Fri Jan 2 18:38:45 2015 @@ -30,6 +30,7 @@ #>>>(0x38+0xcc) string >\0 of '%s' #>>>(0x38+0x10) lelong >0 (signal %d), >16 leshort &0xff00 processor-specific, +>18 clear x >18 leshort 0 no machine, >18 leshort 1 AT&T WE32100, >18 leshort 2 SPARC,
CVS commit: src/external/bsd/file/dist/magic/magdir
Module Name:src Committed By: matt Date: Fri Sep 19 08:59:38 UTC 2014 Modified Files: src/external/bsd/file/dist/magic/magdir: elf Log Message: Add UCB RISC-V EM value To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/magic/magdir/elf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/magic/magdir/elf diff -u src/external/bsd/file/dist/magic/magdir/elf:1.9 src/external/bsd/file/dist/magic/magdir/elf:1.10 --- src/external/bsd/file/dist/magic/magdir/elf:1.9 Fri Jun 13 02:08:06 2014 +++ src/external/bsd/file/dist/magic/magdir/elf Fri Sep 19 08:59:38 2014 @@ -257,6 +257,7 @@ >18 leshort 216 Cognitive Smart Memory, >18 leshort 217 iCelero CoolEngine, >18 leshort 218 Nanoradio Optimized RISC, +>18 leshort 243 UCB RISC-V >18 leshort 0x1057 AVR (unofficial), >18 leshort 0x1059 MSP430 (unofficial), >18 leshort 0x1223 Adapteva Epiphany (unofficial),
CVS commit: src/external/bsd/file/dist/magic/magdir
Module Name:src Committed By: christos Date: Sat Mar 23 16:23:46 UTC 2013 Modified Files: src/external/bsd/file/dist/magic/magdir: elf Log Message: remove extra space To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/dist/magic/magdir/elf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/magic/magdir/elf diff -u src/external/bsd/file/dist/magic/magdir/elf:1.5 src/external/bsd/file/dist/magic/magdir/elf:1.6 --- src/external/bsd/file/dist/magic/magdir/elf:1.5 Sat Mar 23 12:15:58 2013 +++ src/external/bsd/file/dist/magic/magdir/elf Sat Mar 23 12:23:46 2013 @@ -189,9 +189,9 @@ >4 byte 1 32-bit >4 byte 2 64-bit >5 byte 0 invalid byte order ->5 byte 1 LSB +>5 byte 1 LSB >>0 use elf-le ->5 byte 2 MSB +>5 byte 2 MSB >>0 use \^elf-le # Up to now only 0, 1 and 2 are defined; I've seen a file with 0x83, it seemed # like proper ELF, but extracting the string had bad results.