diff --git a/.gitignore b/.gitignore index 607e03c..8d15f76 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ # Files to ignore by git # -# Version: 20161030 +# Version: 20191220 # Generic auto-generated build files *~ @@ -15,17 +15,19 @@ *.lo *.log *.loT -*.Plo -*.Po *.o *.obj +*.Plo +*.Po *.so *.so.[0-9][0-9]* *.so.[0-9][0-9]*.[0-9][0-9]*.[0-9][0-9]* *.swp -*.trs *.Tpo +*.trs +/*.egg-info/ .deps +.dirstamp .libs INSTALL Makefile @@ -53,23 +55,20 @@ stamp-h[1-9] /install-sh /libtool /ltmain.sh -/missing -/test-driver -/ylwrap /m4/codeset.m4 /m4/extern-inline.m4 /m4/fcntl-o.m4 /m4/gettext.m4 -/m4/glibc2.m4 /m4/glibc21.m4 +/m4/glibc2.m4 /m4/iconv.m4 /m4/intdiv0.m4 -/m4/intl.m4 /m4/intldir.m4 +/m4/intl.m4 /m4/intlmacosx.m4 /m4/intmax.m4 -/m4/inttypes-pri.m4 /m4/inttypes_h.m4 +/m4/inttypes-pri.m4 /m4/lcmessage.m4 /m4/lib-ld.m4 /m4/lib-link.m4 @@ -77,14 +76,14 @@ stamp-h[1-9] /m4/libtool.m4 /m4/lock.m4 /m4/longlong.m4 +/m4/lt~obsolete.m4 /m4/ltoptions.m4 /m4/ltsugar.m4 /m4/ltversion.m4 -/m4/lt~obsolete.m4 /m4/nls.m4 /m4/po.m4 -/m4/progtest.m4 /m4/printf-posix.m4 +/m4/progtest.m4 /m4/size_max.m4 /m4/stdint_h.m4 /m4/threadlib.m4 @@ -93,6 +92,8 @@ stamp-h[1-9] /m4/wchar_t.m4 /m4/wint_t.m4 /m4/xsize.m4 +/MANIFEST +/missing /po/boldquot.sed /po/en@boldquot.header /po/en@quot.header @@ -100,15 +101,15 @@ stamp-h[1-9] /po/Makefile.in.in /po/Makevars /po/Makevars.template -/po/Rules-quot /po/POTFILES /po/quot.sed /po/remove-potcdate.sed /po/remove-potcdate.sin +/po/Rules-quot +/test-driver +/ylwrap # Project specific files -/libewf.pc -/libewf.spec /common/config.h /common/config.h.in /common/types.h @@ -117,9 +118,13 @@ stamp-h[1-9] /include/libewf/definitions.h /include/libewf/features.h /include/libewf/types.h +/libewf.pc +/libewf.spec /libewf/libewf.rc /libewf/libewf_definitions.h +/pyewf-python[23]/*.[ch] /ewf.net/ewf.net.rc +/ewftools/*.exe /ewftools/ewfacquire /ewftools/ewfacquirestream /ewftools/ewfdebug @@ -128,7 +133,7 @@ stamp-h[1-9] /ewftools/ewfmount /ewftools/ewfrecover /ewftools/ewfverify -/pyewf-python[23]/*.[ch] +/tests/*.exe /tests/ewf_test_glob /tests/ewf_test_open_close /tests/ewf_test_read diff --git a/appveyor.yml b/appveyor.yml index a6248e7..e2926dc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -242,33 +242,33 @@ build_script: msbuild /verbosity:quiet vs2017\libewf.sln /property:Platform=x64 /property:PlatformToolset=v141 /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" ) - cmd: if [%BUILD_ENVIRONMENT%]==[python] ( "%PYTHON%" setup.py bdist_msi bdist_wheel ) -- sh: if test ${BUILD_ENVIRONMENT} = "python"; then ./synclibs.sh && ./autogen.sh; fi +- sh: if test ${BUILD_ENVIRONMENT} = "python"; then ./synclibs.sh && ./autogen.sh && ./configure ${CONFIGURE_OPTIONS} && make > /dev/null; fi - sh: if test ${BUILD_ENVIRONMENT} = "python"; then ${PYTHON} setup.py bdist_wheel; fi - cmd: if [%BUILD_ENVIRONMENT%]==[cygwin] ( xcopy /i /q /s C:\projects\libewf C:\cygwin\home\appveyor\libewf && - C:\cygwin\bin\bash -e -l -c "cd libewf && ./synclibs.sh --use-head && ./autogen.sh" ) + C:\cygwin\bin\bash -e -l -c "cd libewf && ./synclibs.sh --use-head && ./autogen.sh && ./configure ${CONFIGURE_OPTIONS} && make > /dev/null" ) - cmd: if [%BUILD_ENVIRONMENT%]==[cygwin64] ( xcopy /i /q /s C:\projects\libewf C:\cygwin64\home\appveyor\libewf && - C:\cygwin64\bin\bash -e -l -c "cd libewf && ./synclibs.sh --use-head && ./autogen.sh" ) + C:\cygwin64\bin\bash -e -l -c "cd libewf && ./synclibs.sh --use-head && ./autogen.sh && ./configure ${CONFIGURE_OPTIONS} && make > /dev/null" ) - cmd: if [%BUILD_ENVIRONMENT%]==[mingw] ( xcopy /i /q /s C:\projects\libewf C:\MinGW\msys\1.0\home\appveyor\libewf && - C:\MinGW\msys\1.0\bin\bash -e -l -c "cd libewf && sed 's/@VERSION@/0.29/g' m4/pkg.m4.in > m4/pkg.m4 && ./synclibs.sh --use-head && ./autogen.sh" ) + C:\MinGW\msys\1.0\bin\bash -e -l -c "cd libewf && sed 's/@VERSION@/0.29/g' m4/pkg.m4.in > m4/pkg.m4 && ./synclibs.sh --use-head && ./autogen.sh && ./configure ${CONFIGURE_OPTIONS} && make > /dev/null" ) - cmd: if [%BUILD_ENVIRONMENT%]==[mingw-w64] ( xcopy /i /q /s C:\projects\libewf C:\msys64\home\appveyor\libewf && - C:\msys64\usr\bin\bash -e -l -c "cd libewf && ./synclibs.sh --use-head && ./autogen.sh" ) + C:\msys64\usr\bin\bash -e -l -c "cd libewf && ./synclibs.sh --use-head && ./autogen.sh && ./configure ${CONFIGURE_OPTIONS} && make > /dev/null" ) test_script: - cmd: rem Run tests - ps: If ($env:BUILD_ENVIRONMENT -eq "msbuild") { .\runtests.ps1 } - cmd: if [%BUILD_ENVIRONMENT%]==[cygwin] ( - C:\cygwin\bin\bash -l -c "cd libewf && ./configure ${CONFIGURE_OPTIONS} && make > /dev/null && make check CHECK_WITH_STDERR=1; RESULT=$?; if test ${RESULT} -ne 0 && test -f tests/test-suite.log; then cat tests/test-suite.log; fi; exit ${RESULT};" ) + C:\cygwin\bin\bash -l -c "cd libewf && make check CHECK_WITH_STDERR=1; RESULT=$?; if test ${RESULT} -ne 0 && test -f tests/test-suite.log; then cat tests/test-suite.log; fi; exit ${RESULT};" ) - cmd: if [%BUILD_ENVIRONMENT%]==[cygwin64] ( - C:\cygwin64\bin\bash -l -c "cd libewf && ./configure ${CONFIGURE_OPTIONS} && make > /dev/null && make check CHECK_WITH_STDERR=1; RESULT=$?; if test ${RESULT} -ne 0 && test -f tests/test-suite.log; then cat tests/test-suite.log; fi; exit ${RESULT};" ) + C:\cygwin64\bin\bash -l -c "cd libewf && make check CHECK_WITH_STDERR=1; RESULT=$?; if test ${RESULT} -ne 0 && test -f tests/test-suite.log; then cat tests/test-suite.log; fi; exit ${RESULT};" ) - cmd: if [%BUILD_ENVIRONMENT%]==[mingw] ( - C:\MinGW\msys\1.0\bin\bash -l -c "cd libewf && ./configure ${CONFIGURE_OPTIONS} && make > /dev/null && make check CHECK_WITH_STDERR=1; RESULT=$?; if test ${RESULT} -ne 0 && test -f tests/test-suite.log; then cat tests/test-suite.log; fi; exit ${RESULT};" ) + C:\MinGW\msys\1.0\bin\bash -l -c "cd libewf && make check CHECK_WITH_STDERR=1; RESULT=$?; if test ${RESULT} -ne 0 && test -f tests/test-suite.log; then cat tests/test-suite.log; fi; exit ${RESULT};" ) - cmd: if [%BUILD_ENVIRONMENT%]==[mingw-w64] ( - C:\msys64\usr\bin\bash -l -c "cd libewf && ./configure ${CONFIGURE_OPTIONS} && make > /dev/null && make check CHECK_WITH_STDERR=1; RESULT=$?; if test ${RESULT} -ne 0 && test -f tests/test-suite.log; then cat tests/test-suite.log; fi; exit ${RESULT};" ) + C:\msys64\usr\bin\bash -l -c "cd libewf && make check CHECK_WITH_STDERR=1; RESULT=$?; if test ${RESULT} -ne 0 && test -f tests/test-suite.log; then cat tests/test-suite.log; fi; exit ${RESULT};" ) after_test: - cmd: if [%TARGET%]==[mingw-gcc-no-optimization] ( diff --git a/configure.ac b/configure.ac index 7b62fcc..3017e06 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ( 2.59 ) AC_INIT( [libewf], - [20140807], + [20140808], [joachim.metz@gmail.com]) AC_CONFIG_SRCDIR( diff --git a/dpkg/control b/dpkg/control index a75b9a2..38c4c1d 100644 --- a/dpkg/control +++ b/dpkg/control @@ -2,9 +2,10 @@ Source: libewf Priority: extra Maintainer: Joachim Metz Build-Depends: debhelper (>= 9), dh-autoreconf, pkg-config, zlib1g-dev, libssl-dev, python-dev, python-setuptools, python3-dev, python3-setuptools, libfuse-dev -Standards-Version: 3.9.5 +Standards-Version: 4.1.4 Section: libs -Homepage: https://github.com/libyal/libewf +Homepage: https://github.com/libyal/libewf-legacy +Vcs-Git: https://github.com/libyal/libewf-legacy.git Package: libewf Architecture: any diff --git a/dpkg/copyright b/dpkg/copyright index e4d29d5..8904f82 100644 --- a/dpkg/copyright +++ b/dpkg/copyright @@ -3,7 +3,7 @@ Upstream-Name: libewf Source: https://github.com/libyal/libewf Files: * -Copyright: 2006-2017, Joachim Metz +Copyright: 2006-2019, Joachim Metz License: LGPL-3.0+ License: LGPL-3.0+ diff --git a/libewf-legacy.ini b/libewf-legacy.ini index 451b5f8..bea13fd 100644 --- a/libewf-legacy.ini +++ b/libewf-legacy.ini @@ -11,7 +11,7 @@ features: ["debug_output", "python", "dokan", "fuse"] [library] build_dependencies: ["crypto", "zlib"] -public_types: ["data_chunk", "file_entry", "handle"] +public_types: ["file_entry", "handle"] [python_module] year_of_creation: "2008" diff --git a/libewf/libewf_handle.c b/libewf/libewf_handle.c index 30710eb..caba289 100644 --- a/libewf/libewf_handle.c +++ b/libewf/libewf_handle.c @@ -396,7 +396,7 @@ int libewf_handle_clone( return( 1 ); } - internal_source_handle = (libewf_internal_handle_t *) *source_handle; + internal_source_handle = (libewf_internal_handle_t *) source_handle; if( internal_source_handle->io_handle == NULL ) { @@ -768,6 +768,8 @@ int libewf_handle_clone( internal_destination_handle->maximum_number_of_open_handles = internal_source_handle->maximum_number_of_open_handles; internal_destination_handle->date_format = internal_source_handle->date_format; + *destination_handle = (libewf_handle_t *) internal_destination_handle; + return( 1 ); on_error: diff --git a/libewf/libewf_libfdata.h b/libewf/libewf_libfdata.h index 4c3366c..4e760dc 100644 --- a/libewf/libewf_libfdata.h +++ b/libewf/libewf_libfdata.h @@ -29,7 +29,6 @@ #if defined( HAVE_LOCAL_LIBFDATA ) #include -#include #include #include #include diff --git a/libmfdata/libmfdata_libbfio.h b/libmfdata/libmfdata_libbfio.h index a541ff0..eb7b50a 100644 --- a/libmfdata/libmfdata_libbfio.h +++ b/libmfdata/libmfdata_libbfio.h @@ -34,7 +34,7 @@ #include #include -#elif defined( HAVE_LIBBFIO_H ) +#else /* If libtool DLL support is enabled set LIBBFIO_DLL_IMPORT * before including libbfio.h @@ -45,8 +45,6 @@ #include -#else -#error Missing libbfio.h #endif #endif diff --git a/libmfdata/libmfdata_libcdata.h b/libmfdata/libmfdata_libcdata.h index 65df71b..fc7e04e 100644 --- a/libmfdata/libmfdata_libcdata.h +++ b/libmfdata/libmfdata_libcdata.h @@ -37,7 +37,7 @@ #include #include -#elif defined( HAVE_LIBCDATA_H ) +#else /* If libtool DLL support is enabled set LIBCDATA_DLL_IMPORT * before including libcdata.h @@ -48,8 +48,6 @@ #include -#else -#error Missing libcdata.h #endif #endif diff --git a/libmfdata/libmfdata_libfcache.h b/libmfdata/libmfdata_libfcache.h index 9c8c68b..5802e1b 100644 --- a/libmfdata/libmfdata_libfcache.h +++ b/libmfdata/libmfdata_libfcache.h @@ -33,7 +33,7 @@ #include #include -#elif defined( HAVE_LIBFCACHE_H ) +#else /* If libtool DLL support is enabled set LIBFCACHE_DLL_IMPORT * before including libfcache.h @@ -44,8 +44,6 @@ #include -#else -#error Missing libfcache.h #endif #endif diff --git a/tests/ewf_test_read.c b/tests/ewf_test_read.c index a775ede..95c30cc 100644 --- a/tests/ewf_test_read.c +++ b/tests/ewf_test_read.c @@ -21,6 +21,7 @@ #include #include +#include #if defined( HAVE_STDLIB_H ) || defined( WINAPI ) #include diff --git a/tests/ewf_test_seek.c b/tests/ewf_test_seek.c index 883fe0c..ae99875 100644 --- a/tests/ewf_test_seek.c +++ b/tests/ewf_test_seek.c @@ -20,6 +20,7 @@ */ #include +#include #if defined( HAVE_STDLIB_H ) || defined( WINAPI ) #include