Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/file/dist welcome to file-5.20
details: https://anonhg.NetBSD.org/src/rev/f38788a6153b
branches: trunk
changeset: 332859:f38788a6153b
user: christos <christos%NetBSD.org@localhost>
date: Fri Oct 10 20:15:01 2014 +0000
description:
welcome to file-5.20
diffstat:
external/bsd/file/dist/config.h.in | 9 +
external/bsd/file/dist/configure | 22 +-
external/bsd/file/dist/configure.ac | 4 +-
external/bsd/file/dist/doc/file.1 | 4 +-
external/bsd/file/dist/doc/libmagic.3 | 21 ++-
external/bsd/file/dist/doc/magic.5 | 4 +-
external/bsd/file/dist/magic/Makefile.am | 4 +-
external/bsd/file/dist/magic/Makefile.in | 4 +-
external/bsd/file/dist/magic/magdir/archive | 33 +----
external/bsd/file/dist/magic/magdir/elf | 4 +-
external/bsd/file/dist/magic/magdir/filesystems | 123 +++++++++++----
external/bsd/file/dist/magic/magdir/rinex | 44 -----
external/bsd/file/dist/src/Makefile.in | 6 +-
external/bsd/file/dist/src/apprentice.c | 181 ++++++++++++++++++-----
external/bsd/file/dist/src/cdf.c | 110 +++++++++++++-
external/bsd/file/dist/src/encoding.c | 6 +-
external/bsd/file/dist/src/file.c | 9 +-
external/bsd/file/dist/src/file.h | 16 +-
external/bsd/file/dist/src/funcs.c | 24 +-
external/bsd/file/dist/src/magic.c | 20 ++-
external/bsd/file/dist/src/readcdf.c | 83 ++++++++--
external/bsd/file/dist/src/softmagic.c | 55 ++++--
22 files changed, 534 insertions(+), 252 deletions(-)
diffs (truncated from 1680 to 300 lines):
diff -r c4c4896a7683 -r f38788a6153b external/bsd/file/dist/config.h.in
--- a/external/bsd/file/dist/config.h.in Fri Oct 10 20:08:15 2014 +0000
+++ b/external/bsd/file/dist/config.h.in Fri Oct 10 20:15:01 2014 +0000
@@ -44,6 +44,9 @@
/* Define to 1 if you have the `fork' function. */
#undef HAVE_FORK
+/* Define to 1 if you have the `freelocale' function. */
+#undef HAVE_FREELOCALE
+
/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
#undef HAVE_FSEEKO
@@ -95,6 +98,9 @@
/* Define to 1 if you have a working `mmap' system call. */
#undef HAVE_MMAP
+/* Define to 1 if you have the `newlocale' function. */
+#undef HAVE_NEWLOCALE
+
/* Define to 1 if you have the `pread' function. */
#undef HAVE_PREAD
@@ -182,6 +188,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Define to 1 if you have the `uselocale' function. */
+#undef HAVE_USELOCALE
+
/* Define to 1 if you have the `utime' function. */
#undef HAVE_UTIME
diff -r c4c4896a7683 -r f38788a6153b external/bsd/file/dist/configure
--- a/external/bsd/file/dist/configure Fri Oct 10 20:08:15 2014 +0000
+++ b/external/bsd/file/dist/configure Fri Oct 10 20:15:01 2014 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for file 5.19.
+# Generated by GNU Autoconf 2.69 for file 5.20.
#
# Report bugs to <christos%astron.com@localhost>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='file'
PACKAGE_TARNAME='file'
-PACKAGE_VERSION='5.19'
-PACKAGE_STRING='file 5.19'
+PACKAGE_VERSION='5.20'
+PACKAGE_STRING='file 5.20'
PACKAGE_BUGREPORT='christos%astron.com@localhost'
PACKAGE_URL=''
@@ -1331,7 +1331,7 @@
# 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.19 to adapt to many kinds of systems.
+\`configure' configures file 5.20 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1401,7 +1401,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of file 5.19:";;
+ short | recursive ) echo "Configuration of file 5.20:";;
esac
cat <<\_ACEOF
@@ -1514,7 +1514,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-file configure 5.19
+file configure 5.20
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2170,7 +2170,7 @@
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.19, which was
+It was created by file $as_me 5.20, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3036,7 +3036,7 @@
# Define the identity of the package.
PACKAGE='file'
- VERSION='5.19'
+ VERSION='5.20'
cat >>confdefs.h <<_ACEOF
@@ -14221,7 +14221,7 @@
fi
-for ac_func in strerror strndup strtoul mkstemp mkostemp utimes utime wcwidth strtof
+for ac_func in strerror strndup strtoul mkstemp mkostemp utimes utime wcwidth strtof newlocale uselocale freelocale
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -15032,7 +15032,7 @@
# 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.19, which was
+This file was extended by file $as_me 5.20, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15098,7 +15098,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-file config.status 5.19
+file config.status 5.20
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -r c4c4896a7683 -r f38788a6153b external/bsd/file/dist/configure.ac
--- a/external/bsd/file/dist/configure.ac Fri Oct 10 20:08:15 2014 +0000
+++ b/external/bsd/file/dist/configure.ac Fri Oct 10 20:15:01 2014 +0000
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([file],[5.19],[christos%astron.com@localhost])
+AC_INIT([file],[5.20],[christos%astron.com@localhost])
AM_INIT_AUTOMAKE([subdir-objects foreign])
AM_MAINTAINER_MODE(disable)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -139,7 +139,7 @@
fi])
dnl Checks for functions
-AC_CHECK_FUNCS(strerror strndup strtoul mkstemp mkostemp utimes utime wcwidth strtof)
+AC_CHECK_FUNCS(strerror strndup strtoul mkstemp mkostemp utimes utime wcwidth strtof newlocale uselocale freelocale)
dnl Provide implementation of some required functions if necessary
AC_REPLACE_FUNCS(getopt_long asprintf vasprintf strlcpy strlcat getline ctime_r asctime_r pread strcasestr fmtcheck)
diff -r c4c4896a7683 -r f38788a6153b external/bsd/file/dist/doc/file.1
--- a/external/bsd/file/dist/doc/file.1 Fri Oct 10 20:08:15 2014 +0000
+++ b/external/bsd/file/dist/doc/file.1 Fri Oct 10 20:15:01 2014 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: file.1,v 1.14 2014/06/13 02:08:06 christos Exp $
+.\" $NetBSD: file.1,v 1.15 2014/10/10 20:15:01 christos Exp $
.\"
.\" $File: file.man,v 1.106 2014/03/07 23:11:51 christos Exp $
.Dd January 30, 2014
@@ -26,7 +26,7 @@
.Nm
.Op Fl Fl help
.Sh DESCRIPTION
-This manual page documents version 5.19 of the
+This manual page documents version 5.20 of the
.Nm
command.
.Pp
diff -r c4c4896a7683 -r f38788a6153b external/bsd/file/dist/doc/libmagic.3
--- a/external/bsd/file/dist/doc/libmagic.3 Fri Oct 10 20:08:15 2014 +0000
+++ b/external/bsd/file/dist/doc/libmagic.3 Fri Oct 10 20:15:01 2014 +0000
@@ -1,6 +1,6 @@
-.\" $NetBSD: libmagic.3,v 1.12 2014/06/13 02:08:06 christos Exp $
+.\" $NetBSD: libmagic.3,v 1.13 2014/10/10 20:15:01 christos Exp $
.\"
-.\" $File: libmagic.man,v 1.28 2014/03/02 14:47:16 christos Exp $
+.\" $File: libmagic.man,v 1.29 2014/08/04 06:19:44 christos Exp $
.\"
.\" Copyright (c) Christos Zoulas 2003.
.\" All Rights Reserved.
@@ -27,7 +27,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd January 6, 2012
+.Dd August 4, 2014
.Dt LIBMAGIC 3
.Os
.Sh NAME
@@ -73,6 +73,8 @@
.Ft int
.Fn magic_load "magic_t cookie" "const char *filename"
.Ft int
+.Fn magic_load_buffers "magic_t cookie" "void **buffers" "size_t *sizes" "size_t nbuffers"
+.Ft int
.Fn magic_version "void"
.Sh DESCRIPTION
These functions
@@ -256,6 +258,19 @@
to the database filename as appropriate.
.Pp
The
+.Fn magic_load_buffers
+function takes an array of size
+.Fa nbuffers
+of
+.Fa buffers
+with a respective size for each in the array of
+.Fa sizes
+loaded with the contents of the magic databases from the filesystem.
+This function can be used in environment where the magic library does
+not have direct access to the filesystem, but can access the magic
+database via shared memory or other IPC means.
+.Pp
+The
.Fn magic_version
command returns the version number of this library which is compiled into
the shared library using the constant
diff -r c4c4896a7683 -r f38788a6153b external/bsd/file/dist/doc/magic.5
--- a/external/bsd/file/dist/doc/magic.5 Fri Oct 10 20:08:15 2014 +0000
+++ b/external/bsd/file/dist/doc/magic.5 Fri Oct 10 20:15:01 2014 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: magic.5,v 1.12 2014/06/13 02:08:06 christos Exp $
+.\" $NetBSD: magic.5,v 1.13 2014/10/10 20:15:01 christos Exp $
.\"
.\" $File: magic.man,v 1.84 2014/06/03 19:01:34 christos Exp $
.Dd June 3, 2014
@@ -12,7 +12,7 @@
This manual page documents the format of the magic file as
used by the
.Xr file 1
-command, version 5.19.
+command, version 5.20.
The
.Xr file 1
command identifies the type of a file using,
diff -r c4c4896a7683 -r f38788a6153b external/bsd/file/dist/magic/Makefile.am
--- a/external/bsd/file/dist/magic/Makefile.am Fri Oct 10 20:08:15 2014 +0000
+++ b/external/bsd/file/dist/magic/Makefile.am Fri Oct 10 20:15:01 2014 +0000
@@ -1,5 +1,5 @@
#
-# $File: Makefile.am,v 1.98 2014/06/03 18:22:34 christos Exp $
+# $File: Makefile.am,v 1.99 2014/08/04 06:26:16 christos Exp $
#
MAGIC_FRAGMENT_BASE = magdir
MAGIC_DIR = $(top_srcdir)/magic
@@ -142,6 +142,7 @@
$(MAGIC_FRAGMENT_DIR)/mcrypt \
$(MAGIC_FRAGMENT_DIR)/mercurial \
$(MAGIC_FRAGMENT_DIR)/metastore \
+$(MAGIC_FRAGMENT_DIR)/meteorological \
$(MAGIC_FRAGMENT_DIR)/mime \
$(MAGIC_FRAGMENT_DIR)/mips \
$(MAGIC_FRAGMENT_DIR)/mirage \
@@ -198,7 +199,6 @@
$(MAGIC_FRAGMENT_DIR)/python \
$(MAGIC_FRAGMENT_DIR)/revision \
$(MAGIC_FRAGMENT_DIR)/riff \
-$(MAGIC_FRAGMENT_DIR)/rinex \
$(MAGIC_FRAGMENT_DIR)/rpm \
$(MAGIC_FRAGMENT_DIR)/rtf \
$(MAGIC_FRAGMENT_DIR)/ruby \
diff -r c4c4896a7683 -r f38788a6153b external/bsd/file/dist/magic/Makefile.in
--- a/external/bsd/file/dist/magic/Makefile.in Fri Oct 10 20:08:15 2014 +0000
+++ b/external/bsd/file/dist/magic/Makefile.in Fri Oct 10 20:15:01 2014 +0000
@@ -263,7 +263,7 @@
top_srcdir = @top_srcdir@
#
-# $File: Makefile.am,v 1.98 2014/06/03 18:22:34 christos Exp $
+# $File: Makefile.am,v 1.99 2014/08/04 06:26:16 christos Exp $
#
MAGIC_FRAGMENT_BASE = magdir
MAGIC_DIR = $(top_srcdir)/magic
@@ -404,6 +404,7 @@
$(MAGIC_FRAGMENT_DIR)/mcrypt \
$(MAGIC_FRAGMENT_DIR)/mercurial \
$(MAGIC_FRAGMENT_DIR)/metastore \
+$(MAGIC_FRAGMENT_DIR)/meteorological \
$(MAGIC_FRAGMENT_DIR)/mime \
$(MAGIC_FRAGMENT_DIR)/mips \
$(MAGIC_FRAGMENT_DIR)/mirage \
@@ -460,7 +461,6 @@
$(MAGIC_FRAGMENT_DIR)/python \
$(MAGIC_FRAGMENT_DIR)/revision \
$(MAGIC_FRAGMENT_DIR)/riff \
-$(MAGIC_FRAGMENT_DIR)/rinex \
$(MAGIC_FRAGMENT_DIR)/rpm \
$(MAGIC_FRAGMENT_DIR)/rtf \
$(MAGIC_FRAGMENT_DIR)/ruby \
diff -r c4c4896a7683 -r f38788a6153b external/bsd/file/dist/magic/magdir/archive
--- a/external/bsd/file/dist/magic/magdir/archive Fri Oct 10 20:08:15 2014 +0000
+++ b/external/bsd/file/dist/magic/magdir/archive Fri Oct 10 20:15:01 2014 +0000
@@ -1,5 +1,5 @@
#------------------------------------------------------------------------------
-# $File: archive,v 1.87 2014/06/03 19:15:58 christos Exp $
+# $File: archive,v 1.88 2014/08/16 10:42:17 christos Exp $
# archive: file(1) magic for archive formats (see also "msdos" for self-
# extracting compressed archives)
#
@@ -954,34 +954,3 @@
>0xE08 search/7776 \x55\xAA
>>&-512 indirect x \b; contains
Home |
Main Index |
Thread Index |
Old Index