Browse Source

Import upstream version 5.22+15

Christoph Biedl 4 years ago
parent
commit
01411a22be
10 changed files with 437 additions and 415 deletions
  1. 4 0
      ChangeLog
  2. 365 365
      autom4te.cache/requests
  3. 3 1
      magic/Magdir/images
  4. 3 2
      magic/Magdir/os2
  5. 3 3
      magic/Magdir/vorbis
  6. 4 4
      src/Makefile.in
  7. 35 17
      src/cdf.c
  8. 1 1
      src/cdf.h
  9. 7 3
      src/print.c
  10. 12 19
      src/softmagic.c

+ 4 - 0
ChangeLog

@@ -1,3 +1,7 @@
+2015-01-05  13:00  Christos Zoulas <christos@zoulas.com>
+
+	* PR/411: Fix memory corruption from corrupt cdf file.
+
 2015-01-02  15:15  Christos Zoulas <christos@zoulas.com>
 
 	* release 5.22

+ 365 - 365
autom4te.cache/requests

@@ -43,188 +43,188 @@
                         'configure.ac'
                       ],
                       {
-                        'AU_DEFUN' => 1,
-                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
-                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
-                        'AC_PATH_MAGIC' => 1,
-                        'AC_CHECK_LIBM' => 1,
-                        'AC_LTDL_DLSYM_USCORE' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'AC_LIBTOOL_CXX' => 1,
-                        '_LTDL_SETUP' => 1,
-                        '_m4_warn' => 1,
-                        'include' => 1,
-                        'AC_PROG_LD_RELOAD_FLAG' => 1,
-                        'AM_AUX_DIR_EXPAND' => 1,
-                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
-                        'AC_LIBTOOL_GCJ' => 1,
-                        'AM_RUN_LOG' => 1,
                         'AC_LIBTOOL_SETUP' => 1,
-                        '_AM_SET_OPTIONS' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'AC_LTDL_ENABLE_INSTALL' => 1,
-                        'LT_AC_PROG_EGREP' => 1,
-                        'AC_STRUCT_TIMEZONE_DAYLIGHT' => 1,
-                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
-                        '_LT_LINKER_BOILERPLATE' => 1,
-                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
-                        'AC_LIBTOOL_LINKER_OPTION' => 1,
-                        '_LT_AC_SYS_COMPILER' => 1,
-                        'LT_PATH_LD' => 1,
-                        'AM_MISSING_PROG' => 1,
-                        '_LT_AC_LANG_GCJ' => 1,
-                        'LTDL_CONVENIENCE' => 1,
-                        'AC_DISABLE_FAST_INSTALL' => 1,
-                        '_LT_AC_PROG_CXXCPP' => 1,
-                        '_LT_LIBOBJ' => 1,
-                        'AC_ENABLE_STATIC' => 1,
-                        'AC_LTDL_SHLIBEXT' => 1,
-                        '_LT_AC_LANG_C_CONFIG' => 1,
-                        'AC_LIBTOOL_OBJDIR' => 1,
+                        'LT_AC_PROG_SED' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
                         'LT_CMD_MAX_LEN' => 1,
-                        '_LT_AC_LANG_CXX' => 1,
-                        'AM_PROG_INSTALL_SH' => 1,
-                        '_LT_LINKER_OPTION' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
                         '_LT_PROG_LTMAIN' => 1,
+                        'AC_PROG_EGREP' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
                         'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
-                        'AM_SUBST_NOTMAKE' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        '_LT_AC_LANG_CXX_CONFIG' => 1,
-                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
-                        '_LT_CC_BASENAME' => 1,
-                        '_LT_PROG_ECHO_BACKSLASH' => 1,
-                        'AM_SET_DEPDIR' => 1,
+                        'AC_PROG_NM' => 1,
+                        'AM_DISABLE_SHARED' => 1,
+                        'AC_LIBTOOL_RC' => 1,
+                        'LT_PATH_NM' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
                         '_LT_PREPARE_SED_QUOTE_VARS' => 1,
-                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
-                        '_LT_AC_LANG_F77' => 1,
-                        'm4_pattern_allow' => 1,
+                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+                        '_LT_AC_CHECK_DLFCN' => 1,
+                        'AU_DEFUN' => 1,
+                        '_LT_LINKER_BOILERPLATE' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
+                        'AC_DEPLIBS_CHECK_METHOD' => 1,
+                        'LT_AC_PROG_EGREP' => 1,
+                        'LTVERSION_VERSION' => 1,
+                        'LT_PATH_LD' => 1,
+                        'AC_LTDL_ENABLE_INSTALL' => 1,
                         'gl_PREREQ_ARGZ' => 1,
-                        'AC_LIBLTDL_INSTALLABLE' => 1,
-                        'AC_DISABLE_STATIC' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'LTSUGAR_VERSION' => 1,
-                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'LT_LANG' => 1,
-                        'LT_WITH_LTDL' => 1,
-                        '_AM_PROG_CC_C_O' => 1,
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        'gl_FUNC_ARGZ' => 1,
+                        'AM_PROG_NM' => 1,
                         'gl_VISIBILITY' => 1,
-                        '_AM_SET_OPTION' => 1,
-                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AM_MISSING_HAS_RUN' => 1,
-                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
                         '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
-                        '_LT_COMPILER_OPTION' => 1,
-                        'AC_LIBTOOL_CONFIG' => 1,
-                        'AC_PROG_LD' => 1,
-                        'AC_LTDL_DLLIB' => 1,
+                        'AC_ENABLE_FAST_INSTALL' => 1,
+                        '_AM_DEPENDENCIES' => 1,
+                        'AM_RUN_LOG' => 1,
+                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        'LT_FUNC_DLSYM_USCORE' => 1,
                         'LT_SYS_DLOPEN_SELF' => 1,
-                        '_LT_WITH_SYSROOT' => 1,
-                        'AM_PROG_LD' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
-                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
-                        'AM_DISABLE_STATIC' => 1,
-                        'AC_CONFIG_MACRO_DIR' => 1,
-                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
-                        'AC_LTDL_OBJDIR' => 1,
-                        'AC_DEFUN' => 1,
-                        '_AM_CONFIG_MACRO_DIRS' => 1,
-                        'AM_PROG_INSTALL_STRIP' => 1,
+                        'LT_PROG_RC' => 1,
+                        'LT_AC_PROG_GCJ' => 1,
                         'AM_SET_LEADING_DOT' => 1,
-                        'LT_OUTPUT' => 1,
-                        '_LT_AC_SHELL_INIT' => 1,
-                        'AM_ENABLE_SHARED' => 1,
                         'LT_SYS_DLOPEN_DEPLIBS' => 1,
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'LT_OUTPUT' => 1,
                         '_LT_PATH_TOOL_PREFIX' => 1,
-                        'AC_LIBTOOL_DLOPEN' => 1,
-                        'LT_AC_PROG_GCJ' => 1,
-                        'AC_ENABLE_SHARED' => 1,
+                        '_AM_SET_OPTIONS' => 1,
+                        '_LT_LINKER_OPTION' => 1,
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+                        '_LT_AC_SYS_COMPILER' => 1,
+                        'LT_PROG_GCJ' => 1,
+                        '_AM_PROG_CC_C_O' => 1,
+                        'AC_LIBLTDL_CONVENIENCE' => 1,
+                        'LT_PROG_GO' => 1,
+                        'include' => 1,
+                        'LT_AC_PROG_RC' => 1,
+                        '_LT_PROG_ECHO_BACKSLASH' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        '_LT_CC_BASENAME' => 1,
+                        '_LT_PROG_CXX' => 1,
+                        '_LT_AC_LANG_C_CONFIG' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        '_LT_COMPILER_OPTION' => 1,
+                        '_AM_CONFIG_MACRO_DIRS' => 1,
+                        '_LT_AC_LANG_RC_CONFIG' => 1,
+                        'LT_INIT' => 1,
+                        'LT_LIB_M' => 1,
+                        'AM_PROG_LD' => 1,
+                        '_LT_AC_LANG_GCJ' => 1,
+                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
+                        '_LT_AC_TAGVAR' => 1,
+                        '_LT_WITH_SYSROOT' => 1,
+                        'AC_LIBTOOL_WIN32_DLL' => 1,
+                        'LT_SYS_MODULE_PATH' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        '_AM_IF_OPTION' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        'AC_STRUCT_TIMEZONE_DAYLIGHT' => 1,
+                        '_LT_AC_LANG_F77_CONFIG' => 1,
+                        '_LT_PROG_FC' => 1,
+                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                        '_AM_SET_OPTION' => 1,
+                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
                         'AC_LTDL_SHLIBPATH' => 1,
+                        '_m4_warn' => 1,
+                        'AC_DEFUN' => 1,
+                        'AM_ENABLE_SHARED' => 1,
+                        'AC_ENABLE_STATIC' => 1,
                         'LT_SYS_SYMBOL_USCORE' => 1,
-                        'AC_LTDL_SYMBOL_USCORE' => 1,
-                        'AM_PROG_NM' => 1,
-                        'LT_SYS_DLSEARCH_PATH' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'LT_SYS_MODULE_EXT' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
                         'm4_pattern_forbid' => 1,
-                        'AC_ENABLE_FAST_INSTALL' => 1,
-                        '_AM_MANGLE_OPTION' => 1,
-                        '_LT_AC_LANG_F77_CONFIG' => 1,
-                        '_LT_COMPILER_BOILERPLATE' => 1,
-                        'LTVERSION_VERSION' => 1,
-                        'LT_FUNC_DLSYM_USCORE' => 1,
-                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        'LT_LIB_DLLOAD' => 1,
+                        'AM_ENABLE_STATIC' => 1,
                         'AC_LTDL_PREOPEN' => 1,
-                        'AC_DEFUN_ONCE' => 1,
+                        'AC_LIBTOOL_CONFIG' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
                         'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
-                        '_AM_DEPENDENCIES' => 1,
-                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
-                        'LT_SYS_MODULE_EXT' => 1,
-                        'AC_LIBLTDL_CONVENIENCE' => 1,
-                        'LT_INIT' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'AC_DISABLE_SHARED' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
-                        'LT_PROG_GO' => 1,
-                        'AC_LTDL_SYSSEARCHPATH' => 1,
-                        'LTOPTIONS_VERSION' => 1,
-                        'AC_LIBTOOL_WIN32_DLL' => 1,
-                        'AC_PROG_LD_GNU' => 1,
-                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
-                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
-                        'm4_include' => 1,
                         'LTDL_INIT' => 1,
-                        'AC_STRUCT_OPTION_GETOPT_H' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
+                        'AC_PATH_TOOL_PREFIX' => 1,
+                        'AM_DEP_TRACK' => 1,
+                        'AC_PROG_LD_RELOAD_FLAG' => 1,
+                        'AC_DISABLE_SHARED' => 1,
+                        'AM_SET_DEPDIR' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
                         'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
-                        'AC_LIBTOOL_RC' => 1,
-                        'LTDL_INSTALLABLE' => 1,
-                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        '_LT_AC_FILE_LTDLL_C' => 1,
-                        '_LT_PROG_CXX' => 1,
-                        'LT_PROG_GCJ' => 1,
+                        '_LT_AC_LANG_CXX' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1,
+                        'AM_SUBST_NOTMAKE' => 1,
+                        'LTDL_CONVENIENCE' => 1,
+                        'LTOPTIONS_VERSION' => 1,
+                        'AC_LTDL_SHLIBEXT' => 1,
+                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+                        'LT_LANG' => 1,
+                        'AC_LIBTOOL_GCJ' => 1,
+                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+                        '_AC_PROG_LIBTOOL' => 1,
                         '_AM_PROG_TAR' => 1,
-                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
-                        '_LT_AC_TAGVAR' => 1,
-                        'gl_FUNC_ARGZ' => 1,
-                        'AM_DISABLE_SHARED' => 1,
-                        'AM_ENABLE_STATIC' => 1,
-                        '_AM_IF_OPTION' => 1,
-                        'AM_SANITY_CHECK' => 1,
+                        'AC_STRUCT_OPTION_GETOPT_H' => 1,
+                        '_LT_AC_LANG_CXX_CONFIG' => 1,
                         'AC_LIBTOOL_FC' => 1,
-                        'AC_LIB_LTDL' => 1,
-                        'AM_DEP_TRACK' => 1,
-                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
-                        'AC_PROG_NM' => 1,
-                        'LT_AC_PROG_SED' => 1,
-                        'AC_DEPLIBS_CHECK_METHOD' => 1,
-                        'LT_AC_PROG_RC' => 1,
-                        'AC_LIBTOOL_PICMODE' => 1,
-                        'LT_PATH_NM' => 1,
-                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        '_AC_PROG_LIBTOOL' => 1,
-                        '_LT_AC_CHECK_DLFCN' => 1,
-                        'LTOBSOLETE_VERSION' => 1,
-                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
-                        '_LT_PROG_FC' => 1,
-                        'AC_LIBTOOL_F77' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'LT_PROG_RC' => 1,
-                        'LT_LIB_M' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+                        '_LT_COMPILER_BOILERPLATE' => 1,
+                        'LT_SYS_DLSEARCH_PATH' => 1,
+                        'AC_LIBLTDL_INSTALLABLE' => 1,
+                        '_LT_AC_PROG_CXXCPP' => 1,
+                        'AC_LIBTOOL_CXX' => 1,
                         '_LT_PROG_F77' => 1,
-                        'AC_PROG_EGREP' => 1,
                         'AC_WITH_LTDL' => 1,
-                        'AC_PATH_TOOL_PREFIX' => 1,
-                        'LT_LIB_DLLOAD' => 1,
-                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
-                        'LT_SYS_MODULE_PATH' => 1,
-                        'AM_MAKE_INCLUDE' => 1,
+                        'LTSUGAR_VERSION' => 1,
+                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+                        'LT_WITH_LTDL' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AC_DEFUN_ONCE' => 1,
+                        'AC_LTDL_DLSYM_USCORE' => 1,
+                        'AC_PATH_MAGIC' => 1,
+                        'LTOBSOLETE_VERSION' => 1,
+                        '_LT_LIBOBJ' => 1,
+                        'AC_LIBTOOL_DLOPEN' => 1,
+                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
+                        'AC_LIBTOOL_PICMODE' => 1,
+                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+                        'LTDL_INSTALLABLE' => 1,
+                        'AC_LTDL_OBJDIR' => 1,
+                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        '_LT_AC_SHELL_INIT' => 1,
+                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+                        'AC_LTDL_SYSSEARCHPATH' => 1,
+                        '_AM_MANGLE_OPTION' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'AC_LIBTOOL_LINKER_OPTION' => 1,
+                        'AC_ENABLE_SHARED' => 1,
                         '_LT_AC_LOCK' => 1,
-                        '_AM_AUTOCONF_VERSION' => 1,
-                        '_LT_AC_LANG_RC_CONFIG' => 1
+                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
+                        'AC_LIB_LTDL' => 1,
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'AC_LIBTOOL_F77' => 1,
+                        '_LTDL_SETUP' => 1,
+                        'm4_include' => 1,
+                        'AC_PROG_LD' => 1,
+                        'AC_CHECK_LIBM' => 1,
+                        'AM_MISSING_PROG' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        '_LT_AC_LANG_F77' => 1,
+                        'AM_DISABLE_STATIC' => 1,
+                        'AC_LIBTOOL_OBJDIR' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
+                        'AC_LTDL_DLLIB' => 1,
+                        'AC_LTDL_SYMBOL_USCORE' => 1,
+                        'AC_PROG_LD_GNU' => 1,
+                        'AC_DISABLE_STATIC' => 1,
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -239,66 +239,66 @@
                         'configure.ac'
                       ],
                       {
+                        'include' => 1,
+                        'AM_NLS' => 1,
+                        'AC_CANONICAL_HOST' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'AC_SUBST_TRACE' => 1,
+                        'AM_PROG_F77_C_O' => 1,
+                        'AC_REQUIRE_AUX_FILE' => 1,
+                        'AM_ENABLE_MULTILIB' => 1,
+                        '_AM_COND_ENDIF' => 1,
+                        'AM_MAKEFILE_INCLUDE' => 1,
                         'AM_XGETTEXT_OPTION' => 1,
-                        'AM_PROG_MKDIR_P' => 1,
-                        'm4_include' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+                        'm4_sinclude' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        '_m4_warn' => 1,
+                        'AC_INIT' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'AC_CONFIG_AUX_DIR' => 1,
+                        'AC_FC_FREEFORM' => 1,
+                        'AC_DEFINE_TRACE_LITERAL' => 1,
+                        'AC_SUBST' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AC_FC_PP_SRCEXT' => 1,
                         'AM_SILENT_RULES' => 1,
-                        'AC_CONFIG_FILES' => 1,
-                        'AM_POT_TOOLS' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AC_CANONICAL_BUILD' => 1,
+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
+                        '_AM_COND_ELSE' => 1,
+                        'AM_PROG_MOC' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        '_AM_MAKEFILE_INCLUDE' => 1,
                         'AM_AUTOMAKE_VERSION' => 1,
+                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
                         'AC_FC_PP_DEFINE' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
                         'sinclude' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'AC_CONFIG_SUBDIRS' => 1,
+                        'AC_LIBSOURCE' => 1,
                         'AM_PATH_GUILE' => 1,
-                        'AC_CONFIG_HEADERS' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
-                        '_AM_COND_ENDIF' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        'AC_FC_SRCEXT' => 1,
+                        'LT_INIT' => 1,
+                        'AM_PROG_FC_C_O' => 1,
                         'AH_OUTPUT' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AC_SUBST' => 1,
-                        'AC_INIT' => 1,
+                        'AC_FC_SRCEXT' => 1,
+                        'AM_POT_TOOLS' => 1,
+                        'm4_include' => 1,
+                        'AM_PROG_MKDIR_P' => 1,
                         '_AM_COND_IF' => 1,
-                        'AC_LIBSOURCE' => 1,
-                        '_AM_COND_ELSE' => 1,
-                        'AC_CONFIG_SUBDIRS' => 1,
-                        '_AM_MAKEFILE_INCLUDE' => 1,
-                        'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        'AC_SUBST_TRACE' => 1,
-                        'AM_NLS' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'm4_sinclude' => 1,
-                        'AC_CANONICAL_BUILD' => 1,
-                        'AM_PROG_MOC' => 1,
-                        'AC_FC_PP_SRCEXT' => 1,
-                        'AC_FC_FREEFORM' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
+                        'AC_CONFIG_LINKS' => 1,
+                        'AM_PROG_CXX_C_O' => 1,
                         'AM_PROG_AR' => 1,
-                        'AM_PROG_F77_C_O' => 1,
-                        '_m4_warn' => 1,
                         'AM_PROG_CC_C_O' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        'AC_CANONICAL_HOST' => 1,
-                        'AC_DEFINE_TRACE_LITERAL' => 1,
-                        'AC_CONFIG_AUX_DIR' => 1,
-                        'AC_REQUIRE_AUX_FILE' => 1,
-                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
-                        'AM_GNU_GETTEXT' => 1,
-                        'LT_INIT' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
+                        'AC_CANONICAL_TARGET' => 1,
+                        'AC_CONFIG_FILES' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
                         '_AM_SUBST_NOTMAKE' => 1,
-                        'm4_pattern_allow' => 1,
-                        'include' => 1,
-                        'AM_ENABLE_MULTILIB' => 1,
-                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-                        'AM_PROG_CXX_C_O' => 1,
-                        'AC_CONFIG_LINKS' => 1,
-                        'AM_PROG_FC_C_O' => 1,
-                        'AM_MAKEFILE_INCLUDE' => 1
+                        'AC_CONFIG_HEADERS' => 1,
+                        'AM_GNU_GETTEXT' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -341,188 +341,188 @@
                         'configure.ac'
                       ],
                       {
-                        'LTDL_INSTALLABLE' => 1,
-                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
-                        '_LT_AC_FILE_LTDLL_C' => 1,
-                        '_LT_PROG_CXX' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        '_LT_AC_TAGVAR' => 1,
-                        'LT_PROG_GCJ' => 1,
-                        '_AM_PROG_TAR' => 1,
-                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+                        'AC_LIBLTDL_INSTALLABLE' => 1,
+                        'LT_SYS_DLSEARCH_PATH' => 1,
+                        '_LT_PROG_F77' => 1,
+                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+                        'AC_WITH_LTDL' => 1,
+                        'LTSUGAR_VERSION' => 1,
+                        '_LT_AC_PROG_CXXCPP' => 1,
+                        'AC_LIBTOOL_CXX' => 1,
+                        'LT_LANG' => 1,
+                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+                        '_AC_PROG_LIBTOOL' => 1,
+                        'AC_LIBTOOL_GCJ' => 1,
+                        'AC_LTDL_SHLIBEXT' => 1,
+                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1,
                         'LTOPTIONS_VERSION' => 1,
-                        'AC_LTDL_SYSSEARCHPATH' => 1,
-                        'AC_LIBTOOL_WIN32_DLL' => 1,
-                        'AC_PROG_LD_GNU' => 1,
-                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
-                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+                        'LTDL_CONVENIENCE' => 1,
+                        'AM_SUBST_NOTMAKE' => 1,
+                        '_LT_COMPILER_BOILERPLATE' => 1,
+                        'AC_LIBTOOL_FC' => 1,
+                        '_LT_AC_LANG_CXX_CONFIG' => 1,
+                        '_AM_PROG_TAR' => 1,
                         'AC_STRUCT_OPTION_GETOPT_H' => 1,
-                        'm4_include' => 1,
-                        'LTDL_INIT' => 1,
-                        'AC_LIBTOOL_RC' => 1,
-                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
-                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
-                        'LTVERSION_VERSION' => 1,
-                        'LT_FUNC_DLSYM_USCORE' => 1,
-                        'AC_LTDL_PREOPEN' => 1,
+                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+                        'AC_LIBTOOL_PICMODE' => 1,
+                        '_LT_LIBOBJ' => 1,
+                        'AC_LIBTOOL_DLOPEN' => 1,
+                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
+                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+                        'LTDL_INSTALLABLE' => 1,
+                        'AC_LTDL_OBJDIR' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'LT_WITH_LTDL' => 1,
+                        'AC_PATH_MAGIC' => 1,
+                        'LTOBSOLETE_VERSION' => 1,
                         'AC_DEFUN_ONCE' => 1,
-                        'AC_LIBLTDL_CONVENIENCE' => 1,
+                        'AC_LTDL_DLSYM_USCORE' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
                         'LT_SYS_MODULE_EXT' => 1,
+                        'AM_ENABLE_STATIC' => 1,
+                        'AC_LTDL_PREOPEN' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'LT_LIB_DLLOAD' => 1,
+                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+                        'AC_LTDL_SHLIBPATH' => 1,
+                        '_m4_warn' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'AC_DEFUN' => 1,
+                        'AC_ENABLE_STATIC' => 1,
+                        'AM_ENABLE_SHARED' => 1,
+                        'LT_SYS_SYMBOL_USCORE' => 1,
+                        'AM_SET_DEPDIR' => 1,
+                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        '_LT_AC_LANG_CXX' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
                         'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'AC_LIBTOOL_CONFIG' => 1,
+                        'AC_DISABLE_SHARED' => 1,
+                        'AM_DEP_TRACK' => 1,
+                        'AC_PROG_LD_RELOAD_FLAG' => 1,
+                        'LTDL_INIT' => 1,
+                        'AC_PATH_TOOL_PREFIX' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
+                        'AC_CHECK_LIBM' => 1,
+                        'AM_DISABLE_STATIC' => 1,
+                        'AC_LIBTOOL_OBJDIR' => 1,
+                        'AM_MISSING_PROG' => 1,
                         '_AC_AM_CONFIG_HEADER_HOOK' => 1,
-                        '_AM_DEPENDENCIES' => 1,
-                        'LT_PROG_GO' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        '_LT_AC_LANG_F77' => 1,
                         'AC_PROG_LIBTOOL' => 1,
-                        'AC_DISABLE_SHARED' => 1,
-                        'LT_INIT' => 1,
-                        'LT_AC_PROG_GCJ' => 1,
-                        '_LT_PATH_TOOL_PREFIX' => 1,
-                        'AC_LIBTOOL_DLOPEN' => 1,
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'AC_LTDL_SHLIBPATH' => 1,
-                        'LT_SYS_SYMBOL_USCORE' => 1,
-                        'AC_ENABLE_SHARED' => 1,
-                        'AM_PROG_NM' => 1,
-                        'LT_SYS_DLSEARCH_PATH' => 1,
+                        'AC_LIBTOOL_F77' => 1,
+                        '_LTDL_SETUP' => 1,
+                        'm4_include' => 1,
+                        'AC_PROG_LD' => 1,
                         'AC_LTDL_SYMBOL_USCORE' => 1,
-                        'm4_pattern_forbid' => 1,
-                        '_LT_AC_LANG_F77_CONFIG' => 1,
+                        'AC_PROG_LD_GNU' => 1,
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+                        'AC_DISABLE_STATIC' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
+                        'AC_LTDL_DLLIB' => 1,
                         '_AM_MANGLE_OPTION' => 1,
-                        '_LT_COMPILER_BOILERPLATE' => 1,
-                        'AC_ENABLE_FAST_INSTALL' => 1,
-                        'AC_PATH_TOOL_PREFIX' => 1,
-                        'AC_WITH_LTDL' => 1,
-                        'AC_PROG_EGREP' => 1,
-                        'LT_SYS_MODULE_PATH' => 1,
-                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
-                        'LT_LIB_DLLOAD' => 1,
-                        'AM_MAKE_INCLUDE' => 1,
-                        '_LT_AC_LANG_RC_CONFIG' => 1,
-                        '_AM_AUTOCONF_VERSION' => 1,
+                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+                        'AC_LTDL_SYSSEARCHPATH' => 1,
+                        '_LT_AC_SHELL_INIT' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        'AC_LIB_LTDL' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'AC_LIBTOOL_LINKER_OPTION' => 1,
+                        'AC_ENABLE_SHARED' => 1,
                         '_LT_AC_LOCK' => 1,
-                        'AC_LIBTOOL_F77' => 1,
                         'AM_AUTOMAKE_VERSION' => 1,
-                        '_LT_PROG_FC' => 1,
-                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
-                        'LT_PROG_RC' => 1,
-                        '_LT_PROG_F77' => 1,
-                        'LT_LIB_M' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
-                        'LT_AC_PROG_SED' => 1,
-                        'AC_PROG_NM' => 1,
-                        'LT_PATH_NM' => 1,
-                        'AC_DEPLIBS_CHECK_METHOD' => 1,
-                        'AC_LIBTOOL_PICMODE' => 1,
-                        'LT_AC_PROG_RC' => 1,
-                        '_LT_AC_CHECK_DLFCN' => 1,
-                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        '_AC_PROG_LIBTOOL' => 1,
-                        'LTOBSOLETE_VERSION' => 1,
-                        '_AM_IF_OPTION' => 1,
-                        'gl_FUNC_ARGZ' => 1,
-                        'AM_ENABLE_STATIC' => 1,
-                        'AM_DISABLE_SHARED' => 1,
-                        'AC_LIBTOOL_FC' => 1,
-                        'AC_LIB_LTDL' => 1,
-                        'AM_SANITY_CHECK' => 1,
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
                         'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
-                        'AM_DEP_TRACK' => 1,
-                        '_LT_AC_LANG_C_CONFIG' => 1,
-                        'AC_LIBTOOL_OBJDIR' => 1,
+                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
                         'AM_PROG_INSTALL_SH' => 1,
+                        'gl_FUNC_ARGZ' => 1,
+                        'AM_PROG_NM' => 1,
+                        'gl_VISIBILITY' => 1,
+                        'LT_PATH_LD' => 1,
+                        'LTVERSION_VERSION' => 1,
+                        'gl_PREREQ_ARGZ' => 1,
+                        'AC_LTDL_ENABLE_INSTALL' => 1,
+                        'LT_OUTPUT' => 1,
+                        '_AM_SET_OPTIONS' => 1,
+                        '_LT_PATH_TOOL_PREFIX' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AM_SET_LEADING_DOT' => 1,
                         '_LT_LINKER_OPTION' => 1,
-                        'LT_CMD_MAX_LEN' => 1,
-                        '_LT_AC_LANG_CXX' => 1,
+                        'AM_RUN_LOG' => 1,
+                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+                        'AC_ENABLE_FAST_INSTALL' => 1,
+                        '_AM_DEPENDENCIES' => 1,
+                        'LT_SYS_DLOPEN_SELF' => 1,
+                        'LT_PROG_RC' => 1,
+                        'LT_AC_PROG_GCJ' => 1,
+                        'LT_FUNC_DLSYM_USCORE' => 1,
+                        'AC_PROG_EGREP' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+                        'AC_PROG_NM' => 1,
                         'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'LT_CMD_MAX_LEN' => 1,
+                        'AC_LIBTOOL_SETUP' => 1,
+                        'LT_AC_PROG_SED' => 1,
                         '_LT_PROG_LTMAIN' => 1,
-                        'AM_SUBST_NOTMAKE' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AC_LTDL_ENABLE_INSTALL' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'AC_LIBTOOL_LINKER_OPTION' => 1,
-                        '_LT_AC_SYS_COMPILER' => 1,
-                        'AC_STRUCT_TIMEZONE_DAYLIGHT' => 1,
-                        'LT_AC_PROG_EGREP' => 1,
-                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
-                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
                         '_LT_LINKER_BOILERPLATE' => 1,
-                        'AM_MISSING_PROG' => 1,
-                        '_LT_AC_LANG_GCJ' => 1,
-                        'LT_PATH_LD' => 1,
-                        'AC_LTDL_SHLIBEXT' => 1,
-                        'AC_ENABLE_STATIC' => 1,
-                        'AC_DISABLE_FAST_INSTALL' => 1,
-                        'LTDL_CONVENIENCE' => 1,
-                        '_LT_AC_PROG_CXXCPP' => 1,
-                        '_LT_LIBOBJ' => 1,
                         'AM_AUX_DIR_EXPAND' => 1,
-                        'include' => 1,
-                        'AC_PROG_LD_RELOAD_FLAG' => 1,
-                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
-                        'AM_RUN_LOG' => 1,
-                        'AC_LIBTOOL_GCJ' => 1,
-                        '_AM_SET_OPTIONS' => 1,
-                        'AC_LIBTOOL_SETUP' => 1,
-                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
-                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+                        '_LT_AC_CHECK_DLFCN' => 1,
                         'AU_DEFUN' => 1,
-                        'AC_PATH_MAGIC' => 1,
-                        'AC_CHECK_LIBM' => 1,
-                        '_LTDL_SETUP' => 1,
-                        '_m4_warn' => 1,
-                        'AC_LTDL_DLSYM_USCORE' => 1,
-                        'AC_LIBTOOL_CXX' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        '_LT_COMPILER_OPTION' => 1,
-                        'AC_LIBTOOL_CONFIG' => 1,
-                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
-                        'AM_DISABLE_STATIC' => 1,
-                        'AC_CONFIG_MACRO_DIR' => 1,
-                        'LT_SYS_DLOPEN_SELF' => 1,
-                        'AC_LTDL_DLLIB' => 1,
-                        'AC_PROG_LD' => 1,
+                        'LT_AC_PROG_EGREP' => 1,
+                        'AC_DEPLIBS_CHECK_METHOD' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
+                        'AC_LIBTOOL_RC' => 1,
+                        'AM_DISABLE_SHARED' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
+                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+                        'LT_PATH_NM' => 1,
+                        'LT_LIB_M' => 1,
+                        '_LT_AC_LANG_RC_CONFIG' => 1,
+                        'LT_INIT' => 1,
                         'AM_PROG_LD' => 1,
-                        '_LT_WITH_SYSROOT' => 1,
-                        'AM_PROG_INSTALL_STRIP' => 1,
-                        'AC_DEFUN' => 1,
-                        'AM_SET_LEADING_DOT' => 1,
+                        '_LT_AC_LANG_GCJ' => 1,
+                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
+                        '_LT_AC_LANG_C_CONFIG' => 1,
                         '_AM_CONFIG_MACRO_DIRS' => 1,
-                        'AC_LTDL_OBJDIR' => 1,
-                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
-                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
-                        'LT_OUTPUT' => 1,
-                        '_LT_AC_SHELL_INIT' => 1,
-                        'AM_ENABLE_SHARED' => 1,
-                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
-                        'LT_WITH_LTDL' => 1,
-                        '_AM_PROG_CC_C_O' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'LT_LANG' => 1,
-                        '_AM_SET_OPTION' => 1,
-                        'gl_VISIBILITY' => 1,
-                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
-                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
-                        'AM_MISSING_HAS_RUN' => 1,
-                        'AM_SILENT_RULES' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        '_LT_COMPILER_OPTION' => 1,
+                        '_LT_AC_LANG_F77_CONFIG' => 1,
                         '_LT_AC_SYS_LIBPATH_AIX' => 1,
-                        '_LT_AC_LANG_F77' => 1,
-                        'm4_pattern_allow' => 1,
-                        'gl_PREREQ_ARGZ' => 1,
-                        'AC_LIBLTDL_INSTALLABLE' => 1,
-                        'LTSUGAR_VERSION' => 1,
+                        '_AM_SET_OPTION' => 1,
+                        '_LT_PROG_FC' => 1,
+                        'AC_LIBTOOL_WIN32_DLL' => 1,
+                        '_LT_WITH_SYSROOT' => 1,
+                        '_LT_AC_TAGVAR' => 1,
+                        '_AM_IF_OPTION' => 1,
                         '_AM_SUBST_NOTMAKE' => 1,
-                        'AC_DISABLE_STATIC' => 1,
-                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
-                        '_LT_AC_LANG_CXX_CONFIG' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'AM_SET_DEPDIR' => 1,
-                        '_LT_PROG_ECHO_BACKSLASH' => 1,
+                        'AC_STRUCT_TIMEZONE_DAYLIGHT' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        'LT_SYS_MODULE_PATH' => 1,
+                        '_LT_AC_SYS_COMPILER' => 1,
+                        'LT_PROG_GCJ' => 1,
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+                        'include' => 1,
+                        'LT_PROG_GO' => 1,
+                        '_AM_PROG_CC_C_O' => 1,
+                        'AC_LIBLTDL_CONVENIENCE' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        '_LT_PROG_CXX' => 1,
                         '_LT_CC_BASENAME' => 1,
-                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
-                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1
+                        'LT_AC_PROG_RC' => 1,
+                        '_LT_PROG_ECHO_BACKSLASH' => 1
                       }
                     ], 'Autom4te::Request' )
            );

+ 3 - 1
magic/Magdir/images

@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: images,v 1.101 2015/01/01 04:16:51 christos Exp $
+# $File: images,v 1.102 2015/01/02 02:36:35 christos Exp $
 # images:  file(1) magic for image formats (see also "iff", and "c-lang" for
 # XPM bitmaps)
 #
@@ -167,6 +167,7 @@
 >>>>8	leshort		x		\b(unknown 0x%x)
 >>>12	use		tiff_entry
 >0	leshort		0x106		\b, PhotometricIntepretation=
+>>8	clear		x
 >>8	leshort		0		\bWhiteIsZero
 >>8	leshort		1		\bBlackIsZero
 >>8	leshort		2		\bRGB
@@ -175,6 +176,7 @@
 >>8	leshort		5		\bCMYK
 >>8	leshort		6		\bYCbCr
 >>8	leshort		8		\bCIELab
+>>8	default		x
 >>>8	leshort		x		\b(unknown=0x%x)
 >>12	use		tiff_entry
 # FillOrder

+ 3 - 2
magic/Magdir/os2

@@ -1,13 +1,14 @@
 
 #------------------------------------------------------------------------------
-# $File$
+# $File: os2,v 1.7 2009/09/19 16:28:11 christos Exp $
 # os2:  file(1) magic for OS/2 files
 #
 
 # Provided 1998/08/22 by
 # David Mediavilla <davidme.news@REMOVEIFNOTSPAMusa.net>
 1	search/1	InternetShortcut	MS Windows 95 Internet shortcut text
->24	search/1	>\ 			(URL=<%s>)
+>17	search/100	URL= 			(URL=<
+>>&0	string		x			\b%s>)
 
 # OS/2 URL objects
 # Provided 1998/08/22 by

+ 3 - 3
magic/Magdir/vorbis

@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: vorbis,v 1.19 2014/09/23 12:57:41 christos Exp $
+# $File: vorbis,v 1.20 2014/09/23 16:35:08 christos Exp $
 # vorbis:  file(1) magic for Ogg/Vorbis files
 #
 # From Felix von Leitner <leitner@fefe.de>
@@ -47,8 +47,8 @@
 # non-Vorbis content: Skeleton
 >>28		string		fishead\0	\b, Skeleton
 !:mime		video/ogg
->>>36		short		x		v%u
->>>40		short		x		\b.%u
+>>>36		leshort		x		v%u
+>>>40		leshort		x		\b.%u
 # non-Vorbis content: Speex
 >>28		string		Speex\ \ \ 	\b, Speex audio
 !:mime		audio/ogg

+ 4 - 4
src/Makefile.in

@@ -81,10 +81,10 @@ build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = file$(EXEEXT)
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am strlcat.c \
-	strlcpy.c getopt_long.c pread.c asctime_r.c fmtcheck.c \
-	strcasestr.c getline.c asprintf.c ctime_r.c vasprintf.c \
-	$(top_srcdir)/depcomp $(include_HEADERS)
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	getopt_long.c ctime_r.c pread.c asprintf.c vasprintf.c \
+	strlcpy.c strcasestr.c getline.c fmtcheck.c strlcat.c \
+	asctime_r.c $(top_srcdir)/depcomp $(include_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \

+ 35 - 17
src/cdf.c

@@ -35,7 +35,7 @@
 #include "file.h"
 
 #ifndef lint
-FILE_RCSID("@(#)$File: cdf.c,v 1.69 2014/12/04 15:56:46 christos Exp $")
+FILE_RCSID("@(#)$File: cdf.c,v 1.71 2015/01/05 18:00:36 christos Exp $")
 #endif
 
 #include <assert.h>
@@ -1002,8 +1002,12 @@ cdf_unpack_summary_info(const cdf_stream_t *sst, const cdf_header_t *h,
 
 
 #define extract_catalog_field(t, f, l) \
-    memcpy(&ce[i].f, b + (l), sizeof(ce[i].f)); \
-    ce[i].f = CAST(t, CDF_TOLE(ce[i].f))
+    if (b + l + sizeof(cep->f) > eb) { \
+	    cep->ce_namlen = 0; \
+	    break; \
+    } \
+    memcpy(&cep->f, b + (l), sizeof(cep->f)); \
+    ce[i].f = CAST(t, CDF_TOLE(cep->f))
 
 int
 cdf_unpack_catalog(const cdf_header_t *h, const cdf_stream_t *sst,
@@ -1029,22 +1033,36 @@ cdf_unpack_catalog(const cdf_header_t *h, const cdf_stream_t *sst,
 	    malloc(sizeof(cdf_catalog_t) + nr * sizeof(*ce)));
 	(*cat)->cat_num = nr;
 	ce = (*cat)->cat_e;
+	memset(ce, 0, nr * sizeof(*ce));
 	b = CAST(const char *, sst->sst_tab);
-	for (i = 0; i < nr; i++) {
+	for (i = 0; i < nr; i++, b += reclen) {
+		cdf_catalog_entry_t *cep = &ce[i];
+		uint16_t rlen;
+
 		extract_catalog_field(uint16_t, ce_namlen, 0);
 		extract_catalog_field(uint16_t, ce_num, 2);
 		extract_catalog_field(uint64_t, ce_timestamp, 6);
-		reclen = ce[i].ce_namlen;
-		ce[i].ce_namlen =
-		    sizeof(ce[i].ce_name) / sizeof(ce[i].ce_name[0]) - 1;
-		if (ce[i].ce_namlen > reclen - 14)
-			ce[i].ce_namlen = reclen - 14;
+		reclen = cep->ce_namlen;
+
+		if (reclen < 14) {
+			cep->ce_namlen = 0;
+			continue;
+		}
+
+		cep->ce_namlen = __arraycount(cep->ce_name) - 1;
+		rlen = reclen - 14;
+		if (cep->ce_namlen > rlen)
+			cep->ce_namlen = rlen;
+
 		np = CAST(const uint16_t *, CAST(const void *, (b + 16)));
-		for (k = 0; k < ce[i].ce_namlen; k++) {
-			ce[i].ce_name[k] = np[k]; /* XXX: CDF_TOLE2? */
+		if (CAST(const char *, np + cep->ce_namlen) > eb) {
+			cep->ce_namlen = 0;
+			break;
 		}
-		ce[i].ce_name[ce[i].ce_namlen] = 0;
-		b += reclen;
+
+		for (k = 0; k < cep->ce_namlen; k++)
+			cep->ce_name[k] = np[k]; /* XXX: CDF_TOLE2? */
+		cep->ce_name[cep->ce_namlen] = 0;
 	}
 	return 0;
 }
@@ -1190,10 +1208,10 @@ cdf_dump_sat(const char *prefix, const cdf_sat_t *sat, size_t size)
 }
 
 void
-cdf_dump(void *v, size_t len)
+cdf_dump(const void *v, size_t len)
 {
 	size_t i, j;
-	unsigned char *p = v;
+	const unsigned char *p = v;
 	char abuf[16];
 	(void)fprintf(stderr, "%.4x: ", 0);
 	for (i = 0, j = 0; i < len; i++, p++) {
@@ -1329,10 +1347,10 @@ cdf_dump_property_info(const cdf_property_info_t *info, size_t count)
 				cdf_print_elapsed_time(buf, sizeof(buf), tp);
 				(void)fprintf(stderr, "timestamp %s\n", buf);
 			} else {
-				char buf[26];
+				char tbuf[26];
 				cdf_timestamp_to_timespec(&ts, tp);
 				(void)fprintf(stderr, "timestamp %s",
-				    cdf_ctime(&ts.tv_sec, buf));
+				    cdf_ctime(&ts.tv_sec, tbuf));
 			}
 			break;
 		case CDF_CLIPBOARD:

+ 1 - 1
src/cdf.h

@@ -339,7 +339,7 @@ char *cdf_u16tos8(char *, size_t, const uint16_t *);
 #ifdef CDF_DEBUG
 void cdf_dump_header(const cdf_header_t *);
 void cdf_dump_sat(const char *, const cdf_sat_t *, size_t);
-void cdf_dump(void *, size_t);
+void cdf_dump(const void *, size_t);
 void cdf_dump_stream(const cdf_header_t *, const cdf_stream_t *);
 void cdf_dump_dir(const cdf_info_t *, const cdf_header_t *, const cdf_sat_t *,
     const cdf_sat_t *, const cdf_stream_t *, const cdf_dir_t *);

+ 7 - 3
src/print.c

@@ -32,7 +32,7 @@
 #include "file.h"
 
 #ifndef lint
-FILE_RCSID("@(#)$File: print.c,v 1.76 2013/02/26 18:25:00 christos Exp $")
+FILE_RCSID("@(#)$File: print.c,v 1.77 2015/01/02 21:29:39 christos Exp $")
 #endif  /* lint */
 
 #include <string.h>
@@ -232,13 +232,17 @@ protected const char *
 file_fmttime(uint64_t v, int flags, char *buf)
 {
 	char *pp;
-	time_t t = (time_t)v;
+	time_t t;
 	struct tm *tm;
 
 	if (flags & FILE_T_WINDOWS) {
 		struct timespec ts;
-		cdf_timestamp_to_timespec(&ts, t);
+		cdf_timestamp_to_timespec(&ts, v);
 		t = ts.tv_sec;
+	} else {
+		// XXX: perhaps detect and print something if overflow
+		// on 32 bit time_t?
+		t = (time_t)v;
 	}
 
 	if (flags & FILE_T_LOCAL) {

+ 12 - 19
src/softmagic.c

@@ -32,7 +32,7 @@
 #include "file.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$File: softmagic.c,v 1.206 2015/01/01 17:07:34 christos Exp $")
+FILE_RCSID("@(#)$File: softmagic.c,v 1.209 2015/01/05 20:05:39 christos Exp $")
 #endif	/* lint */
 
 #include "magic.h"
@@ -361,6 +361,7 @@ match(struct magic_set *ms, struct magic *magic, uint32_t nmagic,
 		if ((ms->flags & MAGIC_CONTINUE) == 0 && *printed_something) {
 			return *returnval; /* don't keep searching */
 		}
+		cont_level = 0;
 	}
 	return *returnval;  /* This is hit if -k is set or there is no match */
 }
@@ -518,7 +519,7 @@ mprint(struct magic_set *ms, struct magic *m)
 			t = ms->offset + strlen(str);
 
 			if (*m->value.s == '\0')
-				str[strcspn(str, "\n")] = '\0';
+				str[strcspn(str, "\r\n")] = '\0';
 
 			if (m->str_flags & STRING_TRIM) {
 				char *last;
@@ -589,9 +590,9 @@ mprint(struct magic_set *ms, struct magic *m)
 		t = ms->offset + sizeof(uint64_t);
 		break;
 
-  	case FILE_FLOAT:
-  	case FILE_BEFLOAT:
-  	case FILE_LEFLOAT:
+	case FILE_FLOAT:
+	case FILE_BEFLOAT:
+	case FILE_LEFLOAT:
 		vf = p->f;
 		switch (check_fmt(ms, m)) {
 		case -1:
@@ -609,9 +610,9 @@ mprint(struct magic_set *ms, struct magic *m)
 		t = ms->offset + sizeof(float);
   		break;
 
-  	case FILE_DOUBLE:
-  	case FILE_BEDOUBLE:
-  	case FILE_LEDOUBLE:
+	case FILE_DOUBLE:
+	case FILE_BEDOUBLE:
+	case FILE_LEDOUBLE:
 		vd = p->d;
 		switch (check_fmt(ms, m)) {
 		case -1:
@@ -629,6 +630,7 @@ mprint(struct magic_set *ms, struct magic *m)
 		t = ms->offset + sizeof(double);
   		break;
 
+	case FILE_SEARCH:
 	case FILE_REGEX: {
 		char *cp;
 		int rval;
@@ -652,16 +654,6 @@ mprint(struct magic_set *ms, struct magic *m)
 		break;
 	}
 
-	case FILE_SEARCH:
-	  	if (file_printf(ms, F(ms, m, "%s"),
-		    file_printable(sbuf, sizeof(sbuf), m->value.s)) == -1)
-			return -1;
-		if ((m->str_flags & REGEX_OFFSET_START))
-			t = ms->search.offset;
-		else
-			t = ms->search.offset + m->vallen;
-		break;
-
 	case FILE_DEFAULT:
 	case FILE_CLEAR:
 	  	if (file_printf(ms, "%s", m->desc) == -1)
@@ -716,7 +708,7 @@ moffset(struct magic_set *ms, struct magic *m)
 			uint32_t t;
 
 			if (*m->value.s == '\0')
-				p->s[strcspn(p->s, "\n")] = '\0';
+				p->s[strcspn(p->s, "\r\n")] = '\0';
 			t = CAST(uint32_t, (ms->offset + strlen(p->s)));
 			if (m->type == FILE_PSTRING)
 				t += (uint32_t)file_pstring_length_size(m);
@@ -1965,6 +1957,7 @@ magiccheck(struct magic_set *ms, struct magic *m)
 			    m->str_flags);
 			if (v == 0) {	/* found match */
 				ms->search.offset += idx;
+				ms->search.rm_len = m->str_range - idx;
 				break;
 			}
 		}