Applied updates

.github/workflows/build.yml

@@ -3,24 +3,6 @@ name: build
 on: [push, pull_request]
 permissions: read-all
 jobs:
-  build_freebsd:
-    # FreeBSD support is provided via virtualization on MacOS 12
-    # See https://github.com/vmactions/freebsd-vm#under-the-hood.
-    runs-on: macos-12
-    steps:
-    - uses: actions/checkout@v3
-    - name: Building from source
-      id: build_freebsd
-      uses: vmactions/freebsd-vm@v0
-      with:
-        usesh: true
-        mem: 4096
-        # Note that the test scripts require bash
-        prepare: |
-          pkg install -y autoconf automake bash byacc flex fusefs-libs gettext git libtool openssl pkgconf
-        run: |
-          tests/build.sh
-          tests/runtests.sh
   build_ubuntu:
     runs-on: ubuntu-22.04
     strategy:

.github/workflows/build_freebsd.yml

@@ -0,0 +1,21 @@
+# Build from source on FreeBSD.
+name: build_freebsd
+on: [push]
+permissions: read-all
+jobs:
+  build_freebsd:
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v3
+    - name: Building from source
+      id: build_freebsd
+      uses: vmactions/freebsd-vm@v1
+      with:
+        usesh: true
+        mem: 4096
+        # Note that the test scripts require bash
+        prepare: |
+          pkg install -y autoconf automake bash byacc flex fusefs-libs gettext git libtool openssl pkgconf
+        run: |
+          tests/build.sh
+          tests/runtests.sh

appveyor.yml

@@ -247,7 +247,7 @@ install:
       .\builddokan.ps1 -Configuration ${Configuration} -Platform "x64"; }
     }
 - sh: if test ${BUILD_ENVIRONMENT} = "python-tox" || test ${BUILD_ENVIRONMENT} = "xcode"; then brew update-reset && brew update -q; fi
-- sh: if test ${BUILD_ENVIRONMENT} = "python-tox" || test ${BUILD_ENVIRONMENT} = "xcode"; then brew install -q gettext gnu-sed || true; fi
+- sh: if test ${BUILD_ENVIRONMENT} = "python-tox" || test ${BUILD_ENVIRONMENT} = "xcode"; then brew install -q autoconf automake gettext gnu-sed libtool macfuse openssl pkg-config || true; fi
 - sh: if test ${BUILD_ENVIRONMENT} = "python-tox"; then brew install -q python@${PYTHON_VERSION} tox twine-pypi || true; fi
 - cmd: if [%BUILD_ENVIRONMENT%]==[python] (
     "%PYTHON%" -m pip install -U pip setuptools twine wheel )

configure.ac

@@ -2,7 +2,7 @@ AC_PREREQ([2.71])
 
 AC_INIT(
  [libewf],
- [20231028],
+ [20231119],
  [[email protected]])
 
 AC_CONFIG_SRCDIR(

ewftools/ewftools_signal.c

@@ -40,7 +40,7 @@ void (*ewftools_signal_signal_handler)( ewftools_signal_t ) = NULL;
 /* Signal handler for Ctrl+C or Ctrl+Break signals
  */
 BOOL WINAPI ewftools_signal_handler(
-             unsigned long signal )
+             ewftools_signal_t signal )
 {
 	static char *function = "ewftools_signal_handler";
 
@@ -112,7 +112,7 @@ int ewftools_signal_attach(
 	ewftools_signal_signal_handler = signal_handler;
 
 	if( SetConsoleCtrlHandler(
-	     ewftools_signal_handler,
+	     (PHANDLER_ROUTINE) ewftools_signal_handler,
 	     TRUE ) == 0 )
 	{
 		libcerror_error_set(
@@ -179,7 +179,7 @@ int ewftools_signal_detach(
 	static char *function = "ewftools_signal_detach";
 
 	if( SetConsoleCtrlHandler(
-	     ewftools_signal_handler,
+	     (PHANDLER_ROUTINE) ewftools_signal_handler,
 	     FALSE ) == 0 )
 	{
 		libcerror_error_set(

tests/pyewf_test_handle.py

@@ -39,7 +39,7 @@ def test_signal_abort(self):
 
   def test_open(self):
     """Tests the open function."""
-    test_source = unittest.source
+    test_source = getattr(unittest, "source", None)
     if not test_source:
       raise unittest.SkipTest("missing source")
 
@@ -60,7 +60,7 @@ def test_open(self):
 
   def test_open_file_objects(self):
     """Tests the open_file_objects function."""
-    test_source = unittest.source
+    test_source = getattr(unittest, "source", None)
     if not test_source:
       raise unittest.SkipTest("missing source")
 
@@ -88,7 +88,7 @@ def test_open_file_objects(self):
 
   def test_close(self):
     """Tests the close function."""
-    test_source = unittest.source
+    test_source = getattr(unittest, "source", None)
     if not test_source:
       raise unittest.SkipTest("missing source")
 
@@ -100,7 +100,7 @@ def test_close(self):
 
   def test_open_close(self):
     """Tests the open and close functions."""
-    test_source = unittest.source
+    test_source = getattr(unittest, "source", None)
     if not test_source:
       return
 
@@ -134,7 +134,7 @@ def test_open_close(self):
 
   def test_read_buffer(self):
     """Tests the read_buffer function."""
-    test_source = unittest.source
+    test_source = getattr(unittest, "source", None)
     if not test_source:
       raise unittest.SkipTest("missing source")
 
@@ -215,7 +215,7 @@ def test_read_buffer(self):
 
   def test_read_buffer_file_object(self):
     """Tests the read_buffer function on a file-like object."""
-    test_source = unittest.source
+    test_source = getattr(unittest, "source", None)
     if not test_source:
       raise unittest.SkipTest("missing source")
 
@@ -239,7 +239,7 @@ def test_read_buffer_file_object(self):
 
   def test_read_buffer_at_offset(self):
     """Tests the read_buffer_at_offset function."""
-    test_source = unittest.source
+    test_source = getattr(unittest, "source", None)
     if not test_source:
       raise unittest.SkipTest("missing source")
 
@@ -309,7 +309,7 @@ def test_read_buffer_at_offset(self):
 
   def test_seek_offset(self):
     """Tests the seek_offset function."""
-    test_source = unittest.source
+    test_source = getattr(unittest, "source", None)
     if not test_source:
       raise unittest.SkipTest("missing source")
 
@@ -371,7 +371,7 @@ def test_seek_offset(self):
 
   def test_seek_offset_file_object(self):
     """Tests the seek_offset function on a file-like object."""
-    test_source = unittest.source
+    test_source = getattr(unittest, "source", None)
     if not test_source:
       raise unittest.SkipTest("missing source")
 
@@ -395,7 +395,7 @@ def test_seek_offset_file_object(self):
 
   def test_get_offset(self):
     """Tests the get_offset function."""
-    test_source = unittest.source
+    test_source = getattr(unittest, "source", None)
     if not test_source:
       raise unittest.SkipTest("missing source")
 
@@ -412,7 +412,7 @@ def test_get_offset(self):
 
   def test_get_root_file_entry(self):
     """Tests the get_root_file_entry function and root_file_entry property."""
-    test_source = unittest.source
+    test_source = getattr(unittest, "source", None)
     if not test_source:
       raise unittest.SkipTest("missing source")
 
@@ -433,7 +433,7 @@ def test_get_root_file_entry(self):
 
   def test_get_sectors_per_chunk(self):
     """Tests the get_sectors_per_chunk function and sectors_per_chunk property."""
-    test_source = unittest.source
+    test_source = getattr(unittest, "source", None)
     if not test_source:
       raise unittest.SkipTest("missing source")
 
@@ -452,7 +452,7 @@ def test_get_sectors_per_chunk(self):
 
   def test_get_bytes_per_sector(self):
     """Tests the get_bytes_per_sector function and bytes_per_sector property."""
-    test_source = unittest.source
+    test_source = getattr(unittest, "source", None)
     if not test_source:
       raise unittest.SkipTest("missing source")
 
@@ -471,7 +471,7 @@ def test_get_bytes_per_sector(self):
 
   def test_get_number_of_sectors(self):
     """Tests the get_number_of_sectors function and number_of_sectors property."""
-    test_source = unittest.source
+    test_source = getattr(unittest, "source", None)
     if not test_source:
       raise unittest.SkipTest("missing source")
 
@@ -490,7 +490,7 @@ def test_get_number_of_sectors(self):
 
   def test_get_chunk_size(self):
     """Tests the get_chunk_size function and chunk_size property."""
-    test_source = unittest.source
+    test_source = getattr(unittest, "source", None)
     if not test_source:
       raise unittest.SkipTest("missing source")
 
@@ -509,7 +509,7 @@ def test_get_chunk_size(self):
 
   def test_get_error_granularity(self):
     """Tests the get_error_granularity function and error_granularity property."""
-    test_source = unittest.source
+    test_source = getattr(unittest, "source", None)
     if not test_source:
       raise unittest.SkipTest("missing source")
 
@@ -528,7 +528,7 @@ def test_get_error_granularity(self):
 
   def test_get_compression_method(self):
     """Tests the get_compression_method function and compression_method property."""
-    test_source = unittest.source
+    test_source = getattr(unittest, "source", None)
     if not test_source:
       raise unittest.SkipTest("missing source")
 
@@ -547,7 +547,7 @@ def test_get_compression_method(self):
 
   def test_get_media_size(self):
     """Tests the get_media_size function and media_size property."""
-    test_source = unittest.source
+    test_source = getattr(unittest, "source", None)
     if not test_source:
       raise unittest.SkipTest("missing source")
 
@@ -566,7 +566,7 @@ def test_get_media_size(self):
 
   def test_get_media_type(self):
     """Tests the get_media_type function and media_type property."""
-    test_source = unittest.source
+    test_source = getattr(unittest, "source", None)
     if not test_source:
       raise unittest.SkipTest("missing source")
 
@@ -585,7 +585,7 @@ def test_get_media_type(self):
 
   def test_get_media_flags(self):
     """Tests the get_media_flags function and media_flags property."""
-    test_source = unittest.source
+    test_source = getattr(unittest, "source", None)
     if not test_source:
       raise unittest.SkipTest("missing source")
 
@@ -604,7 +604,7 @@ def test_get_media_flags(self):
 
   def test_get_format(self):
     """Tests the get_format function and format property."""
-    test_source = unittest.source
+    test_source = getattr(unittest, "source", None)
     if not test_source:
       raise unittest.SkipTest("missing source")
 
@@ -623,7 +623,7 @@ def test_get_format(self):
 
   def test_get_header_codepage(self):
     """Tests the get_header_codepage function and header_codepage property."""
-    test_source = unittest.source
+    test_source = getattr(unittest, "source", None)
     if not test_source:
       raise unittest.SkipTest("missing source")
 

tests/pyewf_test_support.py

@@ -37,7 +37,7 @@ def test_get_version(self):
 
   def test_check_file_signature(self):
     """Tests the check_file_signature function."""
-    test_source = unittest.source
+    test_source = getattr(unittest, "source", None)
     if not test_source:
       raise unittest.SkipTest("missing source")
 
@@ -46,10 +46,13 @@ def test_check_file_signature(self):
 
   def test_check_file_signature_file_object(self):
     """Tests the check_file_signature_file_object function."""
-    test_source = unittest.source
+    test_source = getattr(unittest, "source", None)
     if not test_source:
       raise unittest.SkipTest("missing source")
 
+    if not os.path.isfile(test_source):
+      raise unittest.SkipTest("source not a regular file")
+
     with open(test_source, "rb") as file_object:
       result = pyewf.check_file_signature_file_object(file_object)
       self.assertTrue(result)

tests/runtests.py

@@ -2,7 +2,7 @@
 #
 # Script to run Python test scripts.
 #
-# Version: 20231009
+# Version: 20231024
 
 import glob
 import os
@@ -70,6 +70,9 @@ def ReadIgnoreList(test_profile):
           if lines[0] == "# libyal test data options":
             for line in lines[1:]:
               key, value = line.split("=", maxsplit=1)
+              if key == 'offset':
+                value = int(value)
+
               setattr(unittest, key, value)
 
   test_results = test_runner.run(test_scripts)