|
@@ -25,7 +25,7 @@ Last-Update: 2016-06-27
|
|
|
+
|
|
|
--- a/src/apprentice.c
|
|
|
+++ b/src/apprentice.c
|
|
|
-@@ -460,7 +460,7 @@
|
|
|
+@@ -462,7 +462,7 @@
|
|
|
#ifndef COMPILE_ONLY
|
|
|
map = apprentice_map(ms, fn);
|
|
|
if (map == NULL) {
|
|
@@ -47,7 +47,7 @@ Last-Update: 2016-06-27
|
|
|
libmagic_la_SOURCES = buffer.c magic.c apprentice.c softmagic.c ascmagic.c \
|
|
|
--- a/src/Makefile.in
|
|
|
+++ b/src/Makefile.in
|
|
|
-@@ -359,7 +359,7 @@
|
|
|
+@@ -360,7 +360,7 @@
|
|
|
MAGIC = $(pkgdatadir)/magic
|
|
|
lib_LTLIBRARIES = libmagic.la
|
|
|
nodist_include_HEADERS = magic.h
|
|
@@ -58,15 +58,15 @@ Last-Update: 2016-06-27
|
|
|
encoding.c compress.c is_csv.c is_json.c is_tar.c readelf.c print.c \
|
|
|
--- a/doc/file.man
|
|
|
+++ b/doc/file.man
|
|
|
-@@ -58,7 +58,7 @@
|
|
|
- or non-printable).
|
|
|
+@@ -59,7 +59,7 @@
|
|
|
Exceptions are well-known file formats (core files, tar archives)
|
|
|
that are known to contain binary data.
|
|
|
--When modifying magic files or the program itself, make sure to
|
|
|
-+When adding local definitions to /etc/magic, make sure to
|
|
|
- .Em "preserve these keywords" .
|
|
|
+ When modifying magic files or the program itself, make sure to
|
|
|
+-.Em preserve these keywords .
|
|
|
++.Em "preserve these keywords" .
|
|
|
Users depend on knowing that all the readable files in a directory
|
|
|
have the word
|
|
|
+ .Dq text
|
|
|
@@ -102,7 +102,8 @@
|
|
|
has been applied by extension to data files.
|
|
|
Any file with some invariant identifier at a small fixed
|
|
@@ -77,7 +77,7 @@ Last-Update: 2016-06-27
|
|
|
magic file
|
|
|
.Pa __MAGIC__.mgc ,
|
|
|
or the files in the directory
|
|
|
-@@ -565,12 +566,6 @@
|
|
|
+@@ -572,12 +573,6 @@
|
|
|
The order of entries in the magic file is significant.
|
|
|
Depending on what system you are using, the order that
|
|
|
they are put together may be incorrect.
|