Permalink
Browse files

Merging upstream version 5.04.

  • Loading branch information...
1 parent b981874 commit 09c1d39e1c75b1fe59fe0a0a8c340966fe0deecf Daniel Baumann committed Jan 30, 2010
Showing with 1,279 additions and 512 deletions.
  1. +78 −0 ChangeLog
  2. +15 −15 configure
  3. +5 −5 configure.ac
  4. +22 −18 doc/file.man
  5. +8 −8 doc/libmagic.man
  6. +5 −5 doc/magic.man
  7. +2 −0 magic/Magdir/acorn
  8. +1 −0 magic/Magdir/adi
  9. +1 −0 magic/Magdir/adventure
  10. +2 −0 magic/Magdir/allegro
  11. +1 −0 magic/Magdir/alliant
  12. +2 −0 magic/Magdir/alpha
  13. +2 −0 magic/Magdir/amanda
  14. +2 −0 magic/Magdir/amigaos
  15. +16 −10 magic/Magdir/animation
  16. +1 −0 magic/Magdir/apl
  17. +2 −0 magic/Magdir/apple
  18. +1 −0 magic/Magdir/applix
  19. +80 −53 magic/Magdir/archive
  20. +1 −0 magic/Magdir/asterix
  21. +1 −0 magic/Magdir/att3b
  22. +4 −2 magic/Magdir/audio
  23. +2 −0 magic/Magdir/basis
  24. +2 −0 magic/Magdir/bflt
  25. +2 −0 magic/Magdir/blender
  26. +1 −0 magic/Magdir/blit
  27. +3 −1 magic/Magdir/bout
  28. +2 −0 magic/Magdir/bsdi
  29. +2 −0 magic/Magdir/btsnoop
  30. +2 −0 magic/Magdir/c-lang
  31. +2 −0 magic/Magdir/c64
  32. +1 −0 magic/Magdir/cad
  33. +2 −0 magic/Magdir/cafebabe
  34. +3 −1 magic/Magdir/cddb
  35. +1 −0 magic/Magdir/chord
  36. +2 −0 magic/Magdir/cisco
  37. +2 −0 magic/Magdir/citrus
  38. +1 −0 magic/Magdir/clarion
  39. +1 −0 magic/Magdir/claris
  40. +1 −0 magic/Magdir/clipper
  41. +26 −25 magic/Magdir/commands
  42. +1 −0 magic/Magdir/communications
  43. +1 −0 magic/Magdir/compress
  44. +2 −0 magic/Magdir/console
  45. +2 −0 magic/Magdir/convex
  46. +1 −0 magic/Magdir/cracklib
  47. +2 −0 magic/Magdir/ctags
  48. +1 −0 magic/Magdir/dact
  49. +1 −0 magic/Magdir/database
  50. +1 −0 magic/Magdir/diamond
  51. +5 −0 magic/Magdir/diff
  52. +3 −0 magic/Magdir/digital
  53. +3 −0 magic/Magdir/dolby
  54. +1 −0 magic/Magdir/dump
  55. +1 −0 magic/Magdir/dyadic
  56. +1 −0 magic/Magdir/editors
  57. +1 −0 magic/Magdir/efi
  58. +1 −0 magic/Magdir/elf
  59. +1 −0 magic/Magdir/encore
  60. +48 −6 magic/Magdir/epoc
  61. +1 −0 magic/Magdir/erlang
  62. +1 −0 magic/Magdir/esri
  63. +1 −0 magic/Magdir/fcs
  64. +111 −13 magic/Magdir/filesystems
  65. +4 −0 magic/Magdir/flash
  66. +9 −1 magic/Magdir/fonts
  67. +3 −0 magic/Magdir/fortran
  68. +2 −0 magic/Magdir/frame
  69. +1 −0 magic/Magdir/freebsd
  70. +1 −0 magic/Magdir/fsav
  71. +2 −0 magic/Magdir/games
  72. +1 −0 magic/Magdir/gcc
  73. +1 −0 magic/Magdir/geos
  74. +2 −0 magic/Magdir/gimp
  75. +3 −0 magic/Magdir/gnome-keyring
  76. +2 −0 magic/Magdir/gnu
  77. +1 −0 magic/Magdir/gnumeric
  78. +1 −0 magic/Magdir/grace
  79. +2 −0 magic/Magdir/graphviz
  80. +1 −0 magic/Magdir/gringotts
  81. +1 −0 magic/Magdir/hitachi-sh
  82. +2 −0 magic/Magdir/hp
  83. +1 −0 magic/Magdir/human68k
  84. +1 −0 magic/Magdir/ibm370
  85. +1 −0 magic/Magdir/ibm6000
  86. +1 −0 magic/Magdir/iff
  87. +27 −2 magic/Magdir/images
  88. +2 −1 magic/Magdir/inform
  89. +1 −0 magic/Magdir/intel
  90. +1 −0 magic/Magdir/interleaf
  91. +1 −0 magic/Magdir/island
  92. +1 −0 magic/Magdir/ispell
  93. +2 −0 magic/Magdir/java
  94. +1 −0 magic/Magdir/jpeg
  95. +1 −0 magic/Magdir/karma
  96. +1 −0 magic/Magdir/kde
  97. +2 −0 magic/Magdir/kml
  98. +2 −0 magic/Magdir/lecter
  99. +2 −0 magic/Magdir/lex
  100. +1 −0 magic/Magdir/lif
  101. +5 −0 magic/Magdir/linux
  102. +2 −2 magic/Magdir/lisp
  103. +1 −0 magic/Magdir/llvm
  104. +4 −2 magic/Magdir/lua
  105. +1 −0 magic/Magdir/luks
  106. +2 −0 magic/Magdir/mach
  107. +1 −0 magic/Magdir/macintosh
  108. +1 −0 magic/Magdir/magic
  109. +2 −0 magic/Magdir/mail.news
  110. +1 −0 magic/Magdir/maple
  111. +1 −0 magic/Magdir/mathcad
  112. +2 −0 magic/Magdir/mathematica
  113. +2 −1 magic/Magdir/matroska
  114. +2 −0 magic/Magdir/mcrypt
  115. +1 −0 magic/Magdir/mercurial
  116. +2 −0 magic/Magdir/mime
  117. +1 −0 magic/Magdir/mips
  118. +1 −0 magic/Magdir/mirage
  119. +2 −0 magic/Magdir/misctools
  120. +1 −0 magic/Magdir/mkid
  121. +1 −0 magic/Magdir/mlssa
  122. +1 −0 magic/Magdir/mmdf
  123. +2 −0 magic/Magdir/modem
  124. +1 −0 magic/Magdir/motorola
  125. +1 −0 magic/Magdir/mozilla
  126. +5 −4 magic/Magdir/msdos
  127. +1 −0 magic/Magdir/msvc
  128. +2 −0 magic/Magdir/mup
  129. +1 −0 magic/Magdir/natinst
  130. +1 −0 magic/Magdir/ncr
  131. +1 −0 magic/Magdir/netbsd
  132. +1 −0 magic/Magdir/netscape
  133. +1 −0 magic/Magdir/netware
  134. +1 −0 magic/Magdir/news
  135. +2 −0 magic/Magdir/nitpicker
  136. +1 −0 magic/Magdir/ocaml
  137. +2 −0 magic/Magdir/octave
  138. +1 −0 magic/Magdir/ole2compounddocs
  139. +1 −0 magic/Magdir/olf
  140. +2 −0 magic/Magdir/os2
  141. +2 −0 magic/Magdir/os400
  142. +3 −0 magic/Magdir/os9
  143. +3 −0 magic/Magdir/osf1
  144. +1 −0 magic/Magdir/palm
  145. +1 −0 magic/Magdir/parix
  146. +1 −0 magic/Magdir/pbm
  147. +2 −0 magic/Magdir/pdf
  148. +1 −0 magic/Magdir/pdp
  149. +11 −9 magic/Magdir/perl
  150. +1 −0 magic/Magdir/pgp
  151. +1 −0 magic/Magdir/pkgadd
  152. +1 −0 magic/Magdir/plan9
  153. +1 −0 magic/Magdir/plus5
  154. +1 −0 magic/Magdir/printer
  155. +1 −0 magic/Magdir/project
  156. +1 −0 magic/Magdir/psdbms
  157. +0 −43 magic/Magdir/psion
  158. +1 −0 magic/Magdir/pulsar
  159. +1 −0 magic/Magdir/pyramid
  160. +13 −4 magic/Magdir/python
  161. +1 −0 magic/Magdir/revision
  162. +1 −0 magic/Magdir/riff
  163. +28 −13 magic/Magdir/rpm
  164. +1 −0 magic/Magdir/rtf
  165. +9 −3 magic/Magdir/ruby
  166. +1 −0 magic/Magdir/sc
  167. +1 −0 magic/Magdir/sccs
  168. +2 −0 magic/Magdir/scientific
  169. +3 −0 magic/Magdir/securitycerts
  170. +1 −0 magic/Magdir/sendmail
  171. +1 −0 magic/Magdir/sequent
  172. +1 −0 magic/Magdir/sgi
  173. +39 −13 magic/Magdir/sgml
  174. +1 −0 magic/Magdir/sharc
  175. +1 −0 magic/Magdir/sinclair
  176. +2 −0 magic/Magdir/sketch
  177. +1 −0 magic/Magdir/smalltalk
  178. +1 −0 magic/Magdir/sniffer
  179. +2 −0 magic/Magdir/softquad
  180. +1 −0 magic/Magdir/spec
  181. +1 −0 magic/Magdir/spectrum
  182. +1 −0 magic/Magdir/sql
  183. +1 −0 magic/Magdir/sun
  184. +2 −0 magic/Magdir/sysex
  185. +2 −0 magic/Magdir/teapot
  186. +1 −0 magic/Magdir/terminfo
  187. +2 −0 magic/Magdir/tex
  188. +2 −0 magic/Magdir/tgif
  189. +3 −1 magic/Magdir/ti-8x
  190. +1 −0 magic/Magdir/timezone
  191. +2 −0 magic/Magdir/troff
  192. +2 −1 magic/Magdir/tuxedo
  193. +1 −0 magic/Magdir/typeset
  194. +3 −1 magic/Magdir/unicode
  195. +1 −0 magic/Magdir/unknown
  196. +2 −0 magic/Magdir/uuencode
  197. +1 −0 magic/Magdir/varied.out
  198. +2 −0 magic/Magdir/varied.script
  199. +1 −0 magic/Magdir/vax
  200. +1 −0 magic/Magdir/vicar
  201. +17 −0 magic/Magdir/virtual
  202. +2 −0 magic/Magdir/virtutech
  203. +1 −0 magic/Magdir/visx
  204. +1 −0 magic/Magdir/vms
  205. +2 −1 magic/Magdir/vmware
  206. +1 −0 magic/Magdir/vorbis
  207. +1 −0 magic/Magdir/vxl
  208. +1 −0 magic/Magdir/warc
  209. +1 −0 magic/Magdir/weak
  210. +1 −0 magic/Magdir/windows
  211. +2 −0 magic/Magdir/wireless
  212. +2 −0 magic/Magdir/wordprocessors
  213. +1 −0 magic/Magdir/xdelta
  214. +1 −0 magic/Magdir/xenix
  215. +1 −0 magic/Magdir/xilinx
  216. +1 −0 magic/Magdir/xo65
  217. +1 −0 magic/Magdir/xwindows
  218. +1 −0 magic/Magdir/zilog
  219. +1 −0 magic/Magdir/zyxel
  220. +11 −7 magic/Makefile.am
  221. +11 −7 magic/Makefile.in
  222. +82 −36 src/apprentice.c
  223. +96 −66 src/cdf.c
  224. +16 −7 src/cdf_time.c
  225. +11 −9 src/compress.c
  226. +17 −1 src/encoding.c
  227. +16 −32 src/file.c
  228. +21 −14 src/file.h
  229. +2 −2 src/fsmagic.c
  230. +3 −3 src/funcs.c
  231. +38 −4 src/magic.c
  232. +1 −0 src/magic.h
  233. +5 −2 src/patchlevel.h
  234. +11 −7 src/print.c
  235. +39 −24 src/readcdf.c
  236. +4 −4 src/readelf.c
  237. +26 −23 src/softmagic.c
View
@@ -1,3 +1,81 @@
+2010-01-22 15:45 Christos Zoulas <christos@zoulas.com>
+
+ * print proper mime for crystal reports file
+
+ * print the last summary information of a cdf document, not the
+ first so that nested documents print the right info
+
+2010-01-16 18:42 Charles Longeau <chl@tuxfamily.org>
+
+ * bring back some fixes from OpenBSD:
+ - make gcc2 builds file
+ - fix typos in a magic file comment
+
+2009-11-17 18:35 Christos Zoulas <christos@zoulas.com>
+
+ * ctime/asctime can return NULL on some OS's although
+ they should not (Toshit Antani)
+
+2009-09-14 13:49 Christos Zoulas <christos@zoulas.com>
+
+ * Centralize magic path handling routines and remove the
+ special-casing from file.c so that the python module for
+ example comes up with the same magic path (Fixes ~/.magic
+ handling) (from Gab)
+
+2009-09-11 23:38 Reuben Thomas <rrt@sc3d.org>
+
+ * When magic argument is a directory, read the files in
+ strcmp-sorted order (fixes Debian bug #488562 and our own FIXME).
+
+2009-09-11 13:11 Reuben Thomas <rrt@sc3d.org>
+
+ * Combine overlapping epoc and psion magic files into one (epoc).
+
+ * Add some more EPOC MIME types.
+
+2009-08-19 15:55 Christos Zoulas <christos@zoulas.com>
+
+ * Fix 3 bugs (From Ian Darwin):
+ - file_showstr could move one past the end of the array
+ - parse_apple did not nul terminate the string in the overflow case
+ - parse_mime truncated the wrong string in the overflow case
+
+2009-08-12 12:28 Robert Byrnes <byrnes@wildpumpkin.net>
+
+ * Include Localstuff when compiling magic.
+
+2009-07-15 10:05 Christos Zoulas <christos@zoulas.com>
+
+ * Fix logic for including mygetopts.h
+
+ * Make cdf.c compile again with debugging
+
+ * Add the necessary field handling for crystal reports files to work
+
+2009-06-23 01:34 Reuben Thomas <rrt@sc3d.org>
+
+ * Stop "(if" identifying Lisp files, that's plain dumb!
+
+2009-06-09 22:13 Reuben Thomas <rrt@sc3d.org>
+
+ * Add a couple of missing MP3 MIME types.
+
+2009-05-27 23:00 Reuben Thomas <rrt@sc3d.org>
+
+ * Add full range of hash-bang tests for Python and Ruby.
+
+ * Add MIME types for Python and Ruby scripts.
+
+2009-05-13 10:44 Christos Zoulas <christos@zoulas.com>
+
+ * off by one in parsing hw capabilities in elf
+ (Cheng Renquan)
+
+2009-05-08 13:40 Christos Zoulas <christos@zoulas.com>
+
+ * lint fixes and more from NetBSD
+
2009-05-06 10:25 Christos Zoulas <christos@zoulas.com>
* Avoid null dereference in cdf code (Drew Yao)
View
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for file 5.03.
+# Generated by GNU Autoconf 2.61 for file 5.04.
#
# Report bugs to <christos@astron.com>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='file'
PACKAGE_TARNAME='file'
-PACKAGE_VERSION='5.03'
-PACKAGE_STRING='file 5.03'
+PACKAGE_VERSION='5.04'
+PACKAGE_STRING='file 5.04'
PACKAGE_BUGREPORT='christos@astron.com'
# Factoring default headers for most tests.
@@ -1399,7 +1399,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.03 to adapt to many kinds of systems.
+\`configure' configures file 5.04 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1469,7 +1469,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of file 5.03:";;
+ short | recursive ) echo "Configuration of file 5.04:";;
esac
cat <<\_ACEOF
@@ -1576,7 +1576,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-file configure 5.03
+file configure 5.04
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1590,7 +1590,7 @@ 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.03, which was
+It was created by file $as_me 5.04, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2280,7 +2280,7 @@ fi
# Define the identity of the package.
PACKAGE='file'
- VERSION='5.03'
+ VERSION='5.04'
cat >>confdefs.h <<_ACEOF
@@ -23563,17 +23563,17 @@ echo "${ECHO_T}yes" >&6; }
fi
else
-if test "$GCC" = no; then
- WARNINGS=
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-else
+if test "$GCC" = yes; then
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
WARNINGS="-Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith \
-Wmissing-declarations -Wredundant-decls -Wnested-externs \
-Wsign-compare -Wreturn-type -Wswitch -Wshadow \
-Wcast-qual -Wwrite-strings -Wextra -Wunused-parameter"
+else
+ WARNINGS=
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
fi
@@ -24303,7 +24303,7 @@ exec 6>&1
# 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.03, which was
+This file was extended by file $as_me 5.04, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -24356,7 +24356,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-file config.status 5.03
+file config.status 5.04
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
View
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(file, 5.03, christos@astron.com)
+AC_INIT(file, 5.04, christos@astron.com)
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(config.h)
#AC_CONFIG_MACRO_DIR([m4])
@@ -130,15 +130,15 @@ else
-Wsign-compare -Wreturn-type -Wswitch -Wshadow \
-Wcast-qual -Wwrite-strings -Wextra -Wunused-parameter"
fi], [
-if test "$GCC" = no; then
- WARNINGS=
- AC_MSG_RESULT(no)
-else
+if test "$GCC" = yes; then
AC_MSG_RESULT(yes)
WARNINGS="-Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith \
-Wmissing-declarations -Wredundant-decls -Wnested-externs \
-Wsign-compare -Wreturn-type -Wswitch -Wshadow \
-Wcast-qual -Wwrite-strings -Wextra -Wunused-parameter"
+else
+ WARNINGS=
+ AC_MSG_RESULT(no)
fi])
dnl Checks for functions
View
@@ -1,4 +1,4 @@
-.\" $File: file.man,v 1.79 2008/11/06 22:49:08 rrt Exp $
+.\" $File: file.man,v 1.82 2009/11/04 22:30:34 christos Exp $
.Dd October 9, 2008
.Dt FILE __CSECTION__
.Os
@@ -7,16 +7,20 @@
.Nd determine file type
.Sh SYNOPSIS
.Nm
-.Op Fl bchikLnNprsvz
-.Op Fl -mime-type
+.Bk -words
+.Op Fl bchikLNnprsvz0
+.Op Fl -apple
.Op Fl -mime-encoding
-.Op Fl f Ar namefile
+.Op Fl -mime-type
+.Op Fl e Ar testname
.Op Fl F Ar separator
+.Op Fl f Ar namefile
.Op Fl m Ar magicfiles
-.Ar file
+.Ar
+.Ek -words
.Nm
.Fl C
-.Op Fl m Ar magicfile
+.Op Fl m Ar magicfiles
.Nm
.Op Fl -help
.Sh DESCRIPTION
@@ -161,21 +165,21 @@ in any of the character sets listed above is simply said to be
.Bl -tag -width indent
.It Fl b , -brief
Do not prepend filenames to output lines (brief mode).
+.It Fl C , -compile
+Write a
+.Pa magic.mgc
+output file that contains a pre-parsed version of the magic file or directory.
.It Fl c , -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
-Write a
-.Pa magic.mgc
-output file that contains a pre-parsed version of the magic file or directory.
.It Fl e , -exclude Ar testname
Exclude the test named in
.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).
@@ -198,6 +202,10 @@ Consults magic files.
.It tar
Examines tar files.
.El
+.It Fl F , -separator Ar separator
+Use the specified string as the separator between the filename and the
+file result returned. Defaults to
+.Sq \&: .
.It Fl f , -files-from Ar namefile
Read the names of the files to be examined from
.Ar namefile
@@ -209,10 +217,6 @@ or at least one filename argument must be present;
to test the standard input, use
.Sq -
as a filename argument.
-.It Fl F , -separator Ar separator
-Use the specified string as the separator between the filename and the
-file result returned. Defaults to
-.Sq \&: .
.It Fl h , -no-dereference
option causes symlinks not to be followed
(on systems that support symbolic links). This is the default if the
@@ -250,16 +254,16 @@ option causes symlinks to be followed, as the like-named option in
This is the default if the environment variable
.Dv POSIXLY_CORRECT
is defined.
-.It Fl m , -magic-file Ar list
+.It Fl m , -magic-file Ar magicfiles
Specify an alternate list of files and directories containing magic.
This can be a single item, or a colon-separated list.
If a compiled magic file is found alongside a file or directory, it will be used instead.
+.It Fl N , -no-pad
+Don't pad filenames so that they align in the output.
.It Fl n , -no-buffer
Force stdout to be flushed after checking each file.
This is only useful if checking a list of files.
It is intended to be used by programs that want filetype output from a pipe.
-.It Fl N , -no-pad
-Don't pad filenames so that they align in the output.
.It Fl p , -preserve-date
On systems that support
.Xr utime 2
View
@@ -1,4 +1,4 @@
-.\" $File: libmagic.man,v 1.19 2008/10/06 20:16:04 christos Exp $
+.\" $File: libmagic.man,v 1.21 2009/11/24 21:16:14 christos Exp $
.\"
.\" Copyright (c) Christos Zoulas 2003.
.\" All Rights Reserved.
@@ -12,7 +12,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
@@ -25,8 +25,8 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd October 6, 2008
-.Dt MAGIC 3
+.Dd November 24, 2009
+.Dt LIBMAGIC 3
.Os
.Sh NAME
.Nm magic_open ,
@@ -73,7 +73,7 @@ in
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
@@ -165,7 +165,7 @@ bytes size.
.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.
@@ -219,7 +219,7 @@ functions return 0 on success and -1 on failure.
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
@@ -242,7 +242,7 @@ The compiled default magic database.
.El
.Sh SEE ALSO
.Xr file __CSECTION__ ,
-.Xr magic __FSECTION__
+.Xr magic __FSECTION__
.Sh AUTHORS
Måns Rullgård Initial libmagic implementation,
and configuration.
Oops, something went wrong.

0 comments on commit 09c1d39

Please sign in to comment.