from ftp.astron.com, CDF security fixes
This commit is contained in:
christos
parent
0e7bd65839
commit
f50962bc3d
|
|
@ -1,3 +1,55 @@
|
|||
2012-02-20 17:33 Christos Zoulas <christos@zoulas.com>
|
||||
|
||||
* Fix CDF parsing issues found by CERT's fuzzing tool (Will Dormann)
|
||||
|
||||
2011-12-15 12:17 Chris Metcalf <cmetcalf@tilera.com>
|
||||
|
||||
* Support Tilera architectures (tile64, tilepro, tilegx).
|
||||
|
||||
2011-12-16 16:33 Reuben Thomas <rrt@sc3d.org>
|
||||
|
||||
* Add magic for /usr/bin/env Perl scripts
|
||||
* Weaken generic script magic to avoid clashing with
|
||||
language-specific magic.
|
||||
|
||||
2011-12-08 13:37 Reuben Thomas <rrt@sc3d.org>
|
||||
|
||||
* Simplify if (p) free(p) to free(p).
|
||||
|
||||
2011-12-08 13:07 Reuben Thomas <rrt@sc3d.org>
|
||||
|
||||
* Remove hardwired token finding (names.h), turning it into soft
|
||||
magic. Patterns are either anchored regexs or search/8192. English
|
||||
language detection and PL/1 detection have been removed as they
|
||||
were too fragile. -e tokens is still accepted for backwards
|
||||
compatibility.
|
||||
* Move 3ds patterns (which are commented out anyway) into autodesk
|
||||
(they were, oddly, in c-lang).
|
||||
|
||||
2011-12-06 00:16 Reuben Thomas <rrt@sc3d.org>
|
||||
|
||||
* Tweak strength of generic hash-bang detectors to be less than
|
||||
specific ones.
|
||||
* Make an inconsistent description of Python scripts consistent.
|
||||
|
||||
2011-12-05 23:58 Reuben Thomas <rrt@sc3d.org>
|
||||
|
||||
* Fix minor error in file(1).
|
||||
|
||||
2011-11-05 00:00 Reuben Thomas <rrt@sc3d.org>
|
||||
|
||||
* Fix issue #150 (I hope).
|
||||
|
||||
2011-09-22 12:57 Christos Zoulas <christos@zoulas.com>
|
||||
|
||||
* Python3 binding fixes from Kelly Anderson
|
||||
|
||||
2011-09-20 11:32 Christos Zoulas <christos@zoulas.com>
|
||||
|
||||
* If a string type magic entry is marked as text or binary
|
||||
only match text files against text entries and binary
|
||||
files against binary entries.
|
||||
|
||||
2011-09-01 12:12 Christos Zoulas <christos@zoulas.com>
|
||||
|
||||
* Don't wait for any subprocess, just the one we forked.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
#------------------------------------------------------------------------------
|
||||
# $File: assembler,v 1.1 2011/12/08 12:12:46 rrt Exp $
|
||||
# make: file(1) magic for assembler source
|
||||
#
|
||||
0 regex \^\.asciiz\? assembler source text
|
||||
!:mime text/x-asm
|
||||
0 regex \^\.byte assembler source text
|
||||
!:mime text/x-asm
|
||||
0 regex \^\.even assembler source text
|
||||
!:mime text/x-asm
|
||||
0 regex \^\.globl assembler source text
|
||||
!:mime text/x-asm
|
||||
0 regex \^\.text assembler source text
|
||||
!:mime text/x-asm
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
#------------------------------------------------------------------------------
|
||||
# $File: audio,v 1.63 2011/09/06 11:00:06 christos Exp $
|
||||
# $File: audio,v 1.64 2012/02/20 16:37:34 christos Exp $
|
||||
# audio: file(1) magic for sound formats (see also "iff")
|
||||
#
|
||||
# Jan Nicolai Langfeldt (janl@ifi.uio.no), Dan Quinlan (quinlan@yggdrasil.com),
|
||||
|
|
@ -491,6 +491,7 @@
|
|||
# From danny.milo@gmx.net (Danny Milosavljevic)
|
||||
# New version from Abel Cheung <abel (@) oaka.org>
|
||||
0 string MAC\040 Monkey's Audio compressed format
|
||||
!:mime audio/x-ape
|
||||
>4 uleshort >0x0F8B version %d
|
||||
>>(0x08.l) uleshort =1000 with fast compression
|
||||
>>(0x08.l) uleshort =2000 with normal compression
|
||||
|
|
|
|||
|
|
@ -1,21 +1,49 @@
|
|||
|
||||
#------------------------------------------------------------------------------
|
||||
# $File: c-lang,v 1.14 2009/09/19 16:28:08 christos Exp $
|
||||
# c-lang: file(1) magic for C programs (or REXX)
|
||||
# $File: c-lang,v 1.16 2011/12/09 08:02:16 rrt Exp $
|
||||
# c-lang: file(1) magic for C and related languages programs
|
||||
#
|
||||
|
||||
# XPM icons (Greg Roelofs, newt@uchicago.edu)
|
||||
# if you uncomment "/*" for C/REXX below, also uncomment this entry
|
||||
#0 string /*\ XPM\ */ X pixmap image data
|
||||
#!:mime image/x-xpmi
|
||||
# BCPL
|
||||
0 search/8192 "libhdr" BCPL source text
|
||||
!:mime text/x-bcpl
|
||||
0 search/8192 "LIBHDR" BCPL source text
|
||||
!:mime text/x-bcpl
|
||||
|
||||
# 3DS (3d Studio files) Conflicts with diff output 0x3d '='
|
||||
#16 beshort 0x3d3d image/x-3ds
|
||||
# C
|
||||
0 regex \^#include C source text
|
||||
!:mime text/x-c
|
||||
0 regex \^char C source text
|
||||
!:mime text/x-c
|
||||
0 regex \^double C source text
|
||||
!:mime text/x-c
|
||||
0 regex \^extern C source text
|
||||
!:mime text/x-c
|
||||
0 regex \^float C source text
|
||||
!:mime text/x-c
|
||||
0 regex \^struct C source text
|
||||
!:mime text/x-c
|
||||
0 regex \^union C source text
|
||||
!:mime text/x-c
|
||||
0 search/8192 main( C source text
|
||||
!:mime text/x-c
|
||||
|
||||
# this first will upset you if you're a PL/1 shop...
|
||||
# in which case rm it; ascmagic will catch real C programs
|
||||
#0 search/1 /* C or REXX program text
|
||||
#0 search/1 // C++ program text
|
||||
# C++
|
||||
# The strength of these rules is increased so they beat the C rules above
|
||||
0 regex \^template C++ source text
|
||||
!:strength + 10
|
||||
!:mime text/x-c++
|
||||
0 regex \^virtual C++ source text
|
||||
!:strength + 10
|
||||
!:mime text/x-c++
|
||||
0 regex \^class C++ source text
|
||||
!:strength + 10
|
||||
!:mime text/x-c++
|
||||
0 regex \^public: C++ source text
|
||||
!:strength + 10
|
||||
!:mime text/x-c++
|
||||
0 regex \^private: C++ source text
|
||||
!:strength + 10
|
||||
!:mime text/x-c++
|
||||
|
||||
# From: Mikhail Teterin <mi@aldan.algebra.com>
|
||||
0 string cscope cscope reference data
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
#------------------------------------------------------------------------------
|
||||
# $File: cad,v 1.10 2010/12/25 14:33:43 christos Exp $
|
||||
# $File: cad,v 1.11 2011/12/08 12:12:46 rrt Exp $
|
||||
# autocad: file(1) magic for cad files
|
||||
#
|
||||
|
||||
|
|
@ -113,3 +113,6 @@
|
|||
0 string AC1012 AutoDesk AutoCAD R13
|
||||
0 string AC1014 AutoDesk AutoCAD R14
|
||||
0 string AC1015 AutoDesk AutoCAD R2000
|
||||
|
||||
# 3DS (3d Studio files) Conflicts with diff output 0x3d '='
|
||||
#16 beshort 0x3d3d image/x-3ds
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
#------------------------------------------------------------------------------
|
||||
# $File: commands,v 1.41 2011/05/02 12:36:41 christos Exp $
|
||||
# $File: commands,v 1.42 2011/12/05 23:14:02 rrt Exp $
|
||||
# commands: file(1) magic for various shells and interpreters
|
||||
#
|
||||
#0 string/w : shell archive or script for antique kernel text
|
||||
|
|
@ -64,12 +64,6 @@
|
|||
0 string/wt #!\ /usr/local/bin/bash Bourne-Again shell script text executable
|
||||
!:mime text/x-shellscript
|
||||
|
||||
# using env
|
||||
0 string/t #!/usr/bin/env a
|
||||
>15 string/t >\0 %s script text executable
|
||||
0 string/t #!\ /usr/bin/env a
|
||||
>16 string/t >\0 %s script text executable
|
||||
|
||||
# PHP scripts
|
||||
# Ulf Harnhammar <ulfh@update.uu.se>
|
||||
0 search/1/c =<?php PHP script text
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#------------------------------------------------------------------------------
|
||||
# $File: compress,v 1.47 2011/03/08 00:39:46 christos Exp $
|
||||
# $File: compress,v 1.49 2011/12/07 22:04:27 christos Exp $
|
||||
# compress: file(1) magic for pure-compression formats (no archives)
|
||||
#
|
||||
# compress, gzip, pack, compact, huf, squeeze, crunch, freeze, yabba, etc.
|
||||
|
|
@ -190,9 +190,10 @@
|
|||
!:mime application/x-7z-compressed
|
||||
|
||||
# Type: LZMA
|
||||
0 lelong 0x8000005d LZMA compressed data,
|
||||
>5 lequad =0xffffffffffffffff streamed
|
||||
>5 lequad !0xffffffffffffffff non-streamed, size %lld
|
||||
0 lelong&0xffffff =0x5d
|
||||
>12 leshort =0xff LZMA compressed data,
|
||||
>>5 lequad =0xffffffffffffffff streamed
|
||||
>>5 lequad !0xffffffffffffffff non-streamed, size %lld
|
||||
!:mime application/x-lzma
|
||||
|
||||
# http://tukaani.org/xz/xz-file-format.txt
|
||||
|
|
|
|||
|
|
@ -0,0 +1,82 @@
|
|||
|
||||
#------------------------------------------------------------------------------
|
||||
# $File: cups,v 1.1 2011/11/10 18:59:54 christos Exp $
|
||||
# Cups: file(1) magic for the cups raster file format
|
||||
# From: Laurent Martelli <martellilaurent@gmail.com>
|
||||
# http://www.cups.org/documentation.php/spec-raster.html
|
||||
#
|
||||
|
||||
# Cups Raster image format, Big Endian
|
||||
0 string RaS
|
||||
!:mime application/vnd.cups-raster
|
||||
>3 string t Cups Raster version 1, Big Endian
|
||||
>3 string 2 Cups Raster version 2, Big Endian
|
||||
>3 string 3 Cups Raster version 3, Big Endian
|
||||
>280 belong x \b, %d
|
||||
>284 belong x \bx%d dpi
|
||||
>376 belong x \b, %dx
|
||||
>380 belong x \b%d pixels
|
||||
>388 belong x %d bits/color
|
||||
>392 belong x %d bits/pixel
|
||||
>400 belong 0 ColorOrder=Chunky
|
||||
>400 belong 1 ColorOrder=Banded
|
||||
>400 belong 2 ColorOrder=Planar
|
||||
>404 belong 0 ColorSpace=gray
|
||||
>404 belong 1 ColorSpace=RGB
|
||||
>404 belong 2 ColorSpace=RGBA
|
||||
>404 belong 3 ColorSpace=black
|
||||
>404 belong 4 ColorSpace=CMY
|
||||
>404 belong 5 ColorSpace=YMC
|
||||
>404 belong 6 ColorSpace=CMYK
|
||||
>404 belong 7 ColorSpace=YMCK
|
||||
>404 belong 8 ColorSpace=KCMY
|
||||
>404 belong 9 ColorSpace=KCMYcm
|
||||
>404 belong 10 ColorSpace=GMCK
|
||||
>404 belong 11 ColorSpace=GMCS
|
||||
>404 belong 12 ColorSpace=WHITE
|
||||
>404 belong 13 ColorSpace=GOLD
|
||||
>404 belong 14 ColorSpace=SILVER
|
||||
>404 belong 15 ColorSpace=CIE XYZ
|
||||
>404 belong 16 ColorSpace=CIE Lab
|
||||
>404 belong 17 ColorSpace=RGBW
|
||||
>404 belong 18 ColorSpace=sGray
|
||||
>404 belong 19 ColorSpace=sRGB
|
||||
>404 belong 20 ColorSpace=AdobeRGB
|
||||
|
||||
|
||||
# Cups Raster image format, Little Endian
|
||||
1 string SaR
|
||||
>0 string t Cups Raster version 1, Little Endian
|
||||
>0 string 2 Cups Raster version 2, Little Endian
|
||||
>0 string 3 Cups Raster version 3, Little Endian
|
||||
!:mime application/vnd.cups-raster
|
||||
>280 lelong x \b, %d
|
||||
>284 lelong x \bx%d dpi
|
||||
>376 lelong x \b, %dx
|
||||
>380 lelong x \b%d pixels
|
||||
>388 lelong x %d bits/color
|
||||
>392 lelong x %d bits/pixel
|
||||
>400 lelong 0 ColorOrder=Chunky
|
||||
>400 lelong 1 ColorOrder=Banded
|
||||
>400 lelong 2 ColorOrder=Planar
|
||||
>404 lelong 0 ColorSpace=gray
|
||||
>404 lelong 1 ColorSpace=RGB
|
||||
>404 lelong 2 ColorSpace=RGBA
|
||||
>404 lelong 3 ColorSpace=black
|
||||
>404 lelong 4 ColorSpace=CMY
|
||||
>404 lelong 5 ColorSpace=YMC
|
||||
>404 lelong 6 ColorSpace=CMYK
|
||||
>404 lelong 7 ColorSpace=YMCK
|
||||
>404 lelong 8 ColorSpace=KCMY
|
||||
>404 lelong 9 ColorSpace=KCMYcm
|
||||
>404 lelong 10 ColorSpace=GMCK
|
||||
>404 lelong 11 ColorSpace=GMCS
|
||||
>404 lelong 12 ColorSpace=WHITE
|
||||
>404 lelong 13 ColorSpace=GOLD
|
||||
>404 lelong 14 ColorSpace=SILVER
|
||||
>404 lelong 15 ColorSpace=CIE XYZ
|
||||
>404 lelong 16 ColorSpace=CIE Lab
|
||||
>404 lelong 17 ColorSpace=RGBW
|
||||
>404 lelong 18 ColorSpace=sGray
|
||||
>404 lelong 19 ColorSpace=sRGB
|
||||
>404 lelong 20 ColorSpace=AdobeRGB
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
#------------------------------------------------------------------------------
|
||||
# $File: elf,v 1.53 2009/09/19 16:28:09 christos Exp $
|
||||
# $File: elf,v 1.54 2011/12/17 17:16:29 christos Exp $
|
||||
# elf: file(1) magic for ELF executables
|
||||
#
|
||||
# We have to check the byte order flag to see what byte order all the
|
||||
|
|
@ -149,6 +149,9 @@
|
|||
>>18 leshort 106 Analog Devices Blackfin,
|
||||
>>18 leshort 113 Altera Nios II,
|
||||
>>18 leshort 0xae META,
|
||||
>>18 leshort 187 Tilera TILE64,
|
||||
>>18 leshort 188 Tilera TILEPro,
|
||||
>>18 leshort 191 Tilera TILE-Gx,
|
||||
>>18 leshort 0x3426 OpenRISC (obsolete),
|
||||
>>18 leshort 0x8472 OpenRISC (obsolete),
|
||||
>>18 leshort 0x9026 Alpha (unofficial),
|
||||
|
|
@ -259,6 +262,9 @@
|
|||
>>18 leshort 0x8472 OpenRISC (obsolete),
|
||||
>>18 beshort 94 Tensilica Xtensa,
|
||||
>>18 beshort 97 NatSemi 32k,
|
||||
>>18 beshort 187 Tilera TILE64,
|
||||
>>18 beshort 188 Tilera TILEPro,
|
||||
>>18 beshort 191 Tilera TILE-Gx,
|
||||
>>18 beshort 0x18ad AVR32 (unofficial),
|
||||
>>18 beshort 0x9026 Alpha (unofficial),
|
||||
>>18 beshort 0xa390 IBM S/390 (obsolete),
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
#------------------------------------------------------------------------------
|
||||
# $File: games,v 1.12 2010/11/25 15:00:12 christos Exp $
|
||||
# $File: games,v 1.13 2012/02/13 22:50:50 christos Exp $
|
||||
# games: file(1) for games
|
||||
|
||||
# Fabio Bonelli <fabiobonelli@libero.it>
|
||||
|
|
@ -255,3 +255,11 @@
|
|||
>2 regex/c GM\\[19\\] - Octi Game
|
||||
>2 regex/c GM\\[20\\] - Gess Game
|
||||
>2 regex/c GM\\[21\\] - twix Game
|
||||
|
||||
# Epic Games/Unreal Engine Package
|
||||
#
|
||||
0 lelong 0x9E2A83C1 Unreal Engine Package,
|
||||
>4 leshort x version: %i
|
||||
>12 lelong !0 \b, names: %i
|
||||
>28 lelong !0 \b, imports: %i
|
||||
>20 lelong !0 \b, exports: %i
|
||||
|
|
|
|||
|
|
@ -1,19 +1,28 @@
|
|||
|
||||
#------------------------------------------------------------------------------
|
||||
# $File: gnu,v 1.11 2009/09/19 16:28:09 christos Exp $
|
||||
# $File: gnu,v 1.13 2012/01/03 17:16:54 christos Exp $
|
||||
# gnu: file(1) magic for various GNU tools
|
||||
#
|
||||
# GNU nlsutils message catalog file format
|
||||
#
|
||||
# GNU message catalog (.mo and .gmo files)
|
||||
|
||||
0 string \336\22\4\225 GNU message catalog (little endian),
|
||||
>4 lelong x revision %d,
|
||||
>8 lelong x %d messages
|
||||
>6 leshort x revision %d.
|
||||
>4 leshort >0 \b%d,
|
||||
>>8 lelong x %d messages,
|
||||
>>36 lelong x %d sysdep messages
|
||||
>4 leshort =0 \b%d,
|
||||
>>8 lelong x %d messages
|
||||
|
||||
0 string \225\4\22\336 GNU message catalog (big endian),
|
||||
>4 belong x revision %d,
|
||||
>8 belong x %d messages
|
||||
# message catalogs, from Mitchum DSouza <m.dsouza@mrc-apu.cam.ac.uk>
|
||||
0 string *nazgul* Nazgul style compiled message catalog
|
||||
>8 lelong >0 \b, version %ld
|
||||
>4 beshort x revision %d.
|
||||
>6 beshort >0 \b%d,
|
||||
>>8 belong x %d messages,
|
||||
>>36 belong x %d sysdep messages
|
||||
>6 beshort =0 \b%d,
|
||||
>>8 belong x %d messages
|
||||
|
||||
|
||||
# GnuPG
|
||||
# The format is very similar to pgp
|
||||
|
|
@ -42,3 +51,7 @@
|
|||
# Files produced by GNU gettext
|
||||
0 long 0xDE120495 GNU-format message catalog data
|
||||
0 long 0x950412DE GNU-format message catalog data
|
||||
|
||||
# gettext message catalogue
|
||||
0 regex \^msgid\ GNU gettext message catalogue text
|
||||
!:mime text/x-po
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
|
||||
#------------------------------------------------------------------------------
|
||||
# $File: guile,v 1.1 2011/12/16 17:44:33 christos Exp $
|
||||
# Guile file magic from <dalepsmith@gmail.com>
|
||||
# http://www.gnu.org/s/guile/
|
||||
# http://git.savannah.gnu.org/gitweb/?p=guile.git;f=libguile/_scm.h;hb=HEAD#l250
|
||||
|
||||
0 string GOOF---- Guile Object
|
||||
>8 string LE \b, little endian
|
||||
>8 string BE \b, big endian
|
||||
>11 string 4 \b, 32bit
|
||||
>11 string 8 \b, 64bit
|
||||
>13 regex .\.. \b, bytecode v%s
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
#------------------------------------------------------------------------------
|
||||
# $File: images,v 1.70 2010/11/25 15:00:12 christos Exp $
|
||||
# $File: images,v 1.72 2011/12/08 12:12:46 rrt Exp $
|
||||
# images: file(1) magic for image formats (see also "iff", and "c-lang" for
|
||||
# XPM bitmaps)
|
||||
#
|
||||
|
|
@ -90,6 +90,11 @@
|
|||
0 string II\x2a\x00 TIFF image data, little-endian
|
||||
!:mime image/tiff
|
||||
|
||||
0 string MM\x00\x2b Big TIFF image data, big-endian
|
||||
!:mime image/tiff
|
||||
0 string II\x2b\x00 Big TIFF image data, little-endian
|
||||
!:mime image/tiff
|
||||
|
||||
# PNG [Portable Network Graphics, or "PNG's Not GIF"] images
|
||||
# (Greg Roelofs, newt@uchicago.edu)
|
||||
# (Albert Cahalan, acahalan@cs.uml.edu)
|
||||
|
|
@ -228,8 +233,8 @@
|
|||
#0 string BA PC bitmap array data
|
||||
|
||||
# XPM icons (Greg Roelofs, newt@uchicago.edu)
|
||||
# note possible collision with C/REXX entry in c-lang; currently commented out
|
||||
0 search/1 /*\ XPM\ */ X pixmap image text
|
||||
!:mime image/x-xpmi
|
||||
|
||||
# Utah Raster Toolkit RLE images (janl@ifi.uio.no)
|
||||
0 leshort 0xcc52 RLE image data,
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
#------------------------------------------------------------
|
||||
# $File: java,v 1.12 2009/09/19 16:28:10 christos Exp $
|
||||
# $File: java,v 1.13 2011/12/08 12:12:46 rrt Exp $
|
||||
# Java ByteCode and Mach-O binaries (e.g., Mac OS X) use the
|
||||
# same magic number, 0xcafebabe, so they are both handled
|
||||
# in the entry called "cafebabe".
|
||||
|
|
@ -24,3 +24,6 @@
|
|||
>0 regex dey\n[0-9][0-9][0-9]\0 Dalvik dex file (optimized for host)
|
||||
>4 string >000 version %s
|
||||
|
||||
# Java source
|
||||
0 regex ^import.*;$ Java source
|
||||
!:mime text/x-java
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
#------------------------------------------------------------------------------
|
||||
# $File: linux,v 1.41 2011/04/20 18:57:10 christos Exp $
|
||||
# $File: linux,v 1.42 2012/02/07 21:35:03 christos Exp $
|
||||
# linux: file(1) magic for Linux files
|
||||
#
|
||||
# Values for Linux/i386 binaries, from Daniel Quinlan <quinlan@yggdrasil.com>
|
||||
|
|
@ -182,6 +182,11 @@
|
|||
>>&0 string \x80\x00\x20\x00\x00\x00\x00\x00 Z990 32bit kernel
|
||||
>>&0 string \x80\x00\x00\x00\x00\x00\x00\x00 Z900 32bit kernel
|
||||
|
||||
# Linux ARM compressed kernel image
|
||||
# From: Kevin Cernekee <cernekee@gmail.com>
|
||||
36 lelong 0x016f2818 Linux kernel ARM boot executable zImage (little-endian)
|
||||
36 belong 0x016f2818 Linux kernel ARM boot executable zImage (big-endian)
|
||||
|
||||
############################################################################
|
||||
# Linux 8086 executable
|
||||
0 lelong&0xFF0000FF 0xC30000E9 Linux-Dev86 executable, headerless
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
#------------------------------------------------------------------------------
|
||||
# $File: m4,v 1.1 2011/12/08 12:12:46 rrt Exp $
|
||||
# make: file(1) magic for M4 scripts
|
||||
#
|
||||
0 regex \^dnl\ M4 macro processor script text
|
||||
!:mime text/x-m4
|
||||
|
|
@ -1,11 +1,9 @@
|
|||
|
||||
#------------------------------------------------------------------------------
|
||||
# $File: mail.news,v 1.19 2011/01/25 13:55:57 christos Exp $
|
||||
# $File: mail.news,v 1.20 2011/12/08 12:12:46 rrt Exp $
|
||||
# mail.news: file(1) magic for mail and news
|
||||
#
|
||||
# Unfortunately, saved netnews also has From line added in some news software.
|
||||
#0 string From mail text
|
||||
# There are tests to ascmagic.c to cope with mail and news.
|
||||
0 string/t Relay-Version: old news text
|
||||
!:mime message/rfc822
|
||||
0 string/t #!\ rnews batched news text
|
||||
|
|
@ -16,7 +14,9 @@
|
|||
!:mime message/rfc822
|
||||
0 string/t Pipe\ to mail piping text
|
||||
!:mime message/rfc822
|
||||
0 string/t Return-Path: smtp mail text
|
||||
0 string/t Delivered-To: SMTP mail text
|
||||
!:mime message/rfc822
|
||||
0 string/t Return-Path: SMTP mail text
|
||||
!:mime message/rfc822
|
||||
0 string/t Path: news text
|
||||
!:mime message/news
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
#------------------------------------------------------------------------------
|
||||
# $File: make,v 1.1 2011/12/08 12:12:46 rrt Exp $
|
||||
# make: file(1) magic for makefiles
|
||||
#
|
||||
0 regex \^CFLAGS makefile script text
|
||||
!:mime text/x-makefile
|
||||
0 regex \^LDFLAGS makefile script text
|
||||
!:mime text/x-makefile
|
||||
0 regex \^all: makefile script text
|
||||
!:mime text/x-makefile
|
||||
0 regex \^.PRECIOUS makefile script text
|
||||
!:mime text/x-makefile
|
||||
|
||||
0 regex \^SUBDIRS automake makefile script text
|
||||
!:mime text/x-makefile
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
#------------------------------------------------------------------------------
|
||||
# $File: msdos,v 1.75 2011/08/08 08:56:17 christos Exp $
|
||||
# $File: msdos,v 1.77 2011/12/07 22:05:05 christos Exp $
|
||||
# msdos: file(1) magic for MS-DOS files
|
||||
#
|
||||
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
#
|
||||
# Many of the compressed formats were extraced from IDARC 1.23 source code.
|
||||
#
|
||||
0 string MZ
|
||||
0 string/b MZ
|
||||
!:mime application/x-dosexec
|
||||
# All non-DOS EXE extensions have the relocation table more than 0x40 bytes into the file.
|
||||
>0x18 leshort <0x40 MS-DOS executable
|
||||
|
|
@ -294,7 +294,7 @@
|
|||
# added by Joerg Jenderek of http://www.freedos.org/software/?prog=kc
|
||||
# and http://www.freedos.org/software/?prog=kpdos
|
||||
# for FreeDOS files like KEYBOARD.SYS, KEYBRD2.SYS, KEYBRD3.SYS, *.KBD
|
||||
0 string KCF FreeDOS KEYBoard Layout collection
|
||||
0 string/b KCF FreeDOS KEYBoard Layout collection
|
||||
# only version=0x100 found
|
||||
>3 uleshort x \b, version 0x%x
|
||||
# length of string containing author,info and special characters
|
||||
|
|
@ -305,7 +305,7 @@
|
|||
#>>>&0 string x \b%-s
|
||||
>>>&0 string x \b%-.15s
|
||||
# for FreeDOS *.KL files
|
||||
0 string KLF FreeDOS KEYBoard Layout file
|
||||
0 string/b KLF FreeDOS KEYBoard Layout file
|
||||
# only version=0x100 or 0x101 found
|
||||
>3 uleshort x \b, version 0x%x
|
||||
# stringlength
|
||||
|
|
@ -402,12 +402,12 @@
|
|||
# byte 0xeb conflicts with "sequent" magic leshort 0xn2eb
|
||||
0 ubeshort&0xeb8d >0xeb00
|
||||
# DR-DOS STACKER.COM SCREATE.SYS missed
|
||||
>0 byte 0xeb DOS executable (COM)
|
||||
>>0x1FE leshort 0xAA55 \b, boot code
|
||||
>>85 string UPX \b, UPX compressed
|
||||
>>4 string \ $ARX \b, ARX self-extracting archive
|
||||
>>4 string \ $LHarc \b, LHarc self-extracting archive
|
||||
>>0x20e string SFX\ by\ LARC \b, LARC self-extracting archive
|
||||
>0 byte 0xeb
|
||||
>>0x1FE leshort 0xAA55 DOS executable (COM), boot code
|
||||
>>85 string UPX DOS executable (COM), UPX compressed
|
||||
>>4 string \ $ARX DOS executable (COM), ARX self-extracting archive
|
||||
>>4 string \ $LHarc DOS executable (COM), LHarc self-extracting archive
|
||||
>>0x20e string SFX\ by\ LARC DOS executable (COM), LARC self-extracting archive
|
||||
# updated by Joerg Jenderek at Oct 2008
|
||||
#0 byte 0xb8 COM executable
|
||||
0 uleshort&0x80ff 0x00b8
|
||||
|
|
@ -421,11 +421,11 @@
|
|||
# syslinux:doc/comboot.txt
|
||||
# A COM32R program must start with the byte sequence B8 FE 4C CD 21 (mov
|
||||
# eax,21cd4cfeh) as a magic number.
|
||||
0 string \xb8\xfe\x4c\xcd\x21 COM executable (COM32R)
|
||||
0 string/b \xb8\xfe\x4c\xcd\x21 COM executable (COM32R)
|
||||
# start with assembler instructions mov eax,21cd4cfeh
|
||||
0 uleshort&0xc0ff 0xc0b8
|
||||
>1 lelong 0x21cd4cfe COM executable (32-bit COMBOOT, relocatable)
|
||||
0 string \x81\xfc
|
||||
0 string/b \x81\xfc
|
||||
>4 string \x77\x02\xcd\x20\xb9
|
||||
>>36 string UPX! FREE-DOS executable (COM), UPX compressed
|
||||
252 string Must\ have\ DOS\ version DR-DOS executable (COM)
|
||||
|
|
@ -466,16 +466,16 @@
|
|||
# FIXME: missing diet .com compression
|
||||
|
||||
# miscellaneous formats
|
||||
0 string LZ MS-DOS executable (built-in)
|
||||
0 string/b LZ MS-DOS executable (built-in)
|
||||
#0 byte 0xf0 MS-DOS program library data
|
||||
#
|
||||
|
||||
# AAF files:
|
||||
# <stuartc@rd.bbc.co.uk> Stuart Cunningham
|
||||
0 string \320\317\021\340\241\261\032\341AAFB\015\000OM\006\016\053\064\001\001\001\377 AAF legacy file using MS Structured Storage
|
||||
0 string/b \320\317\021\340\241\261\032\341AAFB\015\000OM\006\016\053\064\001\001\001\377 AAF legacy file using MS Structured Storage
|
||||
>30 byte 9 (512B sectors)
|
||||
>30 byte 12 (4kB sectors)
|
||||
0 string \320\317\021\340\241\261\032\341\001\002\001\015\000\002\000\000\006\016\053\064\003\002\001\001 AAF file using MS Structured Storage
|
||||
0 string/b \320\317\021\340\241\261\032\341\001\002\001\015\000\002\000\000\006\016\053\064\003\002\001\001 AAF file using MS Structured Storage
|
||||
>30 byte 9 (512B sectors)
|
||||
>30 byte 12 (4kB sectors)
|
||||
|
||||
|
|
@ -491,14 +491,14 @@
|
|||
0 belong 0x31be0000 Microsoft Word Document
|
||||
!:mime application/msword
|
||||
#
|
||||
0 string PO^Q` Microsoft Word 6.0 Document
|
||||
0 string/b PO^Q` Microsoft Word 6.0 Document
|
||||
!:mime application/msword
|
||||
#
|
||||
0 string \376\067\0\043 Microsoft Office Document
|
||||
0 string/b \376\067\0\043 Microsoft Office Document
|
||||
!:mime application/msword
|
||||
0 string \333\245-\0\0\0 Microsoft Office Document
|
||||
0 string/b \333\245-\0\0\0 Microsoft Office Document
|
||||
!:mime application/msword
|
||||
512 string \354\245\301 Microsoft Word Document
|
||||
512 string/b \354\245\301 Microsoft Word Document
|
||||
!:mime application/msword
|
||||
#
|
||||
2080 string Microsoft\ Excel\ 5.0\ Worksheet %s
|
||||
|
|
@ -513,7 +513,7 @@
|
|||
# Italian MS-Excel
|
||||
2121 string Biff5 Microsoft Excel 5.0 Worksheet
|
||||
!:mime application/vnd.ms-excel
|
||||
0 string \x09\x04\x06\x00\x00\x00\x10\x00 Microsoft Excel Worksheet
|
||||
0 string/b \x09\x04\x06\x00\x00\x00\x10\x00 Microsoft Excel Worksheet
|
||||
!:mime application/vnd.ms-excel
|
||||
#
|
||||
0 belong 0x00001a00 Lotus 1-2-3
|
||||
|
|
@ -527,9 +527,9 @@
|
|||
!:mime application/x-123
|
||||
>4 belong 0x06040600 wk1 document data
|
||||
>4 belong 0x06800200 fmt document data
|
||||
0 string WordPro\0 Lotus WordPro
|
||||
0 string/b WordPro\0 Lotus WordPro
|
||||
!:mime application/vnd.lotus-wordpro
|
||||
0 string WordPro\r\373 Lotus WordPro
|
||||
0 string/b WordPro\r\373 Lotus WordPro
|
||||
!:mime application/vnd.lotus-wordpro
|
||||
|
||||
|
||||
|
|
@ -542,17 +542,17 @@
|
|||
|
||||
# Winamp .avs
|
||||
#0 string Nullsoft\ AVS\ Preset\ \060\056\061\032 A plug in for Winamp ms-windows Freeware media player
|
||||
0 string Nullsoft\ AVS\ Preset\ Winamp plug in
|
||||
0 string/b Nullsoft\ AVS\ Preset\ Winamp plug in
|
||||
|
||||
# Windows Metafont .WMF
|
||||
0 string \327\315\306\232 ms-windows metafont .wmf
|
||||
0 string \002\000\011\000 ms-windows metafont .wmf
|
||||
0 string \001\000\011\000 ms-windows metafont .wmf
|
||||
0 string/b \327\315\306\232 ms-windows metafont .wmf
|
||||
0 string/b \002\000\011\000 ms-windows metafont .wmf
|
||||
0 string/b \001\000\011\000 ms-windows metafont .wmf
|
||||
|
||||
#tz3 files whatever that is (MS Works files)
|
||||
0 string \003\001\001\004\070\001\000\000 tz3 ms-works file
|
||||
0 string \003\002\001\004\070\001\000\000 tz3 ms-works file
|
||||
0 string \003\003\001\004\070\001\000\000 tz3 ms-works file
|
||||
0 string/b \003\001\001\004\070\001\000\000 tz3 ms-works file
|
||||
0 string/b \003\002\001\004\070\001\000\000 tz3 ms-works file
|
||||
0 string/b \003\003\001\004\070\001\000\000 tz3 ms-works file
|
||||
|
||||
# PGP sig files .sig
|
||||
#0 string \211\000\077\003\005\000\063\237\127 065 to \027\266\151\064\005\045\101\233\021\002 PGP sig
|
||||
|
|
@ -564,14 +564,14 @@
|
|||
0 string \211\000\225\003\005\000\062\122\207\304\100\345\042 PGP sig
|
||||
|
||||
# windows zips files .dmf
|
||||
0 string MDIF\032\000\010\000\000\000\372\046\100\175\001\000\001\036\001\000 MS Windows special zipped file
|
||||
0 string/b MDIF\032\000\010\000\000\000\372\046\100\175\001\000\001\036\001\000 MS Windows special zipped file
|
||||
|
||||
|
||||
#ico files
|
||||
0 string \102\101\050\000\000\000\056\000\000\000\000\000\000\000 Icon for MS Windows
|
||||
0 string/b \102\101\050\000\000\000\056\000\000\000\000\000\000\000 Icon for MS Windows
|
||||
|
||||
# Windows icons (Ian Springer <ips@fpk.hp.com>)
|
||||
0 string \000\000\001\000 MS Windows icon resource
|
||||
0 string/b \000\000\001\000 MS Windows icon resource
|
||||
!:mime image/x-icon
|
||||
>4 byte 1 - 1 icon
|
||||
>4 byte >1 - %d icons
|
||||
|
|
@ -582,13 +582,13 @@
|
|||
|
||||
|
||||
# .chr files
|
||||
0 string PK\010\010BGI Borland font
|
||||
0 string/b PK\010\010BGI Borland font
|
||||
>4 string >\0 %s
|
||||
# then there is a copyright notice
|
||||
|
||||
|
||||
# .bgi files
|
||||
0 string pk\010\010BGI Borland device
|
||||
0 string/b pk\010\010BGI Borland device
|
||||
>4 string >\0 %s
|
||||
# then there is a copyright notice
|
||||
|
||||
|
|
@ -703,28 +703,28 @@
|
|||
!:mime application/vnd.ms-tnef
|
||||
|
||||
# HtmlHelp files (.chm)
|
||||
0 string ITSF\003\000\000\000\x60\000\000\000\001\000\000\000 MS Windows HtmlHelp Data
|
||||
0 string/b ITSF\003\000\000\000\x60\000\000\000\001\000\000\000 MS Windows HtmlHelp Data
|
||||
|
||||
# GFA-BASIC (Wolfram Kleff)
|
||||
2 string GFA-BASIC3 GFA-BASIC 3 data
|
||||
2 string/b GFA-BASIC3 GFA-BASIC 3 data
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# From Stuart Caie <kyzer@4u.net> (developer of cabextract)
|
||||
# Microsoft Cabinet files
|
||||
0 string MSCF\0\0\0\0 Microsoft Cabinet archive data
|
||||
0 string/b MSCF\0\0\0\0 Microsoft Cabinet archive data
|
||||
!:mime application/vnd.ms-cab-compressed
|
||||
>8 lelong x \b, %u bytes
|
||||
>28 leshort 1 \b, 1 file
|
||||
>28 leshort >1 \b, %u files
|
||||
|
||||
# InstallShield Cabinet files
|
||||
0 string ISc( InstallShield Cabinet archive data
|
||||
0 string/b ISc( InstallShield Cabinet archive data
|
||||
>5 byte&0xf0 =0x60 version 6,
|
||||
>5 byte&0xf0 !0x60 version 4/5,
|
||||
>(12.l+40) lelong x %u files
|
||||
|
||||
# Windows CE package files
|
||||
0 string MSCE\0\0\0\0 Microsoft WinCE install header
|
||||
0 string/b MSCE\0\0\0\0 Microsoft WinCE install header
|
||||
>20 lelong 0 \b, architecture-independent
|
||||
>20 lelong 103 \b, Hitachi SH3
|
||||
>20 lelong 104 \b, Hitachi SH4
|
||||
|
|
@ -748,7 +748,7 @@
|
|||
>>44 ulelong x version 0x%x
|
||||
|
||||
# From: Alex Beregszaszi <alex@fsn.hu>
|
||||
0 string COWD VMWare3
|
||||
0 string/b COWD VMWare3
|
||||
>4 byte 3 disk image
|
||||
>>32 lelong x (%d/
|
||||
>>36 lelong x \b%d/
|
||||
|
|
@ -756,8 +756,8 @@
|
|||
>4 byte 2 undoable disk image
|
||||
>>32 string >\0 (%s)
|
||||
|
||||
0 string VMDK VMware4 disk image
|
||||
0 string KDMV VMware4 disk image
|
||||
0 string/b VMDK VMware4 disk image
|
||||
0 string/b KDMV VMware4 disk image
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Qemu Emulator Images
|
||||
|
|
@ -765,11 +765,11 @@
|
|||
# Updated by Adam Buchbinder (adam.buchbinder@gmail.com)
|
||||
# Made by reading sources, reading documentation, and doing trial and error
|
||||
# on existing QCOW files
|
||||
0 string QFI\xFB QEMU QCOW Image
|
||||
0 string/b QFI\xFB QEMU QCOW Image
|
||||
|
||||
# Uncomment the following line to display Magic (only used for debugging
|
||||
# this magic number)
|
||||
#>0 string x , Magic: %s
|
||||
#>0 string/b x , Magic: %s
|
||||
|
||||
# There are currently 2 Versions: "1" and "2".
|
||||
# http://www.gnome.org/~markmc/qcow-image-format-version-1.html
|
||||
|
|
@ -813,9 +813,9 @@
|
|||
|
||||
>4 default x (unknown version)
|
||||
|
||||
0 string QEVM QEMU suspend to disk image
|
||||
0 string/b QEVM QEMU suspend to disk image
|
||||
|
||||
0 string Bochs\ Virtual\ HD\ Image Bochs disk image,
|
||||
0 string/b Bochs\ Virtual\ HD\ Image Bochs disk image,
|
||||
>32 string x type %s,
|
||||
>48 string x subtype %s
|
||||
|
||||
|
|
@ -823,8 +823,8 @@
|
|||
|
||||
# from http://filext.com by Derek M Jones <derek@knosof.co.uk>
|
||||
# False positive with PPT (also currently this string is too long)
|
||||
#0 string \xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x3E\x00\x03\x00\xFE\xFF\x09\x00\x06 Microsoft Installer
|
||||
0 string \320\317\021\340\241\261\032\341 Microsoft Office Document
|
||||
#0 string/b \xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x3E\x00\x03\x00\xFE\xFF\x09\x00\x06 Microsoft Installer
|
||||
0 string/b \320\317\021\340\241\261\032\341 Microsoft Office Document
|
||||
#>48 byte 0x1B Excel Document
|
||||
#!:mime application/vnd.ms-excel
|
||||
>546 string bjbj Microsoft Word Document
|
||||
|
|
@ -832,7 +832,7 @@
|
|||
>546 string jbjb Microsoft Word Document
|
||||
!:mime application/msword
|
||||
|
||||
0 string \224\246\056 Microsoft Word Document
|
||||
0 string/b \224\246\056 Microsoft Word Document
|
||||
!:mime application/msword
|
||||
|
||||
512 string R\0o\0o\0t\0\ \0E\0n\0t\0r\0y Microsoft Word Document
|
||||
|
|
@ -841,7 +841,7 @@
|
|||
# From: "Nelson A. de Oliveira" <naoliv@gmail.com>
|
||||
# Magic type for Dell's BIOS .hdr files
|
||||
# Dell's .hdr
|
||||
0 string $RBU
|
||||
0 string/b $RBU
|
||||
>23 string Dell %s system BIOS
|
||||
>5 byte 2
|
||||
>>48 byte x version %d.
|
||||
|
|
@ -853,7 +853,7 @@
|
|||
# Type: Microsoft DirectDraw Surface
|
||||
# URL: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c/directx/graphics/reference/DDSFileReference/ddsfileformat.asp
|
||||
# From: Morten Hustveit <morten@debian.org>
|
||||
0 string DDS\040\174\000\000\000 Microsoft DirectDraw Surface (DDS),
|
||||
0 string/b DDS\040\174\000\000\000 Microsoft DirectDraw Surface (DDS),
|
||||
>16 lelong >0 %hd x
|
||||
>12 lelong >0 %hd,
|
||||
>84 string x %.4s
|
||||
|
|
@ -864,13 +864,13 @@
|
|||
0 short 0x5045 Microsoft Document Imaging Format
|
||||
|
||||
# MS eBook format (.lit)
|
||||
0 string ITOLITLS Microsoft Reader eBook Data
|
||||
0 string/b ITOLITLS Microsoft Reader eBook Data
|
||||
>8 lelong x \b, version %u
|
||||
!:mime application/x-ms-reader
|
||||
|
||||
# Windows CE Binary Image Data Format
|
||||
# From: Dr. Jesus <j@hug.gs>
|
||||
0 string B000FF\n Windows Embedded CE binary image
|
||||
0 string/b B000FF\n Windows Embedded CE binary image
|
||||
|
||||
# Windows Imaging (WIM) Image
|
||||
0 string MSWIM\000\000\000 Windows imaging (WIM) image
|
||||
0 string/b MSWIM\000\000\000 Windows imaging (WIM) image
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
#------------------------------------------------------------------------------
|
||||
# $File: music,v 1.1 2011/11/25 03:28:17 christos Exp $
|
||||
# music: file (1) magic for music formats
|
||||
|
||||
# BWW format used by Bagpipe Music Writer Gold by Robert MacNeil Musicworks
|
||||
# and Bagpipe Writer by Doug Wickstrom
|
||||
#
|
||||
0 string Bagpipe Bagpipe
|
||||
>8 string Reader Reader
|
||||
>>15 string >\0 (version %.3s)
|
||||
>8 string Music\ Writer Music Writer
|
||||
>>20 string :
|
||||
>>>21 string >\0 (version %.3s)
|
||||
>>21 string Gold Gold
|
||||
>>>25 string :
|
||||
>>>>26 string >\0 (version %.3s)
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
#------------------------------------------------------------------------------
|
||||
# $File: netbsd,v 1.18 2009/09/19 16:28:11 christos Exp $
|
||||
# $File: netbsd,v 1.19 2011/10/31 17:23:34 christos Exp $
|
||||
# netbsd: file(1) magic for NetBSD objects
|
||||
#
|
||||
# All new-style magic numbers are in network byte order.
|
||||
|
|
@ -245,3 +245,42 @@
|
|||
0 belong&0377777777 043600507 a.out NetBSD/arm core
|
||||
>12 string >\0 from '%s'
|
||||
>32 lelong !0 (signal %d)
|
||||
|
||||
# Kernel core dump format
|
||||
0 belong&0x0000ffff 0x00008fca NetBSD kernel core file
|
||||
>0 belong&0x03ff0000 0x00000000 \b, Unknown
|
||||
>0 belong&0x03ff0000 0x00001000 \b, sun 68010/68020
|
||||
>0 belong&0x03ff0000 0x00020000 \b, sun 68020
|
||||
>0 belong&0x03ff0000 0x00640000 \b, 386 PC
|
||||
>0 belong&0x03ff0000 0x00860000 \b, i386 BSD
|
||||
>0 belong&0x03ff0000 0x00870000 \b, m68k BSD (8K pages)
|
||||
>0 belong&0x03ff0000 0x00880000 \b, m68k BSD (4K pages)
|
||||
>0 belong&0x03ff0000 0x00890000 \b, ns32532 BSD
|
||||
>0 belong&0x03ff0000 0x008a0000 \b, sparc/32 BSD
|
||||
>0 belong&0x03ff0000 0x008b0000 \b, pmax BSD
|
||||
>0 belong&0x03ff0000 0x008c0000 \b, vax BSD (1K pages)
|
||||
>0 belong&0x03ff0000 0x008d0000 \b, alpha BSD
|
||||
>0 belong&0x03ff0000 0x008e0000 \b, mips BSD (Big Endian)
|
||||
>0 belong&0x03ff0000 0x008f0000 \b, arm6 BSD
|
||||
>0 belong&0x03ff0000 0x00900000 \b, m68k BSD (2K pages)
|
||||
>0 belong&0x03ff0000 0x00910000 \b, sh3 BSD
|
||||
>0 belong&0x03ff0000 0x00920000 \b, ppc BSD (Big Endian)
|
||||
>0 belong&0x03ff0000 0x00930000 \b, vax BSD (4K pages)
|
||||
>0 belong&0x03ff0000 0x00940000 \b, mips1 BSD
|
||||
>0 belong&0x03ff0000 0x00950000 \b, mips2 BSD
|
||||
>0 belong&0x03ff0000 0x00960000 \b, parisc BSD
|
||||
>0 belong&0x03ff0000 0x00970000 \b, sh5/64 BSD
|
||||
>0 belong&0x03ff0000 0x00980000 \b, sparc/64 BSD
|
||||
>0 belong&0x03ff0000 0x00990000 \b, amd64 BSD
|
||||
>0 belong&0x03ff0000 0x009a0000 \b, hp200 (68010) BSD
|
||||
>0 belong&0x03ff0000 0x009b0000 \b, hp300 (68020+68881) BSD
|
||||
>0 belong&0x03ff0000 0x009b0000 \b, hp300 (68020+68881) BSD
|
||||
>0 belong&0x03ff0000 0x00c80000 \b, hp200
|
||||
>0 belong&0x03ff0000 0x020b0000 \b, hp300 (68020+68881) HP-UX
|
||||
>0 belong&0x03ff0000 0x020c0000 \b, hp300 (68020+68881) HP-UX
|
||||
>0 belong&0xfc000000 0x04000000 \b, CPU
|
||||
>0 belong&0xfc000000 0x08000000 \b, DATA
|
||||
>0 belong&0xfc000000 0x10000000 \b, STACK
|
||||
>4 leshort x \b, (headersize = %d
|
||||
>6 leshort x \b, segmentsize = %d
|
||||
>6 lelong x \b, segments = %d)
|
||||
|
|
|
|||
|
|
@ -1,65 +1,72 @@
|
|||
|
||||
#------------------------------------------------------------------------------
|
||||
# $File: palm,v 1.7 2009/09/19 16:28:11 christos Exp $
|
||||
# palm: file(1) magic for PalmOS {.prc,.pdb}: applications, docfiles, and hacks
|
||||
# $File: palm,v 1.9 2012/01/16 15:16:43 christos Exp $
|
||||
# palm: file(1) magic for PalmOS {.prc,.pdb}: applications, docfiles, and hacks
|
||||
#
|
||||
# Brian Lalor <blalor@hcirisc.cs.binghamton.edu>
|
||||
|
||||
# These are weak, byte 59 is not guaranteed to be 0 and there are
|
||||
# 8 character identifiers at byte 60, one I found for appl is BIGb.
|
||||
# What are the possibilities and where is this documented?
|
||||
|
||||
# appl
|
||||
60 belong 0x6170706c PalmOS application
|
||||
>0 string >\0 "%s"
|
||||
#59 byte \0
|
||||
#>60 string appl PalmOS application
|
||||
#>0 string >\0 "%s"
|
||||
# TEXt
|
||||
60 belong 0x54455874 AportisDoc file
|
||||
>0 string >\0 "%s"
|
||||
#59 byte \0
|
||||
#>60 belong TEXt AportisDoc file
|
||||
#>0 string >\0 "%s"
|
||||
# HACK
|
||||
60 belong 0x4841434b HackMaster hack
|
||||
>0 string >\0 "%s"
|
||||
#59 byte \0
|
||||
#>60 string HACK HackMaster hack
|
||||
#>0 string >\0 "%s"
|
||||
|
||||
# Variety of PalmOS document types
|
||||
# Michael-John Turner <mj@debian.org>
|
||||
# Thanks to Hasan Umit Ezerce <humit@tr-net.net.tr> for his DocType
|
||||
60 string BVokBDIC BDicty PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string DB99DBOS DB PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string vIMGView FireViewer/ImageViewer PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string PmDBPmDB HanDBase PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string InfoINDB InfoView PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string ToGoToGo iSilo PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string JfDbJBas JFile PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string JfDbJFil JFile Pro PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string DATALSdb List PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string Mdb1Mdb1 MobileDB PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string PNRdPPrs PeanutPress PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string DataPlkr Plucker PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string DataSprd QuickSheet PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string SM01SMem SuperMemo PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string TEXtTlDc TealDoc PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string InfoTlIf TealInfo PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string DataTlMl TealMeal PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string DataTlPt TealPaint PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string dataTDBP ThinkDB PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string TdatTide Tides PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string ToRaTRPW TomeRaider PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string BVokBDIC BDicty PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string DB99DBOS DB PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string vIMGView FireViewer/ImageViewer PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string PmDBPmDB HanDBase PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string InfoINDB InfoView PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string ToGoToGo iSilo PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string JfDbJBas JFile PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string JfDbJFil JFile Pro PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string DATALSdb List PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string Mdb1Mdb1 MobileDB PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string PNRdPPrs PeanutPress PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string DataPlkr Plucker PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string DataSprd QuickSheet PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string SM01SMem SuperMemo PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string TEXtTlDc TealDoc PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string InfoTlIf TealInfo PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string DataTlMl TealMeal PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string DataTlPt TealPaint PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string dataTDBP ThinkDB PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string TdatTide Tides PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
60 string ToRaTRPW TomeRaider PalmOS document
|
||||
>0 string >\0 "%s"
|
||||
|
||||
# A GutenPalm zTXT etext for use on Palm Pilots (http://gutenpalm.sf.net)
|
||||
# For version 1.xx zTXTs, outputs version and numbers of bookmarks and
|
||||
|
|
@ -88,5 +95,5 @@
|
|||
>0 string >\0 "%s"
|
||||
|
||||
# Mobipocket (www.mobipocket.com), donated by Carl Witty
|
||||
60 string BOOKMOBI Mobipocket E-book
|
||||
>0 string >\0 "%s"
|
||||
60 string BOOKMOBI Mobipocket E-book
|
||||
>0 string >\0 "%s"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,10 @@
|
|||
#------------------------------------------------------------------------------
|
||||
# $File: pascal,v 1.1 2011/12/08 12:12:46 rrt Exp $
|
||||
# pascal: file(1) magic for Pascal source
|
||||
#
|
||||
0 search/8192 (input, Pascal source text
|
||||
!:mime text/x-pascal
|
||||
0 regex \^program Pascal source text
|
||||
!:mime text/x-pascal
|
||||
0 regex \^record Pascal source text
|
||||
!:mime text/x-pascal
|
||||
|
|
@ -1,6 +1,5 @@
|
|||
|
||||
#------------------------------------------------------------------------------
|
||||
# $File: perl,v 1.16 2009/09/19 16:28:11 christos Exp $
|
||||
# $File: perl,v 1.17 2011/12/16 16:24:40 rrt Exp $
|
||||
# perl: file(1) magic for Larry Wall's perl language.
|
||||
#
|
||||
# The `eval' lines recognizes an outrageously clever hack.
|
||||
|
|
@ -20,7 +19,10 @@
|
|||
!:mime text/x-perl
|
||||
0 search/1 eval\ '(exit\ $?0)'\ &&\ eval\ 'exec Perl script text
|
||||
!:mime text/x-perl
|
||||
|
||||
0 search/1 #!/usr/bin/env\ perl Perl script text executable
|
||||
!:mime text/x-perl
|
||||
0 search/1 #!\ /usr/bin/env\ perl Perl script text executable
|
||||
!:mime text/x-perl
|
||||
|
||||
# by Dmitry V. Levin and Alexey Tourbin
|
||||
# check the first line
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
|
||||
#------------------------------------------------------------------------------
|
||||
# $File: python,v 1.18 2011/02/26 02:33:38 christos Exp $
|
||||
# $File: python,v 1.20 2011/12/13 13:53:14 christos Exp $
|
||||
# python: file(1) magic for python
|
||||
#
|
||||
# Outlook puts """ too for urgent messages
|
||||
# From: David Necas <yeti@physics.muni.cz>
|
||||
# often the module starts with a multiline string
|
||||
0 string/t """ a python script text executable
|
||||
0 string/t """ Python script text executable
|
||||
# MAGIC as specified in Python/import.c (1.5 to 2.7a0 and 3.1a0, assuming
|
||||
# that Py_UnicodeFlag is off for Python 2)
|
||||
# 20121 ( YEAR - 1995 ) + MONTH + DAY (little endian followed by "\r\n"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#------------------------------------------------------------------------------
|
||||
# $File: sgml,v 1.26 2011/04/16 15:20:04 christos Exp $
|
||||
# $File: sgml,v 1.27 2011/12/07 12:01:24 rrt Exp $
|
||||
# Type: SVG Vectorial Graphics
|
||||
# From: Noel Torres <tecnico@ejerciciosresueltos.com>
|
||||
0 string \<?xml\ version="
|
||||
|
|
@ -18,15 +18,15 @@
|
|||
# xhtml
|
||||
0 string/t \<?xml\ version="
|
||||
>15 string >\0
|
||||
>>19 search/4096/cWbt \<!doctype\ html xHTML document text
|
||||
>>19 search/4096/cWbt \<!doctype\ html XHTML document text
|
||||
!:mime text/html
|
||||
0 string/t \<?xml\ version='
|
||||
>15 string >\0
|
||||
>>19 search/4096/cWbt \<!doctype\ html xHTML document text
|
||||
>>19 search/4096/cWbt \<!doctype\ html XHTML document text
|
||||
!:mime text/html
|
||||
0 string/t \<?xml\ version="
|
||||
>15 string >\0
|
||||
>>19 search/4096/cWbt \<html broken xHTML document text
|
||||
>>19 search/4096/cWbt \<html broken XHTML document text
|
||||
!:mime text/html
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -1,16 +1,27 @@
|
|||
|
||||
#------------------------------------------------------------------------------
|
||||
# $File: varied.script,v 1.7 2010/11/25 15:00:12 christos Exp $
|
||||
# $File: varied.script,v 1.9 2011/12/16 16:32:48 rrt Exp $
|
||||
# varied.script: file(1) magic for various interpreter scripts
|
||||
|
||||
0 string/t #!\ / a
|
||||
>3 string >\0 %s script text executable
|
||||
!:strength / 2
|
||||
0 string/t #!\t/ a
|
||||
>3 string >\0 %s script text executable
|
||||
!:strength / 2
|
||||
0 string/t #!/ a
|
||||
>2 string >\0 %s script text executable
|
||||
!:strength / 2
|
||||
0 string/t #!\ script text executable
|
||||
>3 string >\0 for %s
|
||||
!:strength / 3
|
||||
|
||||
# using env
|
||||
0 string/t #!/usr/bin/env a
|
||||
>15 string/t >\0 %s script text executable
|
||||
!:strength / 10
|
||||
0 string/t #!\ /usr/bin/env a
|
||||
>16 string/t >\0 %s script text executable
|
||||
!:strength / 10
|
||||
|
||||
# From: arno <arenevier@fdn.fr>
|
||||
# mozilla xpconnect typelib
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
#------------------------------------------------------------------------------
|
||||
# $File: virtual,v 1.1 2009/12/25 16:04:30 christos Exp $
|
||||
# $File: virtual,v 1.2 2011/11/22 13:30:05 christos Exp $
|
||||
# From: James Nobis <quel@quelrod.net>
|
||||
# Microsoft hard disk images for:
|
||||
# Virtual Server
|
||||
|
|
@ -10,8 +10,8 @@
|
|||
0 string conectix Microsoft Disk Image, Virtual Server or Virtual PC
|
||||
|
||||
# Sun xVM VirtualBox Disk Image
|
||||
# string <<< Sun xVM VirtualBox Disk Image >>>
|
||||
# .vdi
|
||||
0 string \<\<\<\ Sun\ xVM\ VirtualBox\ Disk Sun xVM VirtualBox Disk Image
|
||||
|
||||
|
||||
# From: Richard W.M. Jones <rich@annexia.org>
|
||||
# VirtualBox Disk Image
|
||||
0x40 ulelong 0xbeda107f VirtualBox Disk Image
|
||||
>0x44 uleshort >0 \b, major %u
|
||||
>0x46 uleshort >0 \b, minor %u
|
||||
|
|
|
|||
|
|
@ -0,0 +1,96 @@
|
|||
#------------------------------------------------------------------------------
|
||||
# zfs: file(1) magic for ZFS dumps
|
||||
#
|
||||
# From <rea-fbsd@codelabs.ru>
|
||||
# ZFS dump header has the following structure (as per zfs_ioctl.h
|
||||
# in FreeBSD with drr_type is set to DRR_BEGIN)
|
||||
#
|
||||
# enum {
|
||||
# DRR_BEGIN, DRR_OBJECT, DRR_FREEOBJECTS,
|
||||
# DRR_WRITE, DRR_FREE, DRR_END,
|
||||
# } drr_type;
|
||||
# uint32_t drr_pad;
|
||||
# uint64_t drr_magic;
|
||||
# uint64_t drr_version;
|
||||
# uint64_t drr_creation_time;
|
||||
# dmu_objset_type_t drr_type;
|
||||
# uint32_t drr_pad;
|
||||
# uint64_t drr_toguid;
|
||||
# uint64_t drr_fromguid;
|
||||
# char drr_toname[MAXNAMELEN];
|
||||
#
|
||||
# Backup magic is 0x00000002f5bacbac (quad word)
|
||||
# The drr_type is defined as
|
||||
# typedef enum dmu_objset_type {
|
||||
# DMU_OST_NONE,
|
||||
# DMU_OST_META,
|
||||
# DMU_OST_ZFS,
|
||||
# DMU_OST_ZVOL,
|
||||
# DMU_OST_OTHER, /* For testing only! */
|
||||
# DMU_OST_ANY, /* Be careful! */
|
||||
# DMU_OST_NUMTYPES
|
||||
# } dmu_objset_type_t;
|
||||
#
|
||||
# Almost all uint64_t fields are printed as the 32-bit ones (with high
|
||||
# 32 bits zeroed), because there is no simple way to print them as the
|
||||
# full 64-bit values.
|
||||
|
||||
# Big-endian values
|
||||
8 string \000\000\000\002\365\272\313\254 ZFS shapshot (big-endian machine),
|
||||
>20 belong x version %lu,
|
||||
>32 belong 0 type: NONE,
|
||||
>32 belong 1 type: META,
|
||||
>32 belong 2 type: ZFS,
|
||||
>32 belong 3 type: ZVOL,
|
||||
>32 belong 4 type: OTHER,
|
||||
>32 belong 5 type: ANY,
|
||||
>32 belong >5 type: UNKNOWN (%lu),
|
||||
>40 byte x destination GUID: %02X
|
||||
>41 byte x %02X
|
||||
>42 byte x %02X
|
||||
>43 byte x %02X
|
||||
>44 byte x %02X
|
||||
>45 byte x %02X
|
||||
>46 byte x %02X
|
||||
>47 byte x %02X,
|
||||
>48 ulong >0
|
||||
>>52 ulong >0
|
||||
>>>48 byte x source GUID: %02X
|
||||
>>>49 byte x %02X
|
||||
>>>50 byte x %02X
|
||||
>>>51 byte x %02X
|
||||
>>>52 byte x %02X
|
||||
>>>53 byte x %02X
|
||||
>>>54 byte x %02X
|
||||
>>>55 byte x %02X,
|
||||
>56 string >\0 name: '%s'
|
||||
|
||||
# Little-endian values
|
||||
8 string \254\313\272\365\002\000\000\000 ZFS shapshot (little-endian machine),
|
||||
>16 lelong x version %lu,
|
||||
>32 lelong 0 type: NONE,
|
||||
>32 lelong 1 type: META,
|
||||
>32 lelong 2 type: ZFS,
|
||||
>32 lelong 3 type: ZVOL,
|
||||
>32 lelong 4 type: OTHER,
|
||||
>32 lelong 5 type: ANY,
|
||||
>32 lelong >5 type: UNKNOWN (%lu),
|
||||
>47 byte x destination GUID: %02X
|
||||
>46 byte x %02X
|
||||
>45 byte x %02X
|
||||
>44 byte x %02X
|
||||
>43 byte x %02X
|
||||
>42 byte x %02X
|
||||
>41 byte x %02X
|
||||
>40 byte x %02X,
|
||||
>48 ulong >0
|
||||
>>52 ulong >0
|
||||
>>>55 byte x source GUID: %02X
|
||||
>>>54 byte x %02X
|
||||
>>>53 byte x %02X
|
||||
>>>52 byte x %02X
|
||||
>>>51 byte x %02X
|
||||
>>>50 byte x %02X
|
||||
>>>49 byte x %02X
|
||||
>>>48 byte x %02X,
|
||||
>56 string >\0 name: '%s'
|
||||
|
|
@ -109,13 +109,17 @@ class Magic(object):
|
|||
"""
|
||||
_close(self._magic_t)
|
||||
|
||||
def file(self, file):
|
||||
def file(self, filename):
|
||||
"""
|
||||
Returns a textual description of the contents of the argument passed
|
||||
as a filename or None if an error occurred and the MAGIC_ERROR flag
|
||||
is set. A call to errno() will return the numeric error code.
|
||||
"""
|
||||
return _file(self._magic_t, file)
|
||||
try: # attempt python3 approach first
|
||||
bi = bytes(filename, 'utf-8')
|
||||
return str(_file(self._magic_t, bi), 'utf-8')
|
||||
except:
|
||||
return _file(self._magic_t, filename)
|
||||
|
||||
def descriptor(self, fd):
|
||||
"""
|
||||
|
|
@ -129,14 +133,20 @@ class Magic(object):
|
|||
as a buffer or None if an error occurred and the MAGIC_ERROR flag
|
||||
is set. A call to errno() will return the numeric error code.
|
||||
"""
|
||||
return _buffer(self._magic_t, buf, len(buf))
|
||||
try: # attempt python3 approach first
|
||||
return str(_buffer(self._magic_t, buf, len(buf)), 'utf-8')
|
||||
except:
|
||||
return _buffer(self._magic_t, buf, len(buf))
|
||||
|
||||
def error(self):
|
||||
"""
|
||||
Returns a textual explanation of the last error or None
|
||||
if there was no error.
|
||||
"""
|
||||
return _error(self._magic_t)
|
||||
try: # attempt python3 approach first
|
||||
return str(_error(self._magic_t), 'utf-8')
|
||||
except:
|
||||
return _error(self._magic_t)
|
||||
|
||||
def setflags(self, flags):
|
||||
"""
|
||||
|
|
@ -149,7 +159,7 @@ class Magic(object):
|
|||
"""
|
||||
return _setflags(self._magic_t, flags)
|
||||
|
||||
def load(self, file=None):
|
||||
def load(self, filename=None):
|
||||
"""
|
||||
Must be called to load entries in the colon separated list of database files
|
||||
passed as argument or the default database file if no argument before
|
||||
|
|
@ -157,7 +167,7 @@ class Magic(object):
|
|||
|
||||
Returns 0 on success and -1 on failure.
|
||||
"""
|
||||
return _load(self._magic_t, file)
|
||||
return _load(self._magic_t, filename)
|
||||
|
||||
def compile(self, dbs):
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ AM_CFLAGS = @WARNINGS@
|
|||
|
||||
libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
|
||||
encoding.c compress.c is_tar.c readelf.c print.c fsmagic.c \
|
||||
funcs.c file.h names.h readelf.h tar.h apptype.c \
|
||||
funcs.c file.h readelf.h tar.h apptype.c \
|
||||
file_opts.h elfclass.h mygetopt.h cdf.c cdf_time.c readcdf.c cdf.h
|
||||
libmagic_la_LDFLAGS = -no-undefined -version-info 1:0:0
|
||||
if MINGW
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ascmagic.c,v 1.1.1.2 2011/05/12 20:46:52 christos Exp $ */
|
||||
/* $NetBSD: ascmagic.c,v 1.1.1.3 2012/02/22 17:48:22 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) Ian F. Darwin 1986-1995.
|
||||
|
|
@ -38,9 +38,9 @@
|
|||
|
||||
#ifndef lint
|
||||
#if 0
|
||||
FILE_RCSID("@(#)$File: ascmagic.c,v 1.81 2011/03/15 22:16:29 christos Exp $")
|
||||
FILE_RCSID("@(#)$File: ascmagic.c,v 1.84 2011/12/08 12:38:24 rrt Exp $")
|
||||
#else
|
||||
__RCSID("$NetBSD: ascmagic.c,v 1.1.1.2 2011/05/12 20:46:52 christos Exp $");
|
||||
__RCSID("$NetBSD: ascmagic.c,v 1.1.1.3 2012/02/22 17:48:22 christos Exp $");
|
||||
#endif
|
||||
#endif /* lint */
|
||||
|
||||
|
|
@ -52,13 +52,11 @@ __RCSID("$NetBSD: ascmagic.c,v 1.1.1.2 2011/05/12 20:46:52 christos Exp $");
|
|||
#ifdef HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
#include "names.h"
|
||||
|
||||
#define MAXLINELEN 300 /* longest sane line length */
|
||||
#define ISSPC(x) ((x) == ' ' || (x) == '\t' || (x) == '\r' || (x) == '\n' \
|
||||
|| (x) == 0x85 || (x) == '\f')
|
||||
|
||||
private int ascmatch(const unsigned char *, const unichar *, size_t);
|
||||
private unsigned char *encode_utf8(unsigned char *, size_t, unichar *, size_t);
|
||||
private size_t trim_nuls(const unsigned char *, size_t);
|
||||
|
||||
|
|
@ -76,7 +74,8 @@ trim_nuls(const unsigned char *buf, size_t nbytes)
|
|||
}
|
||||
|
||||
protected int
|
||||
file_ascmagic(struct magic_set *ms, const unsigned char *buf, size_t nbytes)
|
||||
file_ascmagic(struct magic_set *ms, const unsigned char *buf, size_t nbytes,
|
||||
int text)
|
||||
{
|
||||
unichar *ubuf = NULL;
|
||||
size_t ulen;
|
||||
|
|
@ -93,17 +92,13 @@ file_ascmagic(struct magic_set *ms, const unsigned char *buf, size_t nbytes)
|
|||
|
||||
/* If file doesn't look like any sort of text, give up. */
|
||||
if (file_encoding(ms, buf, nbytes, &ubuf, &ulen, &code, &code_mime,
|
||||
&type) == 0) {
|
||||
&type) == 0)
|
||||
rv = 0;
|
||||
goto done;
|
||||
}
|
||||
else
|
||||
rv = file_ascmagic_with_encoding(ms, buf, nbytes, ubuf, ulen, code,
|
||||
type, text);
|
||||
|
||||
rv = file_ascmagic_with_encoding(ms, buf, nbytes, ubuf, ulen, code,
|
||||
type);
|
||||
|
||||
done:
|
||||
if (ubuf)
|
||||
free(ubuf);
|
||||
free(ubuf);
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
|
@ -111,11 +106,10 @@ file_ascmagic(struct magic_set *ms, const unsigned char *buf, size_t nbytes)
|
|||
protected int
|
||||
file_ascmagic_with_encoding(struct magic_set *ms, const unsigned char *buf,
|
||||
size_t nbytes, unichar *ubuf, size_t ulen, const char *code,
|
||||
const char *type)
|
||||
const char *type, int text)
|
||||
{
|
||||
unsigned char *utf8_buf = NULL, *utf8_end;
|
||||
size_t mlen, i;
|
||||
const struct names *p;
|
||||
int rv = -1;
|
||||
int mime = ms->flags & MAGIC_MIME;
|
||||
|
||||
|
|
@ -130,7 +124,7 @@ file_ascmagic_with_encoding(struct magic_set *ms, const unsigned char *buf,
|
|||
int n_lf = 0;
|
||||
int n_cr = 0;
|
||||
int n_nel = 0;
|
||||
int score, curtype, executable = 0;
|
||||
int executable = 0;
|
||||
|
||||
size_t last_line_end = (size_t)-1;
|
||||
int has_long_lines = 0;
|
||||
|
|
@ -159,57 +153,10 @@ file_ascmagic_with_encoding(struct magic_set *ms, const unsigned char *buf,
|
|||
== NULL)
|
||||
goto done;
|
||||
if ((rv = file_softmagic(ms, utf8_buf,
|
||||
(size_t)(utf8_end - utf8_buf), TEXTTEST)) != 0)
|
||||
goto subtype_identified;
|
||||
else
|
||||
(size_t)(utf8_end - utf8_buf), TEXTTEST, text)) == 0)
|
||||
rv = -1;
|
||||
}
|
||||
|
||||
/* look for tokens from names.h - this is expensive! */
|
||||
if ((ms->flags & MAGIC_NO_CHECK_TOKENS) != 0)
|
||||
goto subtype_identified;
|
||||
|
||||
i = 0;
|
||||
score = 0;
|
||||
curtype = -1;
|
||||
while (i < ulen) {
|
||||
size_t end;
|
||||
|
||||
/* skip past any leading space */
|
||||
while (i < ulen && ISSPC(ubuf[i]))
|
||||
i++;
|
||||
if (i >= ulen)
|
||||
break;
|
||||
|
||||
/* find the next whitespace */
|
||||
for (end = i + 1; end < nbytes; end++)
|
||||
if (ISSPC(ubuf[end]))
|
||||
break;
|
||||
|
||||
/* compare the word thus isolated against the token list */
|
||||
for (p = names; p < names + NNAMES; p++) {
|
||||
if (ascmatch((const unsigned char *)p->name, ubuf + i,
|
||||
end - i)) {
|
||||
if (curtype == -1)
|
||||
curtype = p->type;
|
||||
else if (curtype != p->type) {
|
||||
score = p->score;
|
||||
curtype = p->type;
|
||||
} else
|
||||
score += p->score;
|
||||
if (score > 1) {
|
||||
subtype = types[p->type].human;
|
||||
subtype_mime = types[p->type].mime;
|
||||
goto subtype_identified;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
i = end;
|
||||
}
|
||||
|
||||
subtype_identified:
|
||||
|
||||
/* Now try to discover other details about the file. */
|
||||
for (i = 0; i < ulen; i++) {
|
||||
if (ubuf[i] == '\n') {
|
||||
|
|
@ -355,28 +302,11 @@ subtype_identified:
|
|||
}
|
||||
rv = 1;
|
||||
done:
|
||||
if (utf8_buf)
|
||||
free(utf8_buf);
|
||||
free(utf8_buf);
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
private int
|
||||
ascmatch(const unsigned char *s, const unichar *us, size_t ulen)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
for (i = 0; i < ulen; i++) {
|
||||
if (s[i] != us[i])
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (s[i])
|
||||
return 0;
|
||||
else
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* Encode Unicode string as UTF-8, returning pointer to character
|
||||
* after end of string, or NULL if an invalid character is found.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: cdf.h,v 1.1.1.2 2011/05/12 20:46:55 christos Exp $ */
|
||||
/* $NetBSD: cdf.h,v 1.1.1.3 2012/02/22 17:48:26 christos Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2008 Christos Zoulas
|
||||
|
|
@ -53,136 +53,140 @@ typedef int32_t cdf_secid_t;
|
|||
|
||||
#define CDF_SECID_NULL 0
|
||||
#define CDF_SECID_FREE -1
|
||||
#define CDF_SECID_END_OF_CHAIN -2
|
||||
#define CDF_SECID_SECTOR_ALLOCATION_TABLE -3
|
||||
#define CDF_SECID_END_OF_CHAIN -2
|
||||
#define CDF_SECID_SECTOR_ALLOCATION_TABLE -3
|
||||
#define CDF_SECID_MASTER_SECTOR_ALLOCATION_TABLE -4
|
||||
|
||||
typedef struct {
|
||||
uint64_t h_magic;
|
||||
uint64_t h_magic;
|
||||
#define CDF_MAGIC 0xE11AB1A1E011CFD0LL
|
||||
uint64_t h_uuid[2];
|
||||
uint16_t h_revision;
|
||||
uint16_t h_version;
|
||||
uint16_t h_byte_order;
|
||||
uint16_t h_sec_size_p2;
|
||||
uint16_t h_short_sec_size_p2;
|
||||
uint8_t h_unused0[10];
|
||||
uint32_t h_num_sectors_in_sat;
|
||||
uint32_t h_secid_first_directory;
|
||||
uint8_t h_unused1[4];
|
||||
uint32_t h_min_size_standard_stream;
|
||||
cdf_secid_t h_secid_first_sector_in_short_sat;
|
||||
uint32_t h_num_sectors_in_short_sat;
|
||||
cdf_secid_t h_secid_first_sector_in_master_sat;
|
||||
uint32_t h_num_sectors_in_master_sat;
|
||||
cdf_secid_t h_master_sat[436/4];
|
||||
uint64_t h_uuid[2];
|
||||
uint16_t h_revision;
|
||||
uint16_t h_version;
|
||||
uint16_t h_byte_order;
|
||||
uint16_t h_sec_size_p2;
|
||||
uint16_t h_short_sec_size_p2;
|
||||
uint8_t h_unused0[10];
|
||||
uint32_t h_num_sectors_in_sat;
|
||||
uint32_t h_secid_first_directory;
|
||||
uint8_t h_unused1[4];
|
||||
uint32_t h_min_size_standard_stream;
|
||||
cdf_secid_t h_secid_first_sector_in_short_sat;
|
||||
uint32_t h_num_sectors_in_short_sat;
|
||||
cdf_secid_t h_secid_first_sector_in_master_sat;
|
||||
uint32_t h_num_sectors_in_master_sat;
|
||||
cdf_secid_t h_master_sat[436/4];
|
||||
} cdf_header_t;
|
||||
|
||||
#define CDF_SEC_SIZE(h) (1 << (h)->h_sec_size_p2)
|
||||
#define CDF_SEC_SIZE(h) ((size_t)(1 << (h)->h_sec_size_p2))
|
||||
#define CDF_SEC_POS(h, secid) (CDF_SEC_SIZE(h) + (secid) * CDF_SEC_SIZE(h))
|
||||
#define CDF_SHORT_SEC_SIZE(h) (1 << (h)->h_short_sec_size_p2)
|
||||
#define CDF_SHORT_SEC_SIZE(h) ((size_t)(1 << (h)->h_short_sec_size_p2))
|
||||
#define CDF_SHORT_SEC_POS(h, secid) ((secid) * CDF_SHORT_SEC_SIZE(h))
|
||||
|
||||
typedef int32_t cdf_dirid_t;
|
||||
typedef int32_t cdf_dirid_t;
|
||||
#define CDF_DIRID_NULL -1
|
||||
|
||||
typedef int64_t cdf_timestamp_t;
|
||||
typedef int64_t cdf_timestamp_t;
|
||||
#define CDF_BASE_YEAR 1601
|
||||
#define CDF_TIME_PREC 10000000
|
||||
|
||||
typedef struct {
|
||||
uint16_t d_name[32];
|
||||
uint16_t d_namelen;
|
||||
uint8_t d_type;
|
||||
uint16_t d_name[32];
|
||||
uint16_t d_namelen;
|
||||
uint8_t d_type;
|
||||
#define CDF_DIR_TYPE_EMPTY 0
|
||||
#define CDF_DIR_TYPE_USER_STORAGE 1
|
||||
#define CDF_DIR_TYPE_USER_STREAM 2
|
||||
#define CDF_DIR_TYPE_LOCKBYTES 3
|
||||
#define CDF_DIR_TYPE_PROPERTY 4
|
||||
#define CDF_DIR_TYPE_ROOT_STORAGE 5
|
||||
uint8_t d_color;
|
||||
#define CDF_DIR_TYPE_USER_STORAGE 1
|
||||
#define CDF_DIR_TYPE_USER_STREAM 2
|
||||
#define CDF_DIR_TYPE_LOCKBYTES 3
|
||||
#define CDF_DIR_TYPE_PROPERTY 4
|
||||
#define CDF_DIR_TYPE_ROOT_STORAGE 5
|
||||
uint8_t d_color;
|
||||
#define CDF_DIR_COLOR_READ 0
|
||||
#define CDF_DIR_COLOR_BLACK 1
|
||||
cdf_dirid_t d_left_child;
|
||||
cdf_dirid_t d_right_child;
|
||||
cdf_dirid_t d_storage;
|
||||
uint64_t d_storage_uuid[2];
|
||||
uint32_t d_flags;
|
||||
cdf_timestamp_t d_created;
|
||||
cdf_timestamp_t d_modified;
|
||||
cdf_secid_t d_stream_first_sector;
|
||||
uint32_t d_size;
|
||||
uint32_t d_unused0;
|
||||
cdf_dirid_t d_left_child;
|
||||
cdf_dirid_t d_right_child;
|
||||
cdf_dirid_t d_storage;
|
||||
uint64_t d_storage_uuid[2];
|
||||
uint32_t d_flags;
|
||||
cdf_timestamp_t d_created;
|
||||
cdf_timestamp_t d_modified;
|
||||
cdf_secid_t d_stream_first_sector;
|
||||
uint32_t d_size;
|
||||
uint32_t d_unused0;
|
||||
} cdf_directory_t;
|
||||
|
||||
#define CDF_DIRECTORY_SIZE 128
|
||||
|
||||
typedef struct {
|
||||
cdf_secid_t *sat_tab;
|
||||
size_t sat_len;
|
||||
cdf_secid_t *sat_tab;
|
||||
size_t sat_len;
|
||||
} cdf_sat_t;
|
||||
|
||||
typedef struct {
|
||||
cdf_directory_t *dir_tab;
|
||||
size_t dir_len;
|
||||
cdf_directory_t *dir_tab;
|
||||
size_t dir_len;
|
||||
} cdf_dir_t;
|
||||
|
||||
typedef struct {
|
||||
void *sst_tab;
|
||||
size_t sst_len;
|
||||
size_t sst_dirlen;
|
||||
void *sst_tab;
|
||||
size_t sst_len;
|
||||
size_t sst_dirlen;
|
||||
} cdf_stream_t;
|
||||
|
||||
typedef struct {
|
||||
uint32_t cl_dword;
|
||||
uint16_t cl_word[2];
|
||||
uint8_t cl_two[2];
|
||||
uint8_t cl_six[6];
|
||||
uint32_t cl_dword;
|
||||
uint16_t cl_word[2];
|
||||
uint8_t cl_two[2];
|
||||
uint8_t cl_six[6];
|
||||
} cdf_classid_t;
|
||||
|
||||
typedef struct {
|
||||
uint16_t si_byte_order;
|
||||
uint16_t si_zero;
|
||||
uint16_t si_os_version;
|
||||
uint16_t si_os;
|
||||
cdf_classid_t si_class;
|
||||
uint32_t si_count;
|
||||
uint16_t si_byte_order;
|
||||
uint16_t si_zero;
|
||||
uint16_t si_os_version;
|
||||
uint16_t si_os;
|
||||
cdf_classid_t si_class;
|
||||
uint32_t si_count;
|
||||
} cdf_summary_info_header_t;
|
||||
|
||||
#define CDF_SECTION_DECLARATION_OFFSET 0x1c
|
||||
|
||||
typedef struct {
|
||||
cdf_classid_t sd_class;
|
||||
uint32_t sd_offset;
|
||||
cdf_classid_t sd_class;
|
||||
uint32_t sd_offset;
|
||||
} cdf_section_declaration_t;
|
||||
|
||||
typedef struct {
|
||||
uint32_t sh_len;
|
||||
uint32_t sh_properties;
|
||||
uint32_t sh_len;
|
||||
uint32_t sh_properties;
|
||||
} cdf_section_header_t;
|
||||
|
||||
typedef struct {
|
||||
uint32_t pi_id;
|
||||
uint32_t pi_type;
|
||||
union {
|
||||
uint16_t _pi_u16;
|
||||
int16_t _pi_s16;
|
||||
uint32_t _pi_u32;
|
||||
int32_t _pi_s32;
|
||||
uint64_t _pi_u64;
|
||||
int64_t _pi_s64;
|
||||
cdf_timestamp_t _pi_tp;
|
||||
struct {
|
||||
uint32_t s_len;
|
||||
const char *s_buf;
|
||||
} _pi_str;
|
||||
} pi_val;
|
||||
uint32_t pi_id;
|
||||
uint32_t pi_type;
|
||||
union {
|
||||
uint16_t _pi_u16;
|
||||
int16_t _pi_s16;
|
||||
uint32_t _pi_u32;
|
||||
int32_t _pi_s32;
|
||||
uint64_t _pi_u64;
|
||||
int64_t _pi_s64;
|
||||
cdf_timestamp_t _pi_tp;
|
||||
float _pi_f;
|
||||
double _pi_d;
|
||||
struct {
|
||||
uint32_t s_len;
|
||||
const char *s_buf;
|
||||
} _pi_str;
|
||||
} pi_val;
|
||||
#define pi_u64 pi_val._pi_u64
|
||||
#define pi_s64 pi_val._pi_s64
|
||||
#define pi_u32 pi_val._pi_u32
|
||||
#define pi_s32 pi_val._pi_s32
|
||||
#define pi_u16 pi_val._pi_u16
|
||||
#define pi_s16 pi_val._pi_s16
|
||||
#define pi_f pi_val._pi_f
|
||||
#define pi_d pi_val._pi_d
|
||||
#define pi_tp pi_val._pi_tp
|
||||
#define pi_str pi_val._pi_str
|
||||
} cdf_property_info_t;
|
||||
|
|
@ -191,13 +195,13 @@ typedef struct {
|
|||
|
||||
/* Variant type definitions */
|
||||
#define CDF_EMPTY 0x00000000
|
||||
#define CDF_NULL 0x00000001
|
||||
#define CDF_NULL 0x00000001
|
||||
#define CDF_SIGNED16 0x00000002
|
||||
#define CDF_SIGNED32 0x00000003
|
||||
#define CDF_FLOAT 0x00000004
|
||||
#define CDF_DOUBLE 0x00000005
|
||||
#define CDF_CY 0x00000006
|
||||
#define CDF_DATE 0x00000007
|
||||
#define CDF_DATE 0x00000007
|
||||
#define CDF_BSTR 0x00000008
|
||||
#define CDF_DISPATCH 0x00000009
|
||||
#define CDF_ERROR 0x0000000a
|
||||
|
|
@ -208,7 +212,7 @@ typedef struct {
|
|||
#define CDF_SIGNED8 0x00000010
|
||||
#define CDF_UNSIGNED8 0x00000011
|
||||
#define CDF_UNSIGNED16 0x00000012
|
||||
#define CDF_UNSIGNED32 0x00000013
|
||||
#define CDF_UNSIGNED32 0x00000013
|
||||
#define CDF_SIGNED64 0x00000014
|
||||
#define CDF_UNSIGNED64 0x00000015
|
||||
#define CDF_INT 0x00000016
|
||||
|
|
@ -243,7 +247,7 @@ typedef struct {
|
|||
#define CDF_PROPERTY_SUBJECT 0x00000003
|
||||
#define CDF_PROPERTY_AUTHOR 0x00000004
|
||||
#define CDF_PROPERTY_KEYWORDS 0x00000005
|
||||
#define CDF_PROPERTY_COMMENTS 0x00000006
|
||||
#define CDF_PROPERTY_COMMENTS 0x00000006
|
||||
#define CDF_PROPERTY_TEMPLATE 0x00000007
|
||||
#define CDF_PROPERTY_LAST_SAVED_BY 0x00000008
|
||||
#define CDF_PROPERTY_REVISION_NUMBER 0x00000009
|
||||
|
|
@ -260,9 +264,9 @@ typedef struct {
|
|||
#define CDF_PROPERTY_LOCALE_ID 0x80000000
|
||||
|
||||
typedef struct {
|
||||
int i_fd;
|
||||
const unsigned char *i_buf;
|
||||
size_t i_len;
|
||||
int i_fd;
|
||||
const unsigned char *i_buf;
|
||||
size_t i_len;
|
||||
} cdf_info_t;
|
||||
|
||||
struct timespec;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: encoding.c,v 1.1.1.2 2011/05/12 20:46:52 christos Exp $ */
|
||||
/* $NetBSD: encoding.c,v 1.1.1.3 2012/02/22 17:48:23 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) Ian F. Darwin 1986-1995.
|
||||
|
|
@ -38,9 +38,9 @@
|
|||
|
||||
#ifndef lint
|
||||
#if 0
|
||||
FILE_RCSID("@(#)$File: encoding.c,v 1.5 2010/07/21 16:47:17 christos Exp $")
|
||||
FILE_RCSID("@(#)$File: encoding.c,v 1.7 2012/01/24 19:02:02 christos Exp $")
|
||||
#else
|
||||
__RCSID("$NetBSD: encoding.c,v 1.1.1.2 2011/05/12 20:46:52 christos Exp $");
|
||||
__RCSID("$NetBSD: encoding.c,v 1.1.1.3 2012/02/22 17:48:23 christos Exp $");
|
||||
#endif
|
||||
#endif /* lint */
|
||||
|
||||
|
|
@ -77,6 +77,7 @@ file_encoding(struct magic_set *ms, const unsigned char *buf, size_t nbytes, uni
|
|||
int rv = 1, ucs_type;
|
||||
unsigned char *nbuf = NULL;
|
||||
|
||||
*type = "text";
|
||||
mlen = (nbytes + 1) * sizeof(nbuf[0]);
|
||||
if ((nbuf = CAST(unsigned char *, calloc((size_t)1, mlen))) == NULL) {
|
||||
file_oomem(ms, mlen);
|
||||
|
|
@ -88,7 +89,6 @@ file_encoding(struct magic_set *ms, const unsigned char *buf, size_t nbytes, uni
|
|||
goto done;
|
||||
}
|
||||
|
||||
*type = "text";
|
||||
if (looks_ascii(buf, nbytes, *ubuf, ulen)) {
|
||||
DPRINTF(("ascii %" SIZE_T_FORMAT "u\n", *ulen));
|
||||
*code = "ASCII";
|
||||
|
|
@ -139,8 +139,7 @@ file_encoding(struct magic_set *ms, const unsigned char *buf, size_t nbytes, uni
|
|||
}
|
||||
|
||||
done:
|
||||
if (nbuf)
|
||||
free(nbuf);
|
||||
free(nbuf);
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: file.c,v 1.1.1.2 2011/05/12 20:46:56 christos Exp $ */
|
||||
/* $NetBSD: file.c,v 1.1.1.3 2012/02/22 17:48:26 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) Ian F. Darwin 1986-1995.
|
||||
|
|
@ -35,9 +35,9 @@
|
|||
|
||||
#ifndef lint
|
||||
#if 0
|
||||
FILE_RCSID("@(#)$File: file.c,v 1.144 2011/05/10 17:08:14 christos Exp $")
|
||||
FILE_RCSID("@(#)$File: file.c,v 1.145 2011/12/08 12:12:46 rrt Exp $")
|
||||
#else
|
||||
__RCSID("$NetBSD: file.c,v 1.1.1.2 2011/05/12 20:46:56 christos Exp $");
|
||||
__RCSID("$NetBSD: file.c,v 1.1.1.3 2012/02/22 17:48:26 christos Exp $");
|
||||
#endif
|
||||
#endif /* lint */
|
||||
|
||||
|
|
@ -122,7 +122,7 @@ private const struct {
|
|||
{ "soft", MAGIC_NO_CHECK_SOFT },
|
||||
{ "tar", MAGIC_NO_CHECK_TAR },
|
||||
{ "text", MAGIC_NO_CHECK_TEXT }, /* synonym for ascii */
|
||||
{ "tokens", MAGIC_NO_CHECK_TOKENS },
|
||||
{ "tokens", MAGIC_NO_CHECK_TOKENS }, /* OBSOLETE: ignored for backwards compatibility */
|
||||
};
|
||||
|
||||
private char *progname; /* used throughout */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
/* $NetBSD: getline.c,v 1.1.1.1 2011/05/12 20:46:50 christos Exp $ */
|
||||
/* $NetBSD: getline.c,v 1.1.1.2 2012/02/22 17:48:20 christos Exp $ */
|
||||
|
||||
/* NetBSD: fgetln.c,v 1.9 2008/04/29 06:53:03 martin Exp */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2011 The NetBSD Foundation, Inc.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
/* $NetBSD: getopt_long.c,v 1.1.1.1 2009/05/08 16:35:05 christos Exp $ */
|
||||
/* $NetBSD: getopt_long.c,v 1.1.1.2 2012/02/22 17:48:18 christos Exp $ */
|
||||
|
||||
/* NetBSD: getopt_long.c,v 1.21.4.1 2008/01/09 01:34:14 matt Exp */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2000 The NetBSD Foundation, Inc.
|
||||
|
|
@ -35,7 +37,7 @@
|
|||
#if 0
|
||||
FILE_RCSID("@(#)$File: getopt_long.c,v 1.6 2009/02/13 18:48:05 christos Exp $")
|
||||
#else
|
||||
__RCSID("$NetBSD: getopt_long.c,v 1.1.1.1 2009/05/08 16:35:05 christos Exp $");
|
||||
__RCSID("$NetBSD: getopt_long.c,v 1.1.1.2 2012/02/22 17:48:18 christos Exp $");
|
||||
#endif
|
||||
#endif /* lint */
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: magic.h,v 1.1.1.2 2011/05/12 20:46:49 christos Exp $ */
|
||||
/* $NetBSD: magic.h,v 1.1.1.3 2012/02/22 17:48:18 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) Christos Zoulas 2003.
|
||||
|
|
@ -57,7 +57,17 @@
|
|||
#define MAGIC_NO_CHECK_ENCODING 0x200000 /* Don't check text encodings */
|
||||
|
||||
/* No built-in tests; only consult the magic file */
|
||||
#define MAGIC_NO_CHECK_BUILTIN 0x3fb000
|
||||
#define MAGIC_NO_CHECK_BUILTIN ( \
|
||||
MAGIC_NO_CHECK_COMPRESS | \
|
||||
MAGIC_NO_CHECK_TAR | \
|
||||
/* MAGIC_NO_CHECK_SOFT | */ \
|
||||
MAGIC_NO_CHECK_APPTYPE | \
|
||||
MAGIC_NO_CHECK_ELF | \
|
||||
MAGIC_NO_CHECK_TEXT | \
|
||||
MAGIC_NO_CHECK_CDF | \
|
||||
MAGIC_NO_CHECK_TOKENS | \
|
||||
MAGIC_NO_CHECK_ENCODING | \
|
||||
)
|
||||
|
||||
/* Defined for backwards compatibility (renamed) */
|
||||
#define MAGIC_NO_CHECK_ASCII MAGIC_NO_CHECK_TEXT
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
/* $NetBSD: mygetopt.h,v 1.1.1.1 2009/05/08 16:35:06 christos Exp $ */
|
||||
/* $NetBSD: mygetopt.h,v 1.1.1.2 2012/02/22 17:48:20 christos Exp $ */
|
||||
|
||||
/* NetBSD: getopt.h,v 1.8 2007/11/06 19:21:18 christos Exp */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2000 The NetBSD Foundation, Inc.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: vasprintf.c,v 1.1.1.1 2009/05/08 16:35:05 christos Exp $ */
|
||||
/* $NetBSD: vasprintf.c,v 1.1.1.2 2012/02/22 17:48:20 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) Ian F. Darwin 1986-1995.
|
||||
|
|
@ -111,9 +111,9 @@ you use strange formats.
|
|||
|
||||
#ifndef lint
|
||||
#if 0
|
||||
FILE_RCSID("@(#)$File: vasprintf.c,v 1.7 2009/02/03 20:27:52 christos Exp $")
|
||||
FILE_RCSID("@(#)$File: vasprintf.c,v 1.8 2011/12/08 12:38:24 rrt Exp $")
|
||||
#else
|
||||
__RCSID("$NetBSD: vasprintf.c,v 1.1.1.1 2009/05/08 16:35:05 christos Exp $");
|
||||
__RCSID("$NetBSD: vasprintf.c,v 1.1.1.2 2012/02/22 17:48:20 christos Exp $");
|
||||
#endif
|
||||
#endif /* lint */
|
||||
|
||||
|
|
@ -614,8 +614,7 @@ static int core(xprintf_struct *s)
|
|||
return s->pseudo_len;
|
||||
|
||||
free_EOF:
|
||||
if (s->buffer_base != NULL)
|
||||
free(s->buffer_base);
|
||||
free(s->buffer_base);
|
||||
return EOF;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue