| | 1 | --- file-4.20/doc/file.man.orig 2007-01-25 22:05:46.000000000 +0100 |
| | 2 | +++ file-4.20/doc/file.man 2007-03-18 13:32:16.817249006 +0100 |
| | 3 | @@ -47,9 +47,8 @@ |
| | 4 | or non-printable). |
| | 5 | Exceptions are well-known file formats (core files, tar archives) |
| | 6 | that are known to contain binary data. |
| | 7 | -When modifying the file |
| | 8 | -.Pa __MAGIC__ |
| | 9 | -or the program itself, make sure to |
| | 10 | +When adding local definitions to |
| | 11 | +.Pa /etc/magic , |
| | 12 | .Em "preserve these keywords" . |
| | 13 | People depend on knowing that all the readable files in a directory |
| | 14 | have the word |
| | 15 | @@ -99,7 +98,9 @@ |
| | 16 | has been applied by extension to data files. |
| | 17 | Any file with some invariant identifier at a small fixed |
| | 18 | offset into the file can usually be described in this way. |
| | 19 | -The information identifying these files is read from the compiled |
| | 20 | +The information identifying these files is read from |
| | 21 | +.I /etc/magic |
| | 22 | +and the compiled |
| | 23 | magic file |
| | 24 | .Pa __MAGIC__.mgc , |
| | 25 | or |
| | 26 | @@ -413,12 +414,6 @@ |
| | 27 | The order of entries in the magic file is significant. |
| | 28 | Depending on what system you are using, the order that |
| | 29 | they are put together may be incorrect. |
| | 30 | -If your old |
| | 31 | -.Nm |
| | 32 | -command uses a magic file, |
| | 33 | -keep the old magic file around for comparison purposes |
| | 34 | -(rename it to |
| | 35 | -.Pa __MAGIC__.orig ). |
| | 36 | .Sh EXAMPLES |
| | 37 | .Bd -literal -offset indent |
| | 38 | $ file file.c file /dev/{wd0a,hda} |
| | 39 | @@ -592,3 +587,7 @@ |
| | 40 | .Dv ftp.astron.com |
| | 41 | in the directory |
| | 42 | .Dv /pub/file/file-X.YZ.tar.gz |
| | 43 | +.Pp |
| | 44 | +This version contains some extensions from |
| | 45 | +.Dv Debian |
| | 46 | +(mainly new magic entries). |
| | 47 | --- file-4.07.orig/magic/Header |
| | 48 | +++ file-4.07/magic/Header |
| | 49 | @@ -1,5 +1,5 @@ |
| | 50 | -# Magic |
| | 51 | # Magic data for file(1) command. |
| | 52 | -# Machine-generated from src/cmd/file/magdir/*; edit there only! |
| | 53 | -# Format is described in magic(files), where: |
| | 54 | -# files is 5 on V7 and BSD, 4 on SV, and ?? in the SVID. |
| | 55 | +# Format is described in magic(5). |
| | 56 | +# Don't edit this file, edit /etc/magic or send your suggested inclusions to |
| | 57 | +# this file as a wishlist bug against file (using the reportbug utility). |
| | 58 | + |
| | 59 | --- file-4.21/magic/magic.mime.orig 2007-04-03 23:11:32.000000000 +0200 |
| | 60 | +++ file-4.21/magic/magic.mime 2007-05-26 19:23:17.258702418 +0200 |
| | 61 | @@ -196,7 +196,7 @@ |
| | 62 | # modified by Joerg Jenderek |
| | 63 | # GRR the original test are too common for many DOS files |
| | 64 | # so test 1 <= kbits nibble <= E |
| | 65 | -0 beshort &0xffe0 |
| | 66 | +0 beshort&0xffe0 =0xfffa |
| | 67 | >2 ubyte&0xF0 >0x0F |
| | 68 | >>2 ubyte&0xF0 <0xE1 audio/mpeg |
| | 69 | #MP3 with ID3 tag |
| | 70 | @@ -298,10 +298,10 @@ |
| | 71 | # because it tries to uncompress it to figure out what's inside. |
| | 72 | |
| | 73 | # standard unix compress |
| | 74 | -0 string \037\235 application/x-compress |
| | 75 | +#0 string \037\235 application/x-compress |
| | 76 | |
| | 77 | # gzip (GNU zip, not to be confused with [Info-ZIP/PKWARE] zip archiver) |
| | 78 | -0 string \037\213 application/x-gzip |
| | 79 | +#0 string \037\213 application/x-gzip |
| | 80 | |
| | 81 | 0 string PK\003\004 application/x-zip |
| | 82 | |
| | 83 | @@ -474,7 +474,7 @@ |
| | 84 | 0 beshort 0xffd8 image/jpeg |
| | 85 | |
| | 86 | # PC bitmaps (OS/2, Windoze BMP files) (Greg Roelofs, newt@uchicago.edu) |
| | 87 | -0 string BM image/bmp |
| | 88 | +0 string BM image/x-ms-bmp |
| | 89 | #>14 byte 12 (OS/2 1.x format) |
| | 90 | #>14 byte 64 (OS/2 2.x format) |
| | 91 | #>14 byte 40 (Windows 3.x format) |
| | 92 | @@ -801,6 +801,7 @@ |
| | 93 | # |
| | 94 | 0 string FWS |
| | 95 | >3 byte x application/x-shockwave-flash |
| | 96 | +0 string CWS application/x-shockwave-flash |
| | 97 | |
| | 98 | # The following paramaters are created for Namazu. |
| | 99 | # <http://www.namazu.org/> |
| | 100 | @@ -955,3 +956,8 @@ |
| | 101 | # Symbian installation files |
| | 102 | 8 lelong 0x10000419 application/vnd.symbian.install |
| | 103 | 0 lelong 0x10201A7A x-epoc/x-sisx-app |
| | 104 | + |
| | 105 | +# Gnumeric spreadsheet |
| | 106 | +# This entry is only semi-helpful, as Gnumeric compresses its files, so |
| | 107 | +# they will ordinarily reported as "compressed", but at least -z helps |
| | 108 | +39 string =<gmr:Workbook application/x-gnumeric |
| | 109 | --- file-4.07.orig/magic/magic.local |
| | 110 | +++ file-4.07/magic/magic.local |
| | 111 | @@ -0,0 +1,3 @@ |
| | 112 | +# Magic local data for file(1) command. |
| | 113 | +# Insert here your local magic data. Format is described in magic(5). |
| | 114 | + |
| | 115 | --- file-4.18/src/magic.c.orig 2006-10-31 20:37:17.000000000 +0100 |
| | 116 | +++ file-4.18/src/magic.c 2006-11-13 16:15:31.219505000 +0100 |
| | 117 | @@ -238,7 +238,7 @@ |
| | 118 | int fd = 0; |
| | 119 | int rv = -1; |
| | 120 | unsigned char *buf; |
| | 121 | - struct stat sb; |
| | 122 | + struct stat sb, *st = &sb; |
| | 123 | ssize_t nbytes = 0; /* number of bytes read from a datafile */ |
| | 124 | int ispipe = 0; |
| | 125 | |
| | 126 | @@ -253,7 +253,7 @@ |
| | 127 | if (file_reset(ms) == -1) |
| | 128 | goto done; |
| | 129 | |
| | 130 | - switch (file_fsmagic(ms, inname, &sb)) { |
| | 131 | + switch (file_fsmagic(ms, inname, st)) { |
| | 132 | case -1: /* error */ |
| | 133 | goto done; |
| | 134 | case 0: /* nothing found */ |
projects / packages / file.git / blame_incremental