...
 
Commits (8)
......@@ -10,7 +10,7 @@
the terms and conditions of version 3 of the GNU General Public
License, supplemented by the additional permissions listed below.
0. Additional Definitions.
0. Additional Definitions.
As used herein, "this License" refers to version 3 of the GNU Lesser
General Public License, and the "GNU GPL" refers to version 3 of the GNU
......@@ -111,7 +111,7 @@ the following:
a copy of the Library already present on the user's computer
system, and (b) will operate properly with a modified version
of the Library that is interface-compatible with the Linked
Version.
Version.
e) Provide Installation Information, but only if you would otherwise
be required to provide such information under section 6 of the
......
This diff is collapsed.
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -178,7 +178,7 @@ am__recursive_targets = \
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
cscope distdir dist dist-all distcheck
cscope distdir distdir-am dist dist-all distcheck
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
......@@ -318,6 +318,7 @@ LIBCNOTIFY_CPPFLAGS = @LIBCNOTIFY_CPPFLAGS@
LIBCNOTIFY_LIBADD = @LIBCNOTIFY_LIBADD@
LIBCTHREADS_CPPFLAGS = @LIBCTHREADS_CPPFLAGS@
LIBCTHREADS_LIBADD = @LIBCTHREADS_LIBADD@
LIBFWNT_DLL_EXPORT = @LIBFWNT_DLL_EXPORT@
LIBFWNT_DLL_IMPORT = @LIBFWNT_DLL_IMPORT@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
......@@ -455,7 +456,6 @@ libcthreads_CFLAGS = @libcthreads_CFLAGS@
libcthreads_LIBS = @libcthreads_LIBS@
libdir = @libdir@
libexecdir = @libexecdir@
libfwnt_spec_build_requires = @libfwnt_spec_build_requires@
libfwnt_spec_requires = @libfwnt_spec_requires@
localedir = @localedir@
localstatedir = @localstatedir@
......@@ -562,8 +562,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
......@@ -723,7 +723,10 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
distdir: $(DISTFILES)
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
distdir-am: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
......
dnl Checks for required headers and functions
dnl
dnl Version: 20170908
dnl Version: 20181117
dnl Function to detect if libfwnt dependencies are available
AC_DEFUN([AX_LIBFWNT_CHECK_LOCAL],
[dnl No additional checks.
])
This diff is collapsed.
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -220,6 +220,7 @@ LIBCNOTIFY_CPPFLAGS = @LIBCNOTIFY_CPPFLAGS@
LIBCNOTIFY_LIBADD = @LIBCNOTIFY_LIBADD@
LIBCTHREADS_CPPFLAGS = @LIBCTHREADS_CPPFLAGS@
LIBCTHREADS_LIBADD = @LIBCTHREADS_LIBADD@
LIBFWNT_DLL_EXPORT = @LIBFWNT_DLL_EXPORT@
LIBFWNT_DLL_IMPORT = @LIBFWNT_DLL_IMPORT@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
......@@ -357,7 +358,6 @@ libcthreads_CFLAGS = @libcthreads_CFLAGS@
libcthreads_LIBS = @libcthreads_LIBS@
libdir = @libdir@
libexecdir = @libexecdir@
libfwnt_spec_build_requires = @libfwnt_spec_build_requires@
libfwnt_spec_requires = @libfwnt_spec_requires@
localedir = @localedir@
localstatedir = @localstatedir@
......@@ -422,8 +422,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
......@@ -510,7 +510,10 @@ cscopelist-am: $(am__tagged_files)
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
......
......@@ -151,6 +151,9 @@
/* Define to 1 if you have the `memset' function. */
#define HAVE_MEMSET 1
/* Define to 1 if you have the `mkstemp' function. */
#define HAVE_MKSTEMP 1
/* Define to 1 if multi thread support should be used. */
#define HAVE_MULTI_THREAD_SUPPORT 1
......@@ -166,15 +169,6 @@
/* Define to 1 if you have the <pthread.h> header file. */
#define HAVE_PTHREAD_H 1
/* Define to 1 if you have Python */
/* #undef HAVE_PYTHON */
/* Define to 1 if you have Python 2 */
/* #undef HAVE_PYTHON2 */
/* Define to 1 if you have Python 3 */
/* #undef HAVE_PYTHON3 */
/* Define to 1 if you have the <Python.h> header file. */
/* #undef HAVE_PYTHON_H */
......@@ -250,6 +244,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
/* Define to 1 if you have the `unlink' function. */
#define HAVE_UNLINK 1
/* Define to 1 if you have the <varargs.h> header file. */
/* #undef HAVE_VARARGS_H */
......@@ -329,7 +326,7 @@
#define PACKAGE_NAME "libfwnt"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "libfwnt 20180117"
#define PACKAGE_STRING "libfwnt 20181227"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "libfwnt"
......@@ -338,11 +335,14 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
#define PACKAGE_VERSION "20180117"
#define PACKAGE_VERSION "20181227"
/* The size of `int', as computed by sizeof. */
#define SIZEOF_INT 4
/* The size of `long', as computed by sizeof. */
#define SIZEOF_LONG 8
/* The size of `off_t', as computed by sizeof. */
#define SIZEOF_OFF_T 8
......@@ -359,7 +359,7 @@
/* #undef STRERROR_R_CHAR_P */
/* Version number of package */
#define VERSION "20180117"
#define VERSION "20181227"
/* Enable large inode numbers on Mac OS X 10.5. */
#ifndef _DARWIN_USE_64_BIT_INODE
......
......@@ -150,6 +150,9 @@
/* Define to 1 if you have the `memset' function. */
#undef HAVE_MEMSET
/* Define to 1 if you have the `mkstemp' function. */
#undef HAVE_MKSTEMP
/* Define to 1 if multi thread support should be used. */
#undef HAVE_MULTI_THREAD_SUPPORT
......@@ -165,15 +168,6 @@
/* Define to 1 if you have the <pthread.h> header file. */
#undef HAVE_PTHREAD_H
/* Define to 1 if you have Python */
#undef HAVE_PYTHON
/* Define to 1 if you have Python 2 */
#undef HAVE_PYTHON2
/* Define to 1 if you have Python 3 */
#undef HAVE_PYTHON3
/* Define to 1 if you have the <Python.h> header file. */
#undef HAVE_PYTHON_H
......@@ -249,6 +243,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to 1 if you have the `unlink' function. */
#undef HAVE_UNLINK
/* Define to 1 if you have the <varargs.h> header file. */
#undef HAVE_VARARGS_H
......@@ -342,6 +339,9 @@
/* The size of `int', as computed by sizeof. */
#undef SIZEOF_INT
/* The size of `long', as computed by sizeof. */
#undef SIZEOF_LONG
/* The size of `off_t', as computed by sizeof. */
#undef SIZEOF_OFF_T
......
......@@ -59,7 +59,7 @@ typedef int system_integer_t;
#endif /* defined( WINAPI ) && ( defined( _UNICODE ) || defined( UNICODE ) ) */
/* Fix for systems without PRI definitions
/* Fallback for systems without PRI definitions
*/
#if !defined( PRId8 )
#define PRId8 "d"
......@@ -77,7 +77,7 @@ typedef int system_integer_t;
#define PRId32 "d"
#endif
#endif
#endif /* !defined( PRId32 ) */
#if !defined( PRId64 )
#if defined( WINAPI )
......@@ -90,7 +90,7 @@ typedef int system_integer_t;
#define PRId64 "lld"
#endif
#endif
#endif /* !defined( PRId64 ) */
#if !defined( PRIi8 )
#define PRIi8 "i"
......@@ -108,7 +108,7 @@ typedef int system_integer_t;
#define PRIi32 "i"
#endif
#endif
#endif /* !defined( PRIi32 ) */
#if !defined( PRIi64 )
#if defined( WINAPI )
......@@ -121,7 +121,7 @@ typedef int system_integer_t;
#define PRIi64 "lli"
#endif
#endif
#endif /* !defined( PRIi64 ) */
#if !defined( PRIu8 )
#define PRIu8 "u"
......@@ -139,7 +139,7 @@ typedef int system_integer_t;
#define PRIu32 "u"
#endif
#endif
#endif /* !defined( PRIu32 ) */
#if !defined( PRIu64 )
#if defined( WINAPI )
......@@ -152,7 +152,38 @@ typedef int system_integer_t;
#define PRIu64 "llu"
#endif
#endif /* !defined( PRIu64 ) */
#if !defined( PRIo8 )
#define PRIo8 "o"
#endif
#if !defined( PRIo16 )
#define PRIo16 "o"
#endif
#if !defined( PRIo32 )
#if defined( WINAPI )
#define PRIo32 "I32o"
#else
#define PRIo32 "o"
#endif
#endif /* !defined( PRIo32 ) */
#if !defined( PRIo64 )
#if defined( WINAPI )
#define PRIo64 "I64o"
#elif __WORDSIZE == 64
#define PRIo64 "lo"
#else
#define PRIo64 "llo"
#endif
#endif /* !defined( PRIo64 ) */
#if !defined( PRIx8 )
#define PRIx8 "x"
......@@ -170,7 +201,7 @@ typedef int system_integer_t;
#define PRIx32 "x"
#endif
#endif
#endif /* !defined( PRIx32 ) */
#if !defined( PRIx64 )
#if defined( WINAPI )
......@@ -183,9 +214,9 @@ typedef int system_integer_t;
#define PRIx64 "llx"
#endif
#endif
#endif /*!defined( PRIx64 ) */
/* Fix for systems without printf %jd definition
/* Fallback for systems without printf %jd definition
*/
#if defined( HAVE_PRINTF_JD )
#define PRIjd "jd"
......@@ -205,9 +236,9 @@ typedef int system_integer_t;
#define PRIju PRIu32
#define PRIjx PRIx32
#endif
#endif /* defined( HAVE_PRINTF_JD ) */
/* Fix for systems without printf %zd definition
/* Fallback for systems without printf %zd definition
*/
#if defined( HAVE_PRINTF_ZD )
#define PRIzd "zd"
......@@ -215,7 +246,7 @@ typedef int system_integer_t;
#define PRIzu "zu"
#define PRIzx "zx"
#elif defined( WINAPI )
#elif defined( _MSC_VER )
#define PRIzd "Id"
#define PRIzi "Ii"
#define PRIzu "Iu"
......@@ -233,9 +264,9 @@ typedef int system_integer_t;
#define PRIzu PRIu32
#define PRIzx PRIx32
#endif
#endif /* defined( HAVE_PRINTF_ZD ) */
/* Fix for systems without (U)INTx_MAX definitions
/* Fallback for systems without (U)INTx_MAX definitions
*/
/* The maximum signed 8-bit integer is 127 (0x7f)
......@@ -250,7 +281,7 @@ typedef int system_integer_t;
#define UINT8_MAX (0xff)
#endif
/* The maximum signed 16-bit integer is 32767 (0xr7ffff)
/* The maximum signed 16-bit integer is 32767 (0x7ffff)
*/
#if !defined( INT16_MAX )
#define INT16_MAX (0x7fff)
......@@ -282,7 +313,7 @@ typedef int system_integer_t;
#else
#define INT64_MAX (0x7fffffffffffffffULL)
#endif
#endif
#endif /* !defined( INT64_MAX ) */
/* The maximum unsigned 64-bit integer is 18446744073709551615 (0xffffffffffffffff)
*/
......@@ -292,7 +323,7 @@ typedef int system_integer_t;
#else
#define UINT64_MAX (0xffffffffffffffffULL)
#endif
#endif
#endif /* !defined( UINT64_MAX ) */
/* The maximum signed integer
*/
......@@ -306,6 +337,18 @@ typedef int system_integer_t;
#define UINT_MAX UINT32_MAX
#endif
/* The maximum signed long integer
*/
#if !defined( LONG_MAX )
#define LONG_MAX INT32_MAX
#endif
/* The maximum unsigned long integer
*/
#if !defined( ULONG_MAX )
#define ULONG_MAX UINT32_MAX
#endif
/* The maximum signed size type is platform dependent
*/
#if !defined( SSIZE_MAX )
......@@ -316,7 +359,7 @@ typedef int system_integer_t;
#define SSIZE_MAX INT64_MAX
#else
#define SSIZE_MAX INT32_MAX
#endif /* _WIN64 */
#endif
#else
......@@ -324,7 +367,7 @@ typedef int system_integer_t;
#define SSIZE_MAX INT64_MAX
#else
#define SSIZE_MAX INT32_MAX
#endif /* __WORDSIZE == 64 */
#endif
#endif /* WINAPI */
......
......@@ -59,7 +59,7 @@ typedef int system_integer_t;
#endif /* defined( WINAPI ) && ( defined( _UNICODE ) || defined( UNICODE ) ) */
/* Fix for systems without PRI definitions
/* Fallback for systems without PRI definitions
*/
#if !defined( PRId8 )
#define PRId8 "d"
......@@ -77,7 +77,7 @@ typedef int system_integer_t;
#define PRId32 "d"
#endif
#endif
#endif /* !defined( PRId32 ) */
#if !defined( PRId64 )
#if defined( WINAPI )
......@@ -90,7 +90,7 @@ typedef int system_integer_t;
#define PRId64 "lld"
#endif
#endif
#endif /* !defined( PRId64 ) */
#if !defined( PRIi8 )
#define PRIi8 "i"
......@@ -108,7 +108,7 @@ typedef int system_integer_t;
#define PRIi32 "i"
#endif
#endif
#endif /* !defined( PRIi32 ) */
#if !defined( PRIi64 )
#if defined( WINAPI )
......@@ -121,7 +121,7 @@ typedef int system_integer_t;
#define PRIi64 "lli"
#endif
#endif
#endif /* !defined( PRIi64 ) */
#if !defined( PRIu8 )
#define PRIu8 "u"
......@@ -139,7 +139,7 @@ typedef int system_integer_t;
#define PRIu32 "u"
#endif
#endif
#endif /* !defined( PRIu32 ) */
#if !defined( PRIu64 )
#if defined( WINAPI )
......@@ -152,7 +152,38 @@ typedef int system_integer_t;
#define PRIu64 "llu"
#endif
#endif /* !defined( PRIu64 ) */
#if !defined( PRIo8 )
#define PRIo8 "o"
#endif
#if !defined( PRIo16 )
#define PRIo16 "o"
#endif
#if !defined( PRIo32 )
#if defined( WINAPI )
#define PRIo32 "I32o"
#else
#define PRIo32 "o"
#endif
#endif /* !defined( PRIo32 ) */
#if !defined( PRIo64 )
#if defined( WINAPI )
#define PRIo64 "I64o"
#elif __WORDSIZE == 64
#define PRIo64 "lo"
#else
#define PRIo64 "llo"
#endif
#endif /* !defined( PRIo64 ) */
#if !defined( PRIx8 )
#define PRIx8 "x"
......@@ -170,7 +201,7 @@ typedef int system_integer_t;
#define PRIx32 "x"
#endif
#endif
#endif /* !defined( PRIx32 ) */
#if !defined( PRIx64 )
#if defined( WINAPI )
......@@ -183,9 +214,9 @@ typedef int system_integer_t;
#define PRIx64 "llx"
#endif
#endif
#endif /*!defined( PRIx64 ) */
/* Fix for systems without printf %jd definition
/* Fallback for systems without printf %jd definition
*/
#if defined( HAVE_PRINTF_JD )
#define PRIjd "jd"
......@@ -205,9 +236,9 @@ typedef int system_integer_t;
#define PRIju PRIu32
#define PRIjx PRIx32
#endif
#endif /* defined( HAVE_PRINTF_JD ) */
/* Fix for systems without printf %zd definition
/* Fallback for systems without printf %zd definition
*/
#if defined( HAVE_PRINTF_ZD )
#define PRIzd "zd"
......@@ -215,7 +246,7 @@ typedef int system_integer_t;
#define PRIzu "zu"
#define PRIzx "zx"
#elif defined( WINAPI )
#elif defined( _MSC_VER )
#define PRIzd "Id"
#define PRIzi "Ii"
#define PRIzu "Iu"
......@@ -233,9 +264,9 @@ typedef int system_integer_t;
#define PRIzu PRIu32
#define PRIzx PRIx32
#endif
#endif /* defined( HAVE_PRINTF_ZD ) */
/* Fix for systems without (U)INTx_MAX definitions
/* Fallback for systems without (U)INTx_MAX definitions
*/
/* The maximum signed 8-bit integer is 127 (0x7f)
......@@ -250,7 +281,7 @@ typedef int system_integer_t;
#define UINT8_MAX (0xff)
#endif
/* The maximum signed 16-bit integer is 32767 (0xr7ffff)
/* The maximum signed 16-bit integer is 32767 (0x7ffff)
*/
#if !defined( INT16_MAX )
#define INT16_MAX (0x7fff)
......@@ -282,7 +313,7 @@ typedef int system_integer_t;
#else
#define INT64_MAX (0x7fffffffffffffffULL)
#endif
#endif
#endif /* !defined( INT64_MAX ) */
/* The maximum unsigned 64-bit integer is 18446744073709551615 (0xffffffffffffffff)
*/
......@@ -292,7 +323,7 @@ typedef int system_integer_t;
#else
#define UINT64_MAX (0xffffffffffffffffULL)
#endif
#endif
#endif /* !defined( UINT64_MAX ) */
/* The maximum signed integer
*/
......@@ -306,6 +337,18 @@ typedef int system_integer_t;
#define UINT_MAX UINT32_MAX
#endif
/* The maximum signed long integer
*/
#if !defined( LONG_MAX )
#define LONG_MAX INT32_MAX
#endif
/* The maximum unsigned long integer
*/
#if !defined( ULONG_MAX )
#define ULONG_MAX UINT32_MAX
#endif
/* The maximum signed size type is platform dependent
*/
#if !defined( SSIZE_MAX )
......@@ -316,7 +359,7 @@ typedef int system_integer_t;
#define SSIZE_MAX INT64_MAX
#else
#define SSIZE_MAX INT32_MAX
#endif /* _WIN64 */
#endif
#else
......@@ -324,7 +367,7 @@ typedef int system_integer_t;
#define SSIZE_MAX INT64_MAX
#else
#define SSIZE_MAX INT32_MAX
#endif /* __WORDSIZE == 64 */
#endif
#endif /* WINAPI */
......
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
scriptversion=2012-10-14.11; # UTC
scriptversion=2018-03-07.03; # UTC
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
......@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
......@@ -255,7 +255,8 @@ EOF
echo "compile $scriptversion"
exit $?
;;
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
......@@ -339,9 +340,9 @@ exit $ret
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -2,7 +2,7 @@ AC_PREREQ( 2.59 )
AC_INIT(
[libfwnt],
[20180117],
[20181227],
[joachim.metz@gmail.com])
AC_CONFIG_SRCDIR(
......@@ -42,9 +42,18 @@ AC_C_VOLATILE
dnl Check for large file support
AC_SYS_LARGEFILE
dnl Check if shared library support should be disabled
AX_COMMON_CHECK_DISABLE_SHARED_LIBS
dnl Check if WINAPI support should be enabled
AX_COMMON_CHECK_ENABLE_WINAPI
dnl Check if verbose output should be enabled
AX_COMMON_CHECK_ENABLE_VERBOSE_OUTPUT
dnl Check if debug output should be enabled
AX_COMMON_CHECK_ENABLE_DEBUG_OUTPUT
dnl Check for type definitions
AX_TYPES_CHECK_LOCAL
......@@ -67,10 +76,7 @@ dnl Check if libfwnt required headers and functions are available
AX_LIBFWNT_CHECK_LOCAL
dnl Check if libfwnt Python bindings (pyfwnt) required headers and functions are available
AX_PYTHON_CHECK_PYPREFIX
AX_PYTHON_CHECK_ENABLE
AX_PYTHON2_CHECK_ENABLE
AX_PYTHON3_CHECK_ENABLE
AS_IF(
[test "x${ac_cv_enable_python}" != xno || test "x${ac_cv_enable_python2}" != xno || test "x${ac_cv_enable_python3}" != xno],
......@@ -85,16 +91,6 @@ AS_IF(
])
])
AM_CONDITIONAL(
HAVE_PYTHON_TESTS,
[test "x${ac_cv_enable_python}" != xno || test "x${ac_cv_enable_python2}" != xno || test "x${ac_cv_enable_python3}" != xno])
dnl Check if libfwnt should be build with verbose output
AX_COMMON_CHECK_ENABLE_VERBOSE_OUTPUT
dnl Check if libfwnt should be build with debug output
AX_COMMON_CHECK_ENABLE_DEBUG_OUTPUT
dnl Check if tests required headers and functions are available
AX_TESTS_CHECK_LOCAL
......@@ -103,7 +99,7 @@ AS_IF(
[test "x$enable_shared" = xyes],
[AS_CASE(
[$host],
[*cygwin* | *mingw*],
[*cygwin* | *mingw* | *msys*],
[AC_DEFINE(
[HAVE_DLLMAIN],
[1],
......@@ -112,7 +108,10 @@ AS_IF(
[HAVE_DLLMAIN],
[1])
dnl Used in tests
AC_SUBST(
[LIBFWNT_DLL_EXPORT],
["-DLIBFWNT_DLL_EXPORT"])
AC_SUBST(
[LIBFWNT_DLL_IMPORT],
["-DLIBFWNT_DLL_IMPORT"])
......@@ -128,9 +127,6 @@ AS_IF(
[AC_SUBST(
[libfwnt_spec_requires],
[Requires:])
AC_SUBST(
[libfwnt_spec_build_requires],
[BuildRequires:])
])
dnl Set the date for the dpkg files
......@@ -180,17 +176,15 @@ AC_OUTPUT
dnl Print a summary
AC_MSG_NOTICE([
Building:
libcerror support: $ac_cv_libcerror
libcthreads support: $ac_cv_libcthreads
libcdata support: $ac_cv_libcdata
libcnotify support: $ac_cv_libcnotify
libcerror support: $ac_cv_libcerror
libcthreads support: $ac_cv_libcthreads
libcdata support: $ac_cv_libcdata
libcnotify support: $ac_cv_libcnotify
Features:
Multi-threading support: $ac_cv_libcthreads_multi_threading
Python (pyfwnt) support: $ac_cv_enable_python
Python version 2 (pyfwnt) support: $ac_cv_enable_python2
Python version 3 (pyfwnt) support: $ac_cv_enable_python3
Verbose output: $ac_cv_enable_verbose_output
Debug output: $ac_cv_enable_debug_output
Multi-threading support: $ac_cv_libcthreads_multi_threading
Python (pyfwnt) support: $ac_cv_enable_python
Verbose output: $ac_cv_enable_verbose_output
Debug output: $ac_cv_enable_debug_output
]);
libfwnt (20181227-1) unstable; urgency=medium
[ Raphaël Hertzog ]
* Update team maintainer address to Debian Security Tools
<team+pkg-security@tracker.debian.org>
* Update Vcs-Git and Vcs-Browser for the move to salsa.debian.org
[ Hilko Bengen ]
* New upstream version 20181227
* Drop unneeded dh --parallel parameter
* Bump Debhelper compat level
* Replace dh_install --fail-missing
* Bump Standards-Version
* Enable hardening rules
-- Hilko Bengen <bengen@debian.org> Mon, 14 Jan 2019 01:31:07 +0100
libfwnt (20180117-1) unstable; urgency=medium
* New upstream version 20180117
......
......@@ -2,11 +2,11 @@ Source: libfwnt
Priority: optional
Maintainer: Debian Security Tools <team+pkg-security@tracker.debian.org>
Uploaders: Hilko Bengen <bengen@debian.org>
Build-Depends: debhelper (>= 10),
Build-Depends: debhelper (>= 11),
dh-python,
pkg-config,
python-dev, python3-dev,
Standards-Version: 4.1.3
Standards-Version: 4.3.0
Section: libs
Homepage: https://github.com/libyal/libfwnt
Vcs-Git: https://salsa.debian.org/pkg-security-team/libfwnt.git
......
......@@ -4,13 +4,19 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
export SKIP_PYTHON_TESTS=1
%:
dh $@ --with python2,python3 --parallel
dh $@ --with python2,python3
override_dh_auto_configure:
dh_auto_configure -- --enable-python2 --enable-python3 CFLAGS="-g"
dh_auto_configure -- --enable-python2 --enable-python3
override_dh_missing:
dh_missing -X.la -X/pyfwnt.a --fail-missing
override_dh_install:
dh_install --fail-missing -X.la -X/pyfwnt.a
dh_install -X.la -X/pyfwnt.a
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
scriptversion=2013-05-30.07; # UTC
scriptversion=2018-03-07.03; # UTC
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -16,7 +16,7 @@ scriptversion=2013-05-30.07; # UTC
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
......@@ -783,9 +783,9 @@ exit 0
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
libfwnt (20180117-1) unstable; urgency=low
libfwnt (20181227-1) unstable; urgency=low
* Auto-generated
-- Joachim Metz <joachim.metz@gmail.com> Wed, 17 Jan 2018 22:36:38 +0100
-- Joachim Metz <joachim.metz@gmail.com> Thu, 27 Dec 2018 20:17:07 +0100
......@@ -9,6 +9,8 @@ Homepage: https://github.com/libyal/libfwnt
Package: libfwnt
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libfwnt1
Replaces: libfwnt1
Suggests: libfwnt-dbg
Description: Library to support common Windows NT specific formats
libfwnt is a library to support common Windows NT specific formats.
......@@ -31,6 +33,8 @@ Package: libfwnt-python
Section: python
Architecture: any
Depends: libfwnt (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Conflicts: python-libfwnt
Replaces: python-libfwnt
Suggests: libfwnt-python-dbg
Description: Python 2 bindings for libfwnt
Python 2 bindings for libfwnt.
......@@ -46,6 +50,8 @@ Package: libfwnt-python3
Section: python
Architecture: any
Depends: libfwnt (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Conflicts: python3-libfwnt
Replaces: python3-libfwnt
Suggests: libfwnt-python3-dbg
Description: Python 3 bindings for libfwnt
Python 3 bindings for libfwnt.
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -250,6 +250,7 @@ LIBCNOTIFY_CPPFLAGS = @LIBCNOTIFY_CPPFLAGS@
LIBCNOTIFY_LIBADD = @LIBCNOTIFY_LIBADD@
LIBCTHREADS_CPPFLAGS = @LIBCTHREADS_CPPFLAGS@
LIBCTHREADS_LIBADD = @LIBCTHREADS_LIBADD@
LIBFWNT_DLL_EXPORT = @LIBFWNT_DLL_EXPORT@
LIBFWNT_DLL_IMPORT = @LIBFWNT_DLL_IMPORT@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
......@@ -387,7 +388,6 @@ libcthreads_CFLAGS = @libcthreads_CFLAGS@
libcthreads_LIBS = @libcthreads_LIBS@
libdir = @libdir@
libexecdir = @libexecdir@
libfwnt_spec_build_requires = @libfwnt_spec_build_requires@
libfwnt_spec_requires = @libfwnt_spec_requires@
localedir = @localedir@
localstatedir = @localstatedir@
......@@ -451,8 +451,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
......@@ -566,7 +566,10 @@ cscopelist-am: $(am__tagged_files)
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
......
......@@ -292,7 +292,7 @@ int libfwnt_access_control_list_free(
libfwnt_access_control_list_t **access_control_list,
libfwnt_error_t **error );
/* Retrieves the number of access control entries (ACE)
/* Retrieves the number of access control entries
* Returns 1 if successful or -1 on error
*/
LIBFWNT_EXTERN \
......@@ -301,7 +301,7 @@ int libfwnt_access_control_list_get_number_of_entries(
int *number_of_entries,
libfwnt_error_t **error );
/* Retrieves a specific access control entries (ACE)
/* Retrieves a specific access control entry
* Returns 1 if successful or -1 on error
*/
LIBFWNT_EXTERN \
......@@ -324,7 +324,7 @@ int libfwnt_access_control_entry_free(
libfwnt_error_t **error );
/* Retrieves the type
* Returns 1 if successful, 0 if not available or -1 on error
* Returns 1 if successful or -1 on error
*/
LIBFWNT_EXTERN \
int libfwnt_access_control_entry_get_type(
......@@ -333,7 +333,7 @@ int libfwnt_access_control_entry_get_type(
libfwnt_error_t **error );
/* Retrieves the flags
* Returns 1 if successful, 0 if not available or -1 on error
* Returns 1 if successful or -1 on error
*/
LIBFWNT_EXTERN \
int libfwnt_access_control_entry_get_flags(
......
......@@ -292,7 +292,7 @@ int libfwnt_access_control_list_free(
libfwnt_access_control_list_t **access_control_list,
libfwnt_error_t **error );
/* Retrieves the number of access control entries (ACE)
/* Retrieves the number of access control entries
* Returns 1 if successful or -1 on error
*/
LIBFWNT_EXTERN \
......@@ -301,7 +301,7 @@ int libfwnt_access_control_list_get_number_of_entries(
int *number_of_entries,
libfwnt_error_t **error );
/* Retrieves a specific access control entries (ACE)
/* Retrieves a specific access control entry
* Returns 1 if successful or -1 on error
*/
LIBFWNT_EXTERN \
......@@ -324,7 +324,7 @@ int libfwnt_access_control_entry_free(
libfwnt_error_t **error );
/* Retrieves the type
* Returns 1 if successful, 0 if not available or -1 on error
* Returns 1 if successful or -1 on error
*/
LIBFWNT_EXTERN \
int libfwnt_access_control_entry_get_type(
......@@ -333,7 +333,7 @@ int libfwnt_access_control_entry_get_type(
libfwnt_error_t **error );
/* Retrieves the flags
* Returns 1 if successful, 0 if not available or -1 on error
* Returns 1 if successful or -1 on error
*/
LIBFWNT_EXTERN \
int libfwnt_access_control_entry_get_flags(
......
......@@ -24,11 +24,11 @@
#include <libfwnt/types.h>
#define LIBFWNT_VERSION 20180117
#define LIBFWNT_VERSION 20181227
/* The version string
*/
#define LIBFWNT_VERSION_STRING "20180117"
#define LIBFWNT_VERSION_STRING "20181227"
/* The byte order definitions
*/
......
#!/bin/sh
# install - install a program, script, or datafile
scriptversion=2013-12-25.23; # UTC
scriptversion=2018-03-11.20; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
......@@ -271,15 +271,18 @@ do
fi
dst=$dst_arg
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
# If destination is a directory, append the input filename.
if test -d "$dst"; then
if test "$is_target_a_directory" = never; then
echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
dstdir=$dst
dst=$dstdir/`basename "$src"`
dstbase=`basename "$src"`
case $dst in
*/) dst=$dst$dstbase;;
*) dst=$dst/$dstbase;;
esac
dstdir_status=0
else
dstdir=`dirname "$dst"`
......@@ -288,6 +291,11 @@ do
fi
fi
case $dstdir in
*/) dstdirslash=$dstdir;;
*) dstdirslash=$dstdir/;;
esac
obsolete_mkdir_used=false
if test $dstdir_status != 0; then
......@@ -324,34 +332,43 @@ do
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
;;
*)
# Note that $RANDOM variable is not portable (e.g. dash); Use it
# here however when possible just to lower collision chance.
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
# Because "mkdir -p" follows existing symlinks and we likely work
# directly in world-writeable /tmp, make sure that the '$tmpdir'
# directory is successfully created first before we actually test
# 'mkdir -p' feature.
if (umask $mkdir_umask &&
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
$mkdirprog $mkdir_mode "$tmpdir" &&
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
then
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
ls_ld_tmpdir=`ls -ld "$tmpdir"`
test_tmpdir="$tmpdir/a"
ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
case $ls_ld_tmpdir in
d????-?r-*) different_mode=700;;
d????-?--*) different_mode=755;;
*) false;;
esac &&
$mkdirprog -m$different_mode -p -- "$tmpdir" && {
ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
$mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
}
}
then posix_mkdir=:
fi
rmdir "$tmpdir/d" "$tmpdir"
rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
else
# Remove any dirs left behind by ancient mkdir implementations.
rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
fi
trap '' 0;;
esac;;
......@@ -427,8 +444,8 @@ do
else
# Make a couple of temp file names in the proper directory.
dsttmp=$dstdir/_inst.$$_
rmtmp=$dstdir/_rm.$$_
dsttmp=${dstdirslash}_inst.$$_
rmtmp=${dstdirslash}_rm.$$_
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
......@@ -493,9 +510,9 @@ do
done
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
......@@ -4,7 +4,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/common \
@LIBCERROR_CPPFLAGS@ \
@LIBCTHREADS_CPPFLAGS@ \
@PTHREAD_CPPFLAGS@
@PTHREAD_CPPFLAGS@
noinst_LTLIBRARIES = libcdata.la
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -150,7 +150,15 @@ am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/common
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__maybe_remake_depfiles = depfiles
am__depfiles_remade = ./$(DEPDIR)/libcdata_array.Plo \
./$(DEPDIR)/libcdata_btree.Plo ./$(DEPDIR)/libcdata_error.Plo \
./$(DEPDIR)/libcdata_list.Plo \
./$(DEPDIR)/libcdata_list_element.Plo \
./$(DEPDIR)/libcdata_range_list.Plo \
./$(DEPDIR)/libcdata_range_list_value.Plo \
./$(DEPDIR)/libcdata_support.Plo \
./$(DEPDIR)/libcdata_tree_node.Plo
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
......@@ -267,6 +275,7 @@ LIBCNOTIFY_CPPFLAGS = @LIBCNOTIFY_CPPFLAGS@
LIBCNOTIFY_LIBADD = @LIBCNOTIFY_LIBADD@
LIBCTHREADS_CPPFLAGS = @LIBCTHREADS_CPPFLAGS@
LIBCTHREADS_LIBADD = @LIBCTHREADS_LIBADD@
LIBFWNT_DLL_EXPORT = @LIBFWNT_DLL_EXPORT@
LIBFWNT_DLL_IMPORT = @LIBFWNT_DLL_IMPORT@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
......@@ -404,7 +413,6 @@ libcthreads_CFLAGS = @libcthreads_CFLAGS@
libcthreads_LIBS = @libcthreads_LIBS@
libdir = @libdir@
libexecdir = @libexecdir@
libfwnt_spec_build_requires = @libfwnt_spec_build_requires@
libfwnt_spec_requires = @libfwnt_spec_requires@
localedir = @localedir@
localstatedir = @localstatedir@
......@@ -434,7 +442,7 @@ top_srcdir = @top_srcdir@
@HAVE_LOCAL_LIBCDATA_TRUE@ -I$(top_srcdir)/common \
@HAVE_LOCAL_LIBCDATA_TRUE@ @LIBCERROR_CPPFLAGS@ \
@HAVE_LOCAL_LIBCDATA_TRUE@ @LIBCTHREADS_CPPFLAGS@ \
@HAVE_LOCAL_LIBCDATA_TRUE@ @PTHREAD_CPPFLAGS@
@HAVE_LOCAL_LIBCDATA_TRUE@ @PTHREAD_CPPFLAGS@
@HAVE_LOCAL_LIBCDATA_TRUE@noinst_LTLIBRARIES = libcdata.la
@HAVE_LOCAL_LIBCDATA_TRUE@libcdata_la_SOURCES = \
......@@ -478,8 +486,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
......@@ -511,15 +519,21 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdata_array.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdata_btree.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdata_error.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdata_list.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdata_list_element.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdata_range_list.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdata_range_list_value.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdata_support.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdata_tree_node.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdata_array.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdata_btree.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdata_error.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdata_list.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdata_list_element.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdata_range_list.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdata_range_list_value.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdata_support.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcdata_tree_node.Plo@am__quote@ # am--include-marker
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
@echo '# dummy' >$@-t && $(am__mv) $@-t $@
am--depfiles: $(am__depfiles_remade)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
......@@ -600,7 +614,10 @@ cscopelist-am: $(am__tagged_files)
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
......@@ -714,7 +731,15 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
-rm -rf ./$(DEPDIR)
-rm -f ./$(DEPDIR)/libcdata_array.Plo
-rm -f ./$(DEPDIR)/libcdata_btree.Plo
-rm -f ./$(DEPDIR)/libcdata_error.Plo
-rm -f ./$(DEPDIR)/libcdata_list.Plo
-rm -f ./$(DEPDIR)/libcdata_list_element.Plo
-rm -f ./$(DEPDIR)/libcdata_range_list.Plo
-rm -f ./$(DEPDIR)/libcdata_range_list_value.Plo
-rm -f ./$(DEPDIR)/libcdata_support.Plo
-rm -f ./$(DEPDIR)/libcdata_tree_node.Plo
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
......@@ -735,16 +760,16 @@ uninstall-am:
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
ctags-am distclean distclean-compile distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
install-data-am install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
install-info-am install-man install-pdf install-pdf-am \
install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
clean-generic clean-libtool clean-noinstLTLIBRARIES \
cscopelist-am ctags ctags-am distclean distclean-compile \
distclean-generic distclean-libtool distclean-tags distdir dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-pdf \
install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am
......
......@@ -514,7 +514,6 @@ int libcdata_array_clone(
libcdata_internal_array_t *internal_source_array = NULL;
static char *function = "libcdata_array_clone";
int entry_iterator = 0;
int result = 1;
if( destination_array == NULL )
{
......@@ -605,7 +604,7 @@ int libcdata_array_clone(
"%s: unable to grab read/write lock for reading.",
function );
goto on_error;
return( -1 );
}
#endif
if( internal_source_array->entries != NULL )
......@@ -616,12 +615,10 @@ int libcdata_array_clone(
{
if( internal_source_array->entries[ entry_iterator ] != NULL )
{
result = entry_clone_function(
&( internal_destination_array->entries[ entry_iterator ] ),
internal_source_array->entries[ entry_iterator ],
error );
if( result != 1 )
if( entry_clone_function(
&( internal_destination_array->entries[ entry_iterator ] ),
internal_source_array->entries[ entry_iterator ],
error ) != 1 )
{
libcerror_error_set(
error,
......@@ -648,7 +645,12 @@ int libcdata_array_clone(
"%s: unable to release read/write lock for reading.",
function );
goto on_error;
libcdata_array_free(
(libcdata_array_t **) &internal_destination_array,
entry_free_function,
NULL );
return( -1 );
}
#endif
*destination_array = (libcdata_array_t *) internal_destination_array;
......
......@@ -27,6 +27,7 @@
#include "libcdata_btree.h"
#include "libcdata_definitions.h"
#include "libcdata_libcerror.h"
#include "libcdata_libcthreads.h"
#include "libcdata_list.h"
#include "libcdata_list_element.h"
#include "libcdata_tree_node.h"
......@@ -137,6 +138,21 @@ int libcdata_btree_initialize(
}
internal_tree->maximum_number_of_values = maximum_number_of_values;
#if defined( HAVE_MULTI_THREAD_SUPPORT ) && !defined( HAVE_LOCAL_LIBCDATA )
if( libcthreads_read_write_lock_initialize(
&( internal_tree->read_write_lock ),
error ) != 1 )
{
libcerror_error_set(
error,
LIBCERROR_ERROR_DOMAIN_RUNTIME,
LIBCERROR_RUNTIME_ERROR_INITIALIZE_FAILED,
"%s: unable to intialize read/write lock.",
function );
goto on_error;
}
#endif
*tree = (libcdata_btree_t *) internal_tree;
return( 1 );
......@@ -188,6 +204,21 @@ int libcdata_btree_free(
internal_tree = (libcdata_internal_btree_t *) *tree;
*tree = NULL;
#if defined( HAVE_MULTI_THREAD_SUPPORT ) && !defined( HAVE_LOCAL_LIBCDATA )
if( libcthreads_read_write_lock_free(
&( internal_tree->read_write_lock ),
error ) != 1 )
{
libcerror_error_set(
error,
LIBCERROR_ERROR_DOMAIN_RUNTIME,
LIBCERROR_RUNTIME_ERROR_FINALIZE_FAILED,
"%s: unable to free read/write lock.",
function );
result = -1;
}
#endif
if( libcdata_tree_node_free(
&( internal_tree->root_node ),
(int (*)(intptr_t **, libcerror_error_t **)) &libcdata_btree_free_values_list,
......@@ -286,15 +317,28 @@ int libcdata_btree_node_get_sub_node_by_value(
libcdata_list_element_t **values_list_element,
libcerror_error_t **error )
{
libcdata_list_t *values_list = NULL;
intptr_t *values_list_value = NULL;
static char *function = "libcdata_btree_node_get_sub_node_by_value";
int number_of_sub_nodes = 0;
int number_of_values_list_elements = 0;
int result = 0;
int sub_node_index = 0;
int values_list_element_index = 0;
libcdata_list_t *values_list = NULL;
libcdata_list_element_t *safe_values_list_element = NULL;
libcdata_tree_node_t *safe_sub_node = NULL;
intptr_t *values_list_value = NULL;
static char *function = "libcdata_btree_node_get_sub_node_by_value";
int number_of_sub_nodes = 0;
int number_of_values_list_elements = 0;
int result = 0;
int sub_node_index = 0;
int values_list_element_index = 0;
if( node == NULL )
{
libcerror_error_set(
error,
LIBCERROR_ERROR_DOMAIN_ARGUMENTS,
LIBCERROR_ARGUMENT_ERROR_INVALID_VALUE,
"%s: invalid node.",
function );
return( -1 );
}
if( value == NULL )
{
libcerror_error_set(
......@@ -328,7 +372,8 @@ int libcdata_btree_node_get_sub_node_by_value(
return( -1 );
}
*sub_node = NULL;
*sub_node = NULL;
*values_list_element = NULL;
if( libcdata_tree_node_get_value(
node,
......@@ -375,44 +420,25 @@ int libcdata_btree_node_get_sub_node_by_value(
return( -1 );
}
if( number_of_sub_nodes != 0 )
if( ( number_of_sub_nodes != 0 )
&& ( ( number_of_values_list_elements + 1 ) != number_of_sub_nodes ) )
{
if( ( number_of_values_list_elements + 1 ) != number_of_sub_nodes )
{
libcerror_error_set(
error,
LIBCERROR_ERROR_DOMAIN_ARGUMENTS,
LIBCERROR_ARGUMENT_ERROR_VALUE_OUT_OF_BOUNDS,
"%s: invalid number of values list elements value out of bounds.",
function );
return( -1 );
}
if( libcdata_tree_node_get_sub_node_by_index(
node,
0,
sub_node,
error ) != 1 )
{
libcerror_error_set(
error,
LIBCERROR_ERROR_DOMAIN_RUNTIME,
LIBCERROR_RUNTIME_ERROR_GET_FAILED,
"%s: unable to retrieve sub node: 0.",
function );
libcerror_error_set(
error,
LIBCERROR_ERROR_DOMAIN_ARGUMENTS,
LIBCERROR_ARGUMENT_ERROR_VALUE_OUT_OF_BOUNDS,
"%s: invalid number of values list elements value out of bounds.",
function );
return( -1 );
}
return( -1 );
}
if( number_of_values_list_elements == 0 )
{
*values_list_element = NULL;
return( 0 );
}
if( libcdata_list_get_first_element(
values_list,
values_list_element,
&safe_values_list_element,
error ) != 1 )
{
libcerror_error_set(
......@@ -424,12 +450,30 @@ int libcdata_btree_node_get_sub_node_by_value(
return( -1 );
}
if( number_of_sub_nodes != 0 )
{
if( libcdata_tree_node_get_sub_node_by_index(
node,
0,
&safe_sub_node,
error ) != 1 )
{
libcerror_error_set(
error,
LIBCERROR_ERROR_DOMAIN_RUNTIME,
LIBCERROR_RUNTIME_ERROR_GET_FAILED,
"%s: unable to retrieve sub node: 0.",
function );
return( -1 );
}
}
for( values_list_element_index = 0;
values_list_element_index < number_of_values_list_elements;
values_list_element_index++ )
{