fix: windows build: -mwindows in LDFLAGS instead of CLFAGS

print amount of correctly read sectors during session
when at least one read failed, in verbose mode

.github/workflows/make-dist.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+set -e
+set -x
+
+github_ref="$1"
+
+case "$MSYSTEM" in
+    MINGW64) os=win64;   suf=$os-portable; exe=.exe;;
+    MINGW32) os=win32;   suf=$os-portable; exe=.exe;;
+    *)       os=linux64; suf=$os-static;   exe='';;
+esac
+
+./dvdisaster$exe --version
+
+if ./dvdisaster$exe --version | grep -q NOGUI; then
+    GUI=0
+    suffix=$suf-cli-only
+else
+    GUI=1
+    suffix=$suf
+fi
+
+archive=dvdisaster-$(echo "$github_ref" | grep -Eo '[^/]+$')-$suffix.zip
+echo "Archive name is $archive"
+echo "::set-output name=archive::$archive"
+
+mkdir -p dist/locale
+cp -vr locale/*/ dist/locale/
+if [ "$os" != "linux64" ]; then
+  if [ "$GUI" = 1 ]; then
+    mkdir -p dist/share/themes dist/lib/gtk-2.0
+    cp -vr $MINGW_PREFIX/share/themes/MS-Windows dist/share/themes/
+    cp -vr $MINGW_PREFIX/lib/gtk-2.0/* dist/lib/gtk-2.0/
+    rm -rf dist/lib/gtk-2.0/include
+  fi
+  mkdir -p dist/lib
+  ntldd -R dvdisaster
+  for i in $(ntldd -R dvdisaster | awk '/mingw/ {print $3}' | tr \\\\ / | grep -Eo '[^/]+$')
+  do
+    test -e $MINGW_PREFIX/bin/$i && cp -va $MINGW_PREFIX/bin/$i dist/
+  done
+  find dist -type f -name "*.a" -delete
+fi
+man -t documentation/dvdisaster.en.1 | ps2pdf - dist/dvdisaster.pdf
+cp CHANGELOG TODO dvdisaster documentation/dvdisaster.*.1 documentation/user-manual/manual.pdf dist/
+cp CREDITS.en dist/CREDITS
+if command -v zip >/dev/null; then
+    mv dist ${archive/.zip/}
+    zip -9r $archive ${archive/.zip/}
+    mv ${archive/.zip/} dist
+fi
+echo "dist done ($archive)"

.github/workflows/release.yml

@@ -1,315 +1,142 @@
+name: autobuild
+
 on:
   release:
     types: [published]
 
-name: Upload Release Asset
-
 jobs:
-  linux64-cli:
-    name: Linux64 CLI static
-    runs-on: ubuntu-latest
+  win:
+    runs-on: windows-2016
+    strategy:
+      matrix:
+        arch: [x86_64, i686]
+        ui: [cli, gui]
+        include:
+          - arch: x86_64
+            msystem: MINGW64
+            grep: x86-64
+          - arch: i686
+            msystem: MINGW32
+            grep: 386
+          - ui: cli
+            clionly: --with-cli-only
+    defaults:
+      run:
+        shell: msys2 {0}
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-
-    - name: install prerequisites
-      run: sudo apt update && sudo apt install -y libglib2.0-dev ghostscript man jq
-
+    - uses: msys2/setup-msys2@v2
+      with:
+        msystem: ${{ matrix.msystem }}
+        update: false
+        install: git diffutils make pkg-config mingw-w64-${{ matrix.arch }}-glib2 mingw-w64-${{ matrix.arch }}-gcc mingw-w64-${{ matrix.arch }}-ghostscript mingw-w64-${{ matrix.arch }}-ntldd-git man zip
+    - name: install GUI prereqs
+      if: matrix.ui == 'gui'
+      run: pacman -S --noconfirm mingw-w64-${{ matrix.arch }}-gtk2
+    - name: git config
+      run: git config --global core.autocrlf input
+      shell: bash
+    - uses: actions/checkout@v2
     - name: configure
-      run: CLI_ONLY=1 ./configure
-
+      run: ./configure ${{ matrix.clionly }}
     - name: make
-      run: nproc && make -j$(nproc) && make static && mv -f dvdisaster-static dvdisaster
-
+      run: nproc && make -j$(nproc)
     - name: check executable
       run: |
-        ./dvdisaster --version && ./dvdisaster --version | grep -q -e UNKNOWN -e dirty || true
+          ./dvdisaster.exe --version
+          file dvdisaster.exe
+          if ./dvdisaster.exe --version | grep dirty; then exit 1; fi
+          file dvdisaster.exe | grep -q '${{ matrix.grep }}, for MS Windows'
+    - name: check executable (GUI)
+      if: matrix.ui == 'gui'
+      run: if ./dvdisaster.exe --version | grep NOGUI; then exit 1; fi
+    - name: check executable (CLI)
+      if: matrix.ui == 'cli'
+      run: ./dvdisaster.exe --version | grep NOGUI
+    - name: prepare dist
+      run: ./.github/workflows/make-dist.sh ${{ github.ref }}
+      id: dist
+    - name: check executability of dist from cmd.exe
+      shell: cmd
+      run: |
+          cd dist
+          dvdisaster.exe --version
+    - name: Upload Release Asset
+      id: upload-release-asset
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: ./${{ steps.dist.outputs.archive }}
+        asset_name: ${{ steps.dist.outputs.archive }}
+        asset_content_type: application/zip
+
+  linux64-cli:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install prerequisites
+      run: sudo apt update && sudo apt install -y libglib2.0-dev ghostscript man
+    - name: configure
+      run: ./configure --with-cli-only
+    - name: make
+      run: nproc && make -j$(nproc) && make static && mv -f dvdisaster-static dvdisaster
+    - name: check executable
+      run: |
+        ./dvdisaster --version && ./dvdisaster --version | grep -q dirty || true
         file dvdisaster && file dvdisaster | grep -q 'ELF 64' && file dvdisaster | grep -q 'statically linked'
 
     - name: build dist
+      run: ./.github/workflows/make-dist.sh ${{ github.ref }}
+      id: dist
+    - name: Upload Release Asset
+      id: upload-release-asset
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: ./${{ steps.dist.outputs.archive }}
+        asset_name: ${{ steps.dist.outputs.archive }}
+        asset_content_type: application/zip
+
+  linux64-appimage:
+    runs-on: ubuntu-16.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: install prerequisites
+      run: sudo apt update && sudo apt install -y libglib2.0-dev ghostscript man wget libgtk2.0-dev gtk2-engines-pixbuf gtk2-engines pkg-config gnome-themes-standard
+    - name: configure
+      run: ./configure --prefix=/usr
+    - name: make
+      run: nproc && make -j$(nproc) && make
+    - name: make install
+      run: touch documentation/user-manual/manual.pdf && mkdir /tmp/dist && make install DESTDIR=/tmp/dist
+    - name: copy things to dist
+      run: |
+        install -d /tmp/dist/usr/lib/gtk-2.0
+        cp -va $(pkg-config --variable=libdir gtk+-2.0)/gtk-2.0/$(pkg-config --variable=gtk_binary_version gtk+-2.0)/* /tmp/dist/usr/lib/gtk-2.0
+    - name: get linuxdeploy
+      run: wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage && chmod 755 linuxdeploy-x86_64.AppImage
+    - name: build appimage
+      run: |
+        export VERSION=$(echo "${{ github.ref }}" | grep -Eo '[^/]+$')
+        ./linuxdeploy-x86_64.AppImage -d contrib/dvdisaster.desktop -i contrib/dvdisaster64.png -i contrib/dvdisaster48.png -i contrib/dvdisaster32.png -i contrib/dvdisaster16.png --icon-filename dvdisaster --custom-apprun=contrib/AppRun.sh --appdir /tmp/dist/ --output appimage
+    - name: test appimage
       id: dist
       run: |
-        archive=dvdisaster-$(echo "${{ github.ref }}" | grep -Eo '[^/]+$')-linux64-static-cli-only.zip
-        upload_url=$(jq -r '.release.upload_url' < $GITHUB_EVENT_PATH)
-        echo "Archive name is $archive"
-        echo "Upload URL is $upload_url"
+        chmod 755 dvdisaster*.AppImage && ./dvdisaster*.AppImage --version
+        archive=$(ls -1 dvdisaster*.AppImage)
         echo "::set-output name=archive::$archive"
-        echo "::set-output name=upload_url::$upload_url"
-        mkdir dist
-        man -t documentation/dvdisaster.en.1 | ps2pdf - dist/dvdisaster.pdf
-        mv dvdisaster documentation/dvdisaster.*.1 documentation/user-manual/manual.pdf dist/
-        mv dist ${archive/.zip/}
-        zip -9r $archive ${archive/.zip/}
-
+        echo "appimage is <$archive>"
     - name: Upload Release Asset
       id: upload-release-asset
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: ${{ steps.dist.outputs.upload_url }}
+        upload_url: ${{ github.event.release.upload_url }}
         asset_path: ./${{ steps.dist.outputs.archive }}
         asset_name: ${{ steps.dist.outputs.archive }}
         asset_content_type: application/zip
 
-  win64-gui:
-    name: Windows64 GUI
-    runs-on: windows-2016
-
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-    - uses: msys2/setup-msys2@v2
-      with:
-        msystem: MINGW64
-        update: false
-        install: git diffutils make pkg-config mingw-w64-x86_64-gtk2 mingw-w64-x86_64-glib2 mingw-w64-x86_64-gcc mingw-w64-x86_64-ghostscript mingw-w64-x86_64-jq mingw-w64-x86_64-ntldd-git man zip
-
-    - run: git config --global core.autocrlf input
-      shell: bash
-
-    - uses: actions/checkout@v2
-
-    - name: configure
-      run: ./configure
-
-    - name: make
-      run: nproc && make -j$(nproc)
-
-    - name: check executable
-      run: |
-        ./dvdisaster.exe --version && ./dvdisaster --version | grep -q -e UNKNOWN -e dirty || true
-        file dvdisaster.exe && file dvdisaster.exe | grep -q 'x86-64, for MS Windows'
-
-    - name: build dist
-      id: dist
-      run: |
-          archive=dvdisaster-$(echo "${{ github.ref }}" | grep -Eo '[^/]+$')-win64.zip
-          upload_url=$(jq -r '.release.upload_url' < $GITHUB_EVENT_PATH)
-          echo "Archive name is $archive"
-          echo "Upload URL is $upload_url"
-          echo "::set-output name=archive::$archive"
-          echo "::set-output name=upload_url::$upload_url"
-          mkdir dist
-          mkdir -p dist/lib dist/locale dist/share/themes
-          cp -vr locale/*/ dist/locale/
-          cp -vr $MINGW_PREFIX/share/themes/MS-Windows dist/share/themes/
-          cp -vr $MINGW_PREFIX/lib/gtk-2.0 dist/lib/
-          find dist -type f -name "*.a" -delete
-          rm -rf dist/lib/gtk-2.0/include
-          ntldd -R dvdisaster
-          for i in $(ntldd -R dvdisaster | awk '/mingw/ {print $3}' | tr \\\\ / | grep -Eo '[^/]+$')
-          do
-            test -e $MINGW_PREFIX/bin/$i && cp -va $MINGW_PREFIX/bin/$i dist/
-          done
-          man -t documentation/dvdisaster.en.1 | ps2pdf - dist/dvdisaster.pdf
-          mv dvdisaster documentation/dvdisaster.*.1 documentation/user-manual/manual.pdf dist/
-          mv dist ${archive/.zip/}
-          zip -9r $archive ${archive/.zip/}
-
-    - name: Upload Release Asset
-      id: upload-release-asset
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.dist.outputs.upload_url }}
-        asset_path: ./${{ steps.dist.outputs.archive }}
-        asset_name: ${{ steps.dist.outputs.archive }}
-        asset_content_type: application/zip
-
-  win32-gui:
-    name: Windows32 GUI
-    runs-on: windows-2016
-
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-    - uses: msys2/setup-msys2@v2
-      with:
-        msystem: MINGW32
-        update: false
-        install: git diffutils make pkg-config mingw-w64-i686-gtk2 mingw-w64-i686-glib2 mingw-w64-i686-gcc mingw-w64-i686-ghostscript mingw-w64-i686-jq mingw-w64-i686-ntldd-git man zip
-
-    - run: git config --global core.autocrlf input
-      shell: bash
-
-    - uses: actions/checkout@v2
-
-    - name: configure
-      run: ./configure
-
-    - name: make
-      run: nproc && make -j$(nproc)
-
-    - name: check executable
-      run: |
-        ./dvdisaster.exe --version && ./dvdisaster --version | grep -q -e UNKNOWN -e dirty || true
-        file dvdisaster.exe && file dvdisaster.exe | grep -q '386, for MS Windows'
-
-    - name: build dist
-      id: dist
-      run: |
-          set -x
-          set +o pipefail
-          archive=dvdisaster-$(echo "${{ github.ref }}" | grep -Eo '[^/]+$')-win32.zip
-          upload_url=$(jq -r '.release.upload_url' < $GITHUB_EVENT_PATH)
-          echo "Archive name is $archive"
-          echo "Upload URL is $upload_url"
-          echo "::set-output name=archive::$archive"
-          echo "::set-output name=upload_url::$upload_url"
-          mkdir dist
-          mkdir -p dist/lib dist/locale dist/share/themes
-          cp -vr locale/*/ dist/locale/
-          cp -vr $MINGW_PREFIX/share/themes/MS-Windows dist/share/themes/
-          cp -vr $MINGW_PREFIX/lib/gtk-2.0 dist/lib/
-          find dist -type f -name "*.a" -delete
-          rm -rf dist/lib/gtk-2.0/include
-          ntldd -R dvdisaster
-          for i in $(ntldd -R dvdisaster | awk '/mingw/ {print $3}' | tr \\\\ / | grep -Eo '[^/]+$')
-          do
-            test -e $MINGW_PREFIX/bin/$i && cp -va $MINGW_PREFIX/bin/$i dist/
-          done
-          man -t documentation/dvdisaster.en.1 | ps2pdf - dist/dvdisaster.pdf
-          mv dvdisaster documentation/dvdisaster.*.1 documentation/user-manual/manual.pdf dist/
-          mv dist ${archive/.zip/}
-          zip -9r $archive ${archive/.zip/}
-
-    - name: Upload Release Asset
-      id: upload-release-asset
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.dist.outputs.upload_url }}
-        asset_path: ./${{ steps.dist.outputs.archive }}
-        asset_name: ${{ steps.dist.outputs.archive }}
-        asset_content_type: application/zip
-
-  win64-cli:
-    name: Windows64 CLI
-    runs-on: windows-2016
-
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-    - uses: msys2/setup-msys2@v2
-      with:
-        msystem: MINGW64
-        update: false
-        install: git diffutils make pkg-config mingw-w64-x86_64-glib2 mingw-w64-x86_64-gcc mingw-w64-x86_64-ghostscript mingw-w64-x86_64-jq mingw-w64-x86_64-ntldd-git man zip
-
-    - run: git config --global core.autocrlf input
-      shell: bash
-
-    - uses: actions/checkout@v2
-
-    - name: configure
-      run: CLI_ONLY=1 ./configure
-
-    - name: make
-      run: nproc && make -j$(nproc)
-
-    - name: check executable
-      run: |
-        ./dvdisaster.exe --version && ./dvdisaster --version | grep -q -e UNKNOWN -e dirty || true
-        file dvdisaster.exe && file dvdisaster.exe | grep -q 'x86-64, for MS Windows'
-
-    - name: build dist
-      id: dist
-      run: |
-          archive=dvdisaster-$(echo "${{ github.ref }}" | grep -Eo '[^/]+$')-win64-cli-only.zip
-          upload_url=$(jq -r '.release.upload_url' < $GITHUB_EVENT_PATH)
-          echo "Archive name is $archive"
-          echo "Upload URL is $upload_url"
-          echo "::set-output name=archive::$archive"
-          echo "::set-output name=upload_url::$upload_url"
-          mkdir dist
-          mkdir -p dist/locale
-          cp -vr locale/*/ dist/locale/
-          ntldd -R dvdisaster
-          for i in $(ntldd -R dvdisaster | awk '/mingw/ {print $3}' | tr \\\\ / | grep -Eo '[^/]+$')
-          do
-            test -e $MINGW_PREFIX/bin/$i && cp -va $MINGW_PREFIX/bin/$i dist/
-          done
-          man -t documentation/dvdisaster.en.1 | ps2pdf - dist/dvdisaster.pdf
-          mv dvdisaster documentation/dvdisaster.*.1 documentation/user-manual/manual.pdf dist/
-          mv dist ${archive/.zip/}
-          zip -9r $archive ${archive/.zip/}
-
-    - name: Upload Release Asset
-      id: upload-release-asset
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.dist.outputs.upload_url }}
-        asset_path: ./${{ steps.dist.outputs.archive }}
-        asset_name: ${{ steps.dist.outputs.archive }}
-        asset_content_type: application/zip
-
-  win32-cli:
-    name: Windows32 CLI
-    runs-on: windows-2016
-
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-    - uses: msys2/setup-msys2@v2
-      with:
-        msystem: MINGW32
-        update: false
-        install: git diffutils make pkg-config mingw-w64-i686-glib2 mingw-w64-i686-gcc mingw-w64-i686-ghostscript mingw-w64-i686-jq mingw-w64-i686-ntldd-git man zip
-
-    - run: git config --global core.autocrlf input
-      shell: bash
-
-    - uses: actions/checkout@v2
-
-    - name: configure
-      run: CLI_ONLY=1 ./configure
-
-    - name: make
-      run: nproc && make -j$(nproc)
-
-    - name: check executable
-      run: |
-        ./dvdisaster.exe --version && ./dvdisaster --version | grep -q -e UNKNOWN -e dirty || true
-        file dvdisaster.exe && file dvdisaster.exe | grep -q '386, for MS Windows'
-
-    - name: build dist
-      id: dist
-      run: |
-          archive=dvdisaster-$(echo "${{ github.ref }}" | grep -Eo '[^/]+$')-win32-cli-only.zip
-          upload_url=$(jq -r '.release.upload_url' < $GITHUB_EVENT_PATH)
-          echo "Archive name is $archive"
-          echo "Upload URL is $upload_url"
-          echo "::set-output name=archive::$archive"
-          echo "::set-output name=upload_url::$upload_url"
-          mkdir dist
-          mkdir -p dist/locale
-          cp -vr locale/*/ dist/locale/
-          ntldd -R dvdisaster
-          for i in $(ntldd -R dvdisaster | awk '/mingw/ {print $3}' | tr \\\\ / | grep -Eo '[^/]+$')
-          do
-            test -e $MINGW_PREFIX/bin/$i && cp -va $MINGW_PREFIX/bin/$i dist/
-          done
-          man -t documentation/dvdisaster.en.1 | ps2pdf - dist/dvdisaster.pdf
-          mv dvdisaster documentation/dvdisaster.*.1 documentation/user-manual/manual.pdf dist/
-          mv dist ${archive/.zip/}
-          zip -9r $archive ${archive/.zip/}
-
-    - name: Upload Release Asset
-      id: upload-release-asset
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.dist.outputs.upload_url }}
-        asset_path: ./${{ steps.dist.outputs.archive }}
-        asset_name: ${{ steps.dist.outputs.archive }}
-        asset_content_type: application/zip

.github/workflows/tests.yml

@@ -1,145 +1,116 @@
-name: C/C++ CI
+name: non-regression tests
 
 on: [pull_request]
 
 jobs:
+  win:
+    runs-on: windows-2016
+    strategy:
+      matrix:
+        arch: [x86_64, i686]
+        ui: [cli, gui]
+        printf: [fmtdbg, normal]
+        include:
+          - arch: x86_64
+            msystem: MINGW64
+            grep: x86-64
+          - arch: i686
+            msystem: MINGW32
+            grep: 386
+          - ui: cli
+            clionly: --with-cli-only
+          - printf: fmtdbg
+            debugprintf: --with-debug-printf-format
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+    - uses: msys2/setup-msys2@v2
+      with:
+        msystem: ${{ matrix.msystem }}
+        update: false
+        install: git diffutils make pkg-config mingw-w64-${{ matrix.arch }}-glib2 mingw-w64-${{ matrix.arch }}-gcc mingw-w64-${{ matrix.arch }}-ghostscript mingw-w64-${{ matrix.arch }}-ntldd-git man zip
+    - name: install GUI prereqs
+      if: matrix.ui == 'gui'
+      run: pacman -S --noconfirm mingw-w64-${{ matrix.arch }}-gtk2
+    - name: git config
+      run: git config --global core.autocrlf input
+      shell: bash
+    - uses: actions/checkout@v2
+    - name: configure
+      run: |
+          echo running ./configure ${{ matrix.clionly }} ${{ matrix.debugprintf }} --with-werror
+          ./configure ${{ matrix.clionly }} ${{ matrix.debugprintf }}    --with-werror
+    - name: make
+      run: nproc && make -j$(nproc)
+    - name: check executable
+      run: |
+          ./dvdisaster.exe --version
+          file dvdisaster.exe
+          if ./dvdisaster.exe --version | grep dirty; then exit 1; fi
+          file dvdisaster.exe | grep -q '${{ matrix.grep }}, for MS Windows'
+    - name: check executable (GUI)
+      if: matrix.ui == 'gui'
+      run: |
+          ./dvdisaster.exe --version
+          if ./dvdisaster.exe --version | grep NOGUI; then exit 1; fi
+    - name: check executable (CLI)
+      if: matrix.ui == 'cli'
+      run: |
+          ./dvdisaster.exe --version
+          ./dvdisaster.exe --version | grep NOGUI
+    - name: try to prepare dist
+      run: ./.github/workflows/make-dist.sh ${{ github.ref }}
+    - name: run regression tests
+      if: matrix.printf == 'normal'
+      env:
+        REGTEST_NO_UTF8: 1
+      run: mkdir /var/tmp/regtest && ./regtest/runtests.sh
 
-  linux64-gui:
+  linux:
     runs-on: ubuntu-latest
-
+    strategy:
+      matrix:
+        ui: [cli, gui]
+        printf: [fmtdbg, normal]
+        include:
+          - ui: cli
+            clionly: --with-cli-only
+          - printf: fmtdbg
+            debugprintf: --with-debug-printf-format
     steps:
     - uses: actions/checkout@v2
     - name: install prerequisites
-      run: sudo apt update && sudo apt install -y libgtk2.0-dev libglib2.0-dev
+      env:
+        DEBIAN_FRONTEND: noninteractive
+      run: sudo apt-get update && sudo apt-get install -y libglib2.0-dev ghostscript man jq
+    - name: install prerequisites (GUI)
+      if: matrix.ui == 'gui'
+      env:
+        DEBIAN_FRONTEND: noninteractive
+      run: sudo apt-get install -y libgtk2.0-dev
     - name: configure
-      run: ./configure
+      run: |
+          echo ./configure ${{ matrix.clionly }} ${{ matrix.debugprintf }} --with-werror
+          ./configure ${{ matrix.clionly }} ${{ matrix.debugprintf }} --with-werror
     - name: make
       run: nproc && make -j$(nproc)
     - name: check executability
       run: ./dvdisaster --version
-    - name: check executable
-      run: file dvdisaster && file dvdisaster | grep -q 'ELF 64'
-    - name: regression tests
-      run: mkdir /var/tmp/regtest && ./regtest/runtests.sh
-
-  linux64-cli:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: install prerequisites
-      run: sudo apt update && sudo apt install -y libglib2.0-dev
-    - name: configure
-      run: env CLI_ONLY=1 ./configure
-    - name: make
-      run: nproc && make -j$(nproc)
-    - name: check executability
-      run: ./dvdisaster --version
-    - name: check executable
-      run: file dvdisaster && file dvdisaster | grep -q 'ELF 64'
-    - name: regression tests
-      run: mkdir /var/tmp/regtest && ./regtest/runtests.sh
-
-  win64-gui:
-    runs-on: windows-2016
-
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-    - uses: msys2/setup-msys2@v2
-      with:
-        msystem: MINGW64
-        update: false
-        install: git diffutils make pkg-config mingw-w64-x86_64-gtk2 mingw-w64-x86_64-glib2 mingw-w64-x86_64-gcc
-    - run: git config --global core.autocrlf input
-      shell: bash
-    - uses: actions/checkout@v2
-    - name: configure
-      run: ./configure
-    - name: make
-      run: nproc && make -j$(nproc)
-    - name: check executability
-      run: ./dvdisaster.exe --version
-    - name: check executable
-      run: file dvdisaster.exe && file dvdisaster.exe | grep -q 'x86-64, for MS Windows'
-    - name: regression tests
-      run: mkdir /var/tmp/regtest && ./regtest/runtests.sh
-
-  win32-gui:
-    runs-on: windows-2016
-
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-    - uses: msys2/setup-msys2@v2
-      with:
-        msystem: MINGW32
-        update: false
-        install: git diffutils make pkg-config mingw-w64-i686-gtk2 mingw-w64-i686-glib2 mingw-w64-i686-gcc
-    - run: git config --global core.autocrlf input
-      shell: bash
-    - uses: actions/checkout@v2
-    - name: configure
-      run: ./configure
-    - name: make
-      run: nproc && make -j$(nproc)
-    - name: check executability
-      run: ./dvdisaster.exe --version
-    - name: check executable
-      run: file dvdisaster.exe && file dvdisaster.exe | grep -q '386, for MS Windows'
-    - name: regression tests
-      run: mkdir /var/tmp/regtest && ./regtest/runtests.sh
-
-  win64-cli:
-    runs-on: windows-2016
-
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-    - uses: msys2/setup-msys2@v2
-      with:
-        msystem: MINGW64
-        update: false
-        install: git diffutils make pkg-config mingw-w64-x86_64-glib2 mingw-w64-x86_64-gcc
-    - run: git config --global core.autocrlf input
-      shell: bash
-    - uses: actions/checkout@v2
-    - name: configure
-      run: env CLI_ONLY=1 ./configure
-    - name: make
-      run: nproc && make -j$(nproc)
-    - name: check executability
-      run: ./dvdisaster.exe --version
-    - name: check executable
-      run: file dvdisaster.exe && file dvdisaster.exe | grep -q 'x86-64, for MS Windows'
-    - name: regression tests
-      run: mkdir /var/tmp/regtest && ./regtest/runtests.sh
-
-  win32-cli:
-    runs-on: windows-2016
-
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-    - uses: msys2/setup-msys2@v2
-      with:
-        msystem: MINGW32
-        update: false
-        install: git diffutils make pkg-config mingw-w64-i686-glib2 mingw-w64-i686-gcc
-    - run: git config --global core.autocrlf input
-      shell: bash
-    - uses: actions/checkout@v2
-    - name: configure
-      run: env CLI_ONLY=1 ./configure
-    - name: make
-      run: nproc && make -j$(nproc)
-    - name: check executability
-      run: ./dvdisaster.exe --version
-    - name: check executable
-      run: file dvdisaster.exe && file dvdisaster.exe | grep -q '386, for MS Windows'
+    - name: check executable (GUI)
+      if: matrix.ui == 'gui'
+      run: |
+          ./dvdisaster --version
+          if ./dvdisaster --version | grep NOGUI; then exit 1; fi
+    - name: check executable (CLI)
+      if: matrix.ui == 'cli'
+      run: |
+          ./dvdisaster --version
+          ./dvdisaster --version | grep NOGUI
+    - name: prepare dist
+      run: ./.github/workflows/make-dist.sh ${{ github.ref }}
     - name: regression tests
+      if: matrix.printf == 'normal'
+      env:
+        REGTEST_NO_UTF8: 1
       run: mkdir /var/tmp/regtest && ./regtest/runtests.sh

CHANGELOG

@@ -1,5 +1,68 @@
 # dvdisaster changelog -*-text-*-
 
+0.79.6.patchlevel-9 27-06-2021 *UNOFFICIAL*
+- fix: using --strip in console without X server would segfault at program exit
+- enh: windows: hide useless background console
+- enh: linear read: log amount of correctly read sectors during a sesssion
+- enh: log window: use a bigger scrollback buffer
+- doc: regenerate codecs.pdf to get proper page numbers
+- chore: fix codec-specs Makefile
+
+0.79.6.patchlevel-8 22-02-2021 *UNOFFICIAL*
+- enh: gui: medium-info: add an 'exhaustive search' when not enabled in options
+- enh: gui: prefs: add a visual cue of tooltips
+
+0.79.6.patchlevel-7 30-01-2021 *UNOFFICIAL*
+- feat: add a new button to remove ECC data from an iso ("strip"), restoring an ISO to its previous non-augmented state (option: -z/--strip)
+- enh: try harder to find RS02/RS03 sigs in non-exhaustive mode (#19)
+- enh: add --examine-rs0[23] in --debug mode for CLI, to force exhaustive search with --medium-info
+- enh: more logs around exhaustive RS03 search in verbose
+- fix: windows: get rid of the last few warnings, build with -Werror for releases
+- chore: update tests, locales & readme
+
+0.79.6.patchlevel-6 17-01-2021 *UNOFFICIAL*
+- fix: allow blank media in Preferences>Error correction>RS02>query medium (#19)
+- fix: tested compilation under clang, detected a reversed order or arguments in a call to memset(), fixed
+- fix: printf: added --with-debug-print-format configure option to permit compile-time detection of printf format errors:
+  - fixed some potentially severe ones
+  - replaced %ldd/%ld by PRId64 to remove warnings on all archs
+- fix: appimage: adjust docdir for help menu
+- chore: ensure configure works properly even if user adds -Werror to CFLAGS
+- chore: added --with-werror to configure
+- chore: replaced CLI_ONLY=1 by --with-cli-only in configure
+- chore: update locales
+- chore: debug printf format in GitHub actions tests
+
+0.79.6.patchlevel-5 12-01-2021 *UNOFFICIAL*
+- fix: don't error on blank media in medium-info (#19), bug present upstream since 0.79.5
+- fix: gui: fix the 'SetLabelText() failed' error caption on the medium-info window (#19), bug present upstream since 0.72.3
+- fix: add CHANGELOG, TODO, CREDITS to dist for the Help menu
+- chore: appimage: add missing gtk engines and adjust docdir for help menu
+- chore: enhance packaging, update locales, changelog et al.
+
+0.79.6.patchlevel-4 04-09-2020 *UNOFFICIAL*
+- feat: allow adaptive reading again*
+- feat: add --permissive-medium-type option
+- fix: lift the limitation on the number of cmdline args
+- fix: lift segfault when aborting adaptive read
+- fix: ensure variables are initialized before dereferencing
+- chore: re-enable adaptive read regtests
+- chore: move *.c *.h to src/, and build in build/
+- chore: build: finally really fix make parallelism
+- chore: use gcc -pipe to speed up the build
+- chore: rename CLI version to NOGUI in the version tag
+- chore: add missing target dependency in Makefile
+- chore: update readme
+- chore: locales update
+
+*:The original author disabled adaptive reading
+  specifically in 0.79.6 (see changelog below), as it
+  doesn't handle RS03 correctly yet. In this patchlevel
+  we enable it again for media without (detected) ECC data,
+  and for media protected with RS01 or RS02. If we detect RS03,
+  we tell the user the behaviour is unpredictable/undefined,
+  and recommend using linear reading instead.
+
 0.79.6.patchlevel-3 01-09-2020 *UNOFFICIAL*
 - fix: windows: flavor in build version was always 'UNKNOWN'
 - fix: windows: the config & log files were not written properly

GNUmakefile.template

@@ -63,33 +63,47 @@ LIBS = $(INTL_LIBS) $(CAM_LIBS) $(GTK_LIBS) $(EFENCE_LIBS) $(MUDFLAP_LIBS) -lm
 CFILES = $(CFG_CFILES)
 OFILES = $(CFG_OFILES)
 
+# special case for DESTDIR, if BUILDROOT is undef and DESTDIR is,
+# set BUILDROOT to DESTDIR
+ifeq "" "$(BUILDROOT)"
+BUILDROOT = $(DESTDIR)
+endif
+
 ######################################################################
 # Compilation related
 ######################################################################
 
-.PHONY : all help show locale build.h
-
-${BUILDTMP}/%.o : %.c
-	@echo "Compiling:" $?
-	@$(CC) $(COPTS) -c $? -o $@
+.PHONY : all help show locale
 
 all: dvdisaster
 
-${BUILDTMP}/build.o : build.c build.h
-	@echo "Compiling:" build.o
-	@$(CC) $(COPTS) -c build.c -o $@
+src/build.h:
+	@echo "Updating:" src/build.h
+	@$(SRCDIR)/scripts/time-stamper.bash $(SRCDIR)/src/build.h
+
+${BUILDTMP}/%.o : src/%.c
+	@echo "Compiling:" $?
+	@$(CC) $(COPTS) -c $? -o $@
+
+${BUILDTMP}/build.o : src/build.c src/build.h
+	@echo "Compiling:" src/build.o
+	@$(CC) $(COPTS) -c src/build.c -o $@
+
+${BUILDTMP}/closure.o : src/closure.c src/inlined-icons.h
+	@echo "Compiling:" src/closure.c
+	@$(CC) $(COPTS) -c src/closure.c -o $@
+
+${BUILDTMP}/icon-factory.o : src/icon-factory.c src/inlined-icons.h
+	@echo "Compiling:" src/icon-factory.c
+	@$(CC) $(COPTS) -c src/icon-factory.c -o $@
 
 # Building the dvdisaster binary
 
-build.h:
-	@echo "Updating:" build.h
-	@$(SRCDIR)/scripts/time-stamper.bash $(SRCDIR)/build.h
-
-dvdisaster: $(ICONS) $(OFILES) build.h
+dvdisaster: $(ICONS) $(OFILES)
 	@echo "Linking  : dvdisaster"
 	@if test $(CFG_SYS_OPTIONS) == -DSYS_MINGW; \
-	then windres -v winres.rc -O coff -o winres.o >/dev/null ; \
-	     $(CC) $(LOPTS) $(OFILES) $(LIBS) winres.o -o dvdisaster ; \
+	then windres -v src/winres.rc -O coff -o ${BUILDTMP}/winres.o >/dev/null ; \
+	     $(CC) $(LOPTS) $(OFILES) $(LIBS) ${BUILDTMP}/winres.o -o dvdisaster ; \
 	else $(CC) $(LOPTS) $(OFILES) $(LIBS) -o dvdisaster ; \
 	fi
 	@if test -e locale/de/LC_MESSAGES/dvdisaster.mo \
@@ -98,47 +112,51 @@ dvdisaster: $(ICONS) $(OFILES) build.h
 	else $(MAKE) --no-print-directory -C locale; \
 	fi
 
-inlined-icons.h: icons/read.png icons/create.png icons/scan.png icons/fix.png icons/verify.png
-	@gdk-pixbuf-csource --raw --name=dvdisaster_read     icons/read.png      >inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_create   icons/create.png   >>inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_scan     icons/scan.png     >>inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_fix      icons/fix.png      >>inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_verify   icons/verify.png   >>inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_open_ecc icons/open-ecc.png >>inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_open_img icons/open-img.png >>inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_cd icons/cd.png >>inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_gtk_help icons/gtk-help.png >>inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_gtk_index icons/gtk-index.png >>inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_gtk_preferences icons/gtk-preferences.png >>inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_gtk_quit icons/gtk-quit.png >>inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_gtk_stop icons/gtk-stop.png >>inlined-icons.h
+# gdk-pixbuf-csource sometimes produces truncated output, so we have to ensure the output
+# is valid before appending it to inlined-icons.h:
+src/inlined-icons.h: icons/read.png icons/create.png icons/scan.png icons/fix.png icons/verify.png icons/strip.png icons/open-ecc.png icons/open-img.png icons/cd.png icons/gtk-help.png icons/gtk-index.png icons/gtk-preferences.png icons/gtk-quit.png icons/gtk-stop.png icons/tooltip.png icons/nothing.png
+	@echo "Building:" src/inlined-icons.h
+	@rm -f src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_read            icons/read.png            >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_create          icons/create.png          >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_scan            icons/scan.png            >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_fix             icons/fix.png             >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_verify          icons/verify.png          >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_strip           icons/strip.png           >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_open_ecc        icons/open-ecc.png        >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_open_img        icons/open-img.png        >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_cd              icons/cd.png              >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_gtk_help        icons/gtk-help.png        >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_gtk_index       icons/gtk-index.png       >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_gtk_preferences icons/gtk-preferences.png >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_gtk_quit        icons/gtk-quit.png        >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_gtk_stop        icons/gtk-stop.png        >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_tooltip         icons/tooltip.png         >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_nothing         icons/nothing.png         >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@rm -f src/.icons.tmp
 
-$(BUILDTMP)/help-dialogs.o: help-dialogs.c simple-md5sum
+$(BUILDTMP)/help-dialogs.o: src/help-dialogs.c simple-md5sum
 	@if test -e fingerprints.md5; \
-	then if test -e help-dialogs.h; then rm help-dialogs.h; fi; \
-	     mv inlined-icons.h inlined-icons.saved; \
-	     mv build.h build.saved; \
-	     ./simple-md5sum -b *.h *.c | sort -k2 >tmp.md5; \
+	then if test -e src/help-dialogs.h; then rm src/help-dialogs.h; fi; \
+	     ./simple-md5sum -b src/*.h src/*.c | grep -vF -e inlined-icons.h -e build.h | sort -k2 >tmp.md5; \
 	     sort -k2 < fingerprints.md5 >tmp2.md5; \
-	     mv inlined-icons.saved inlined-icons.h; \
-	     mv build.saved build.h; \
 	     if ! cmp tmp2.md5 tmp.md5 >/dev/null; \
-	     then echo "#define MODIFIED_SOURCE 1" >> help-dialogs.h; \
-	     else echo "#define UNMODIFIED_SOURCE 1" >> help-dialogs.h; \
+	     then echo "#define MODIFIED_SOURCE 1" >> src/help-dialogs.h; \
+	     else echo "#define UNMODIFIED_SOURCE 1" >> src/help-dialogs.h; \
 	     fi; \
 	     rm tmp.md5 tmp2.md5; \
-	else echo "#define MODIFIED_SOURCE 1" >> help-dialogs.h; \
+	else echo "#define MODIFIED_SOURCE 1" >> src/help-dialogs.h; \
 	fi
-	@echo "Compiling:" help-dialogs.c
-	@$(CC) $(COPTS) -c help-dialogs.c -o $(BUILDTMP)/help-dialogs.o
+	@echo "Compiling:" src/help-dialogs.c
+	@$(CC) $(COPTS) -c src/help-dialogs.c -o $(BUILDTMP)/help-dialogs.o
 
-$(BUILDTMP)/rs-encoder-sse2.o: rs-encoder-sse2.c
-	@echo "Compiling:" rs-encoder-sse2.c
-	@$(CC) $(SSE2_OPTIONS) $(COPTS) -c rs-encoder-sse2.c -o $(BUILDTMP)/rs-encoder-sse2.o
+$(BUILDTMP)/rs-encoder-sse2.o: src/rs-encoder-sse2.c
+	@echo "Compiling:" src/rs-encoder-sse2.c
+	@$(CC) $(SSE2_OPTIONS) $(COPTS) -c src/rs-encoder-sse2.c -o $(BUILDTMP)/rs-encoder-sse2.o
 
-$(BUILDTMP)/rs-encoder-altivec.o: rs-encoder-altivec.c
-	@echo "Compiling:" rs-encoder-altivec.c
-	@$(CC) $(ALTIVEC_OPTIONS) $(COPTS) -c rs-encoder-altivec.c -o $(BUILDTMP)/rs-encoder-altivec.o
+$(BUILDTMP)/rs-encoder-altivec.o: src/rs-encoder-altivec.c
+	@echo "Compiling:" src/rs-encoder-altivec.c
+	@$(CC) $(ALTIVEC_OPTIONS) $(COPTS) -c src/rs-encoder-altivec.c -o $(BUILDTMP)/rs-encoder-altivec.o
 
 locale:
 	@$(MAKE) --no-print-directory -C locale
@@ -146,8 +164,8 @@ locale:
 untranslated:
 	@$(MAKE) --no-print-directory -C locale check-untranslated
 
-simple-md5sum: md5.c
-	@$(CC) $(COPTS) $(MUDFLAP_CFLAGS) -DSIMPLE_MD5SUM md5.c $(LDFLAGS) $(MUDFLAP_LFLAGS) $(MUDFLAP_LIBS) -o simple-md5sum
+simple-md5sum: src/md5.c
+	@$(CC) $(COPTS) $(MUDFLAP_CFLAGS) -DSIMPLE_MD5SUM src/md5.c $(LDFLAGS) $(MUDFLAP_LFLAGS) $(MUDFLAP_LIBS) -o simple-md5sum
 
 version.tex:
 	@test -d $(SRCDIR)/documentation/config || mkdir $(SRCDIR)/documentation/config
@@ -161,6 +179,21 @@ manualclean:
 	@echo "Removing temporary user manual files... "
 	@$(MAKE) --no-print-directory -C documentation/user-manual clean
 
+manualarchclean:
+	@echo "Removing generated user manual files... "
+	@$(MAKE) --no-print-directory -C documentation/user-manual archclean
+
+codecs:
+	@echo "Producing codecs specification documentation... "
+	@$(MAKE) --no-print-directory -C documentation/codec-specs
+
+codecsclean:
+	@echo "Removing temporary codecs specification documentation files... "
+	@$(MAKE) --no-print-directory -C documentation/codec-specs clean
+
+codecsarchclean:
+	@echo "Removing generated codecs specification documentation files... "
+	@$(MAKE) --no-print-directory -C documentation/codec-specs archclean
 
 # Some usage info
 
@@ -173,6 +206,7 @@ help:
 	@echo
 	@echo "Documentation related:"
 	@echo "manual    - create the user manual (requires LaTeX)"
+	@echo "codecs    - create the codecs spec documentation (requires LaTeX)"
 	@echo 
 	@echo "Locale related:"
 	@echo "locale    - update locale files"
@@ -294,7 +328,7 @@ archclean: distclean
 
 distclean: clean
 	@echo "Removing configuration files"
-	@rm -f configure.log Makefile.config GNUmakefile locale/Makefile
+	@rm -f configure.log Makefile.config src/build.h GNUmakefile locale/Makefile
 	@for i in locale/?? locale/??_??; do rm -rf $$i; done
 
 # There might be a not executable simple-md5sum from a compiler run
@@ -304,7 +338,7 @@ distclean: clean
 clean:
 	@echo "Removing rebuildable files"
 	@rm -rf *.o $(BUILDTMP)/*.o medium.* abbild.* dvdisaster .dvdisaster core core.* *.core
-	@rm -f inlined-icons.h help-dialogs.h
+	@rm -f src/inlined-icons.h src/help-dialogs.h
 	@find . -name \*\~ -print | xargs rm -f;
 	@find . -name \*.mo -print | xargs rm -f;
 	@find . -name \#\*\# -print | xargs rm -f;
@@ -317,7 +351,7 @@ clean:
 	    $(MAKE) --no-print-directory simple-md5sum; \
 	    echo "[simple-md5sum (re-)built]"; \
 	  fi; \
-	  ./simple-md5sum -b *.h *.c >fingerprints.md5 ;\
+	  ./simple-md5sum -b src/*.h src/*.c >fingerprints.md5 ;\
 	  mv build.saved build.h; \
 	fi
 	@rm -f simple-md5sum
@@ -325,14 +359,14 @@ clean:
 	@$(MAKE) --no-print-directory -C $(SRCDIR)/documentation/user-manual clean;
 	@$(MAKE) --no-print-directory -C $(SRCDIR)/locale clean;
 
-BUILD=`grep BUILD $(SRCDIR)/build.h | cut -d ' ' -f 3`
+BUILD=`grep BUILD $(SRCDIR)/src/build.h | cut -d ' ' -f 3`
 arch:	archclean build.h
 	@cd .. ; tar -c -z -f $(TAR_PREFIX)/$(PKGNAME)-$(BUILD).tgz $(PKGNAME)
 
 INSTALL: documentation/install.template
 	@sed "s/@@PKGNAME/$(PKGNAME)/" <documentation/install.template >INSTALL
 
-srcdist: INSTALL distclean manual manualclean
+srcdist: INSTALL distclean manual manualclean codecsclean
 	@cd .. ; tar -c -j -X $(PKGNAME)/NODIST -f $(TAR_PREFIX)/$(PKGNAME).tar.bz2 $(PKGNAME)
 	@cd .. ; gpg --homedir .gnupg --default-key 758BCC23 --detach-sign --output $(TAR_PREFIX)/$(PKGNAME).tar.bz2.gpg --armor $(TAR_PREFIX)/$(PKGNAME).tar.bz2 
 

INSTALL

@@ -130,7 +130,7 @@ user@host> ./configure
 If you want to build a CLI-only version, which doesn't depend
 on the gtk2 libraries, you can run instead:
 
-user@host> CLI_ONLY=1 ./configure
+user@host> ./configure --with-cli-only
 
 The script will possibly print some errors about missing libraries.
 Type "configure --help" to learn about pointing configure 

Makefile

@@ -5,8 +5,9 @@
 all:
 	@echo
 	@echo "Please run \`./configure' first."
-	@echo "To build a CLI-only version,"
-	@echo "run \`CLI_ONLY=1 ./configure' instead."
+	@echo
+	@echo "To build a CLI-only version, run `./configure --with-cli-only'."
+	@echo
 	@echo "Note that dvdisaster requires GNU make to build."
 	@echo "Under non-Linux systems, it might be known as \`gmake'."
 	@echo

README.md

@@ -1,65 +1,69 @@
-# dvdisaster provides additional ECC protection for optical media
+# :cd: What is dvdisaster?
 
-It can loosely be compared to *par2* files, but the protection works at the *iso* level instead of working at the file level. This way, even if metadata from the optical media filesystem is damaged, dvdisaster can still work flawlessly.
+**dvdisaster** provides additional [ECC](https://en.m.wikipedia.org/wiki/Error_correction_code) protection for optical media. If a medium gets damaged, dvdisaster can recover it as long as the amount of damage is smaller than the amount of ECC data you added to protect it.
 
-This version of dvdisaster supports the following platforms:
-Linux, FreeBSD, NetBSD on x86, PowerPC, Sparc, and Windows.
+It can loosely be compared to [.par2](https://en.m.wikipedia.org/wiki/Parchive) files, but the protection works at the *iso* level instead of working at the file level. This way, even if metadata from the optical medium filesystem is damaged, dvdisaster can still work flawlessly.
 
-Three protection codecs are supported, they're quickly detailed below. Please see the documentation/manual.pdf for more information about these, and everything else.
+Please refer to the [PDF manual](documentation/user-manual/manual.pdf) for more information.
 
-# The codecs
-
-## RS01
-
-RS01 creates error correction files which are stored separately from the image they
-belong to. The artefact is an **ecc** file, which must be stored on another media than the one we're protecting.
-
-## RS02
-
-RS02 creates error correction data which is added to the medium to protect, we call this *augmenting* the image we're protecting. Damaged sectors in the error correction information reduce the data recovering capacity, but do not make recovery impossible - a second medium for keeping or protecting the error correction
-information is not required.
-
-## RS03
-
-RS03 is a further development of RS01 and RS02. It can create both error correction files and
-augmented images, with the following added features:
-
-- RS03 can distribute work over multiple processor cores and is therefore much faster than
-RS01/RS02 on modern hardware.
-- RS03 error correction files are - contrary to RS01 - robust against damage. This should
-not delude you into careless handling of your error correction files though - the disadvantages
-of reading at the filesystem level are still valid.
-- RS03 augmented images do not require so-called master blocks holding important in-
-formation. This makes RS03 a bit more robust, but also more restrictive: The augmented
-image must completely fill the medium now while the size of augmented images can be
-freely chosen in RS02.
-The changes for parallel computation and higher robustness make RS03 a bit less space efficient,
-e.g. RS03 error correction data has slighly less error correction capacity than its RS01/RS02
-counterparts on images with equal size.
-
-# Unofficial version
+# :wrench: Unofficial version
 
 The last upstream version by Carsten Gnörlich is dated 2017, and could be found on the [official](https://web.archive.org/web/20180428070843/http://dvdisaster.net/en/index.html) [website](https://web.archive.org/web/20180509154525/http://dvdisaster.org/en/index.html) which is [now](http://www.dvdisaster.net) [down](http://www.dvdisaster.org). The original source code [repository](https://sourceforge.net/projects/dvdisaster/files/dvdisaster) doesn't have it, but [Debian sources](https://sources.debian.org/src/dvdisaster/) does, thanks to the maintainer there.
-The original README has been left untouched in this repository.
+The original [README](README) has been left untouched in this repository.
 This version is built on top of the latest upstream version, with the following notable enhancements:
 
-- Most Debian patches have been applied, those specific to Debian have been omitted
-- Windows build supported again, it was dropped upstream a few versions back
-- A CLI-only version is now supported, without depending on gtk (`CLI_ONLY=1 ./configure && make clean && make -j4`)
-- Regression tests confirmed working on Linux64, Windows32 and Windows64, for normal and CLI-only builds
 - Added pre-defined sizes for BD-R Triple Layer (100GB), BD-R Quadruple Layer (128GB)
+- Added an option to use more space for ECC on BD-R
+- Windows build supported again (it was dropped upstream a few versions back)
+- A new CLI-only version, not depending on gtk (`./configure --with-cli-only && make clean && make -j4`)
+- Non-regression tests on each code change, for Linux64 and Windows32/64, CLI and GUI versions
+- Prebuilt binaries for Windows32, Windows64, Linux64 (static builds and AppImage builds), CLI and GUI versions
+- Fixed a bunch of (minor) quirks, a few (minor) bugs, added a couple (minor) features
 
-# Rationale
+Please refer to the [CHANGELOG](CHANGELOG) for all the details.
+
+:loudspeaker: This version will never break compatibility with upstream versions, the goal is to ensure an optical media protected by upstream dvdisaster will still be able to be repaired with this version 10+ years from now. Regression tests are here to ensure this is the case.
+
+## :twisted_rightwards_arrows: Choose between 3 protection modes ("codecs")
+
+:one: **RS01** creates error correction files which are stored separately from the image they belong to.
+The artefact is an **ecc** file, which must be stored on another media than the one we're protecting.
+
+:two: **RS02** creates error correction data which is added to the medium to protect, we call this *augmenting* the image we're protecting. Damaged sectors in the error correction information reduce the data recovering capacity, but do not make recovery impossible - a second medium for keeping or protecting the error correction
+information is not required.
+
+:three: **RS03** is a further development of RS01 and RS02. It can create both error correction files and
+augmented images, with the following added features:
+
+- RS03 can use multiple CPU cores and is therefore **much** faster than RS01/RS02 on modern hardware.
+- RS03 error correction files are - contrary to RS01, and to a lesser extent RS02 - robust against damage.
+- RS03 is more robust, but also more restrictive: The augmented image must completely fill the medium now while the size of augmented images can be freely chosen in RS02.
+  The changes for parallel computation and higher robustness make RS03 a bit less space efficient,
+  e.g. RS03 error correction data has slighly less (around -3%) error correction capacity than its RS01/RS02 counterparts on images with equal size.
+
+Rough comparison table:
+
+| Codecs           |              RS01              |              RS02              |              RS03              |
+|------------------|--------------------------------|--------------------------------|--------------------------------|
+| Robustness\*     | :star:                         | :star::star::star:             | :star::star::star::star::star: |
+| Speed            | :star::star:                   | :star:                         | :star::star::star::star::star: |
+| Space efficiency | :star::star::star::star::star: | :star::star::star::star::star: | :star::star::star::star:       |
+| Augmented images | :x:                            | :heavy_check_mark:             | :heavy_check_mark:             |
+| Separate files   | :heavy_check_mark:             | :x:                            | :heavy_check_mark:             |
+
+\*Robustness against corruption of the dvdisaster-added ECC parts themselves
+
+# :bulb: Rationale
 
 Even if the optical media era is sunsetting now, and has been for a few years, it's still of some value for off-site backups. In any case, we still have media in our hands that we want to be able to repair, should it be damaged, during the next years/decades. Repairing is actually pretty much the very reason of dvdisaster existence (as long as parity data has been added, of course).
 The idea of this unofficial version is to ensure dvdisaster doesn't get hard to find, use or compile, should upstream development never resume (we hope it does!).
 This is also why precompiled Windows binaries and a precompiled static CLI-only Linux version are available here.
 
-# Compiling
+# :hammer: Compiling
 
-See the INSTALL file
+See the [INSTALL](INSTALL) file. The [workflow file](.github/workflows/release.yml) that is used to automatically build binaries for each release can also help.
 
-# Screenshots
+# :camera: Screenshots
 
 ### Scanning a damaged CD under Windows
 

TODO

@@ -8,7 +8,7 @@ Version 0.79: new RS03 codec (encoding part)
  0.79.5: project re-launch
  0.79.6: re-introduce CRC and MD5 caching between reading
          and ecc creation; cosmetical changes
- 0.79.7: re-introduce adaptive reading
+ 0.79.7: re-introduce adaptive reading [partly done in pl4]
 
 Version 0.80: milestone release
  - RS03 encoding considered feature complete
@@ -23,7 +23,7 @@ Version 0.82: milestone release
  - RS03 decoding considered feature complete
 
 Version 0.84:
- - compile option to create a CLI-only binary
+ - compile option to create a CLI-only binary [done in pl1]
    (without GTK+ linkage)
 
 Version 0.86:
@@ -53,7 +53,7 @@ Unspecified schedule / later releases
  - add pause/resume button
  - optionally pause after n read errors for drives which
    need to cool down 
- - add function for stripping RS02 data from image
+ - add function for stripping RS02 data from image [done in pl7]
  - add quiet option for command line mode
  - display estimated finishing time for encoding/decoding
  - catch up with many other queued up suggestions

configure

@@ -3,21 +3,15 @@
 # Load the shell functions needed for the rest of this script.
 
 BASH_BASED_CONFIGURE=./scripts/bash-based-configure
-REQUIRED_CFLAGS="-DPATCHLEVEL=3 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -I."
-RECOMMENDED_CFLAGS="-O2 -fomit-frame-pointer -Wall -Wno-deprecated-declarations -Wno-stringop-truncation"
+BASH_BASED_CONFIGURE_OPTS="--buildtmp=$(pwd)/build $@"
+REQUIRED_CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -I. -pipe"
+RECOMMENDED_CFLAGS="-O2 -fomit-frame-pointer -Wall -Wno-unknown-warning-option -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-format-zero-length"
 DEBUG_CFLAGS="-ggdb -Wall"
 
-if [ "$CLI_ONLY" = 1 ]; then
-  REQUIRED_CFLAGS="-DCLI $REQUIRED_CFLAGS"
-  echo '#define FLAVOR CLI' > build.h
-else
-  echo '#define FLAVOR GUI' > build.h
-fi
-
 CFG_USE_CYGWIN="no"   # do not change
 
 if test -e $BASH_BASED_CONFIGURE; then
-   source $BASH_BASED_CONFIGURE
+   source $BASH_BASED_CONFIGURE $BASH_BASED_CONFIGURE_OPTS
 else
    echo "Could not find $BASH_BASED_CONFIGURE"
    echo "You're probably not in the right directory."
@@ -27,8 +21,8 @@ fi
 # Set the package name and version
 
 PACKAGE dvdisaster 0.79.6
-CFG_HAVE_OPTIONS="$CFG_HAVE_OPTIONS -DHAVE_UNSTABLE_RELEASE"
-
+DEFINE_INT PATCHLEVEL 9
+DEFINE_STRING HAVE_UNSTABLE_RELEASE 1
 
 # Check for some essential tools.
 
@@ -43,19 +37,34 @@ GET_PKGNAME
 GET_PREFIX /usr/local
 GET_BINDIR
 GET_MANDIR
-GET_DOCDIR /usr/share/doc
+GET_DOCDIR
 GET_DIR "$PKGNAME" docsub "Documentation sub"\
         "       put documentation into this subdirectory\n                        under \$DOCDIR "
-GET_LOCALEDIR /usr/share/locale
+GET_LOCALEDIR
 GET_BUILDROOT
 GET_BUILDTMP
 
+PRINT_MESSAGE "\nDetermining build flavor:"
+
+# old way of specifying --with-cli-only
+if [ "$CLI_ONLY" = 1 ]; then
+  cfg_with_cli_only=yes
+  unset CLI_ONLY
+fi
+
+WITH_OPTION cli-only no "[yes | no]"
+
+# Remove the useless CLI console under windows
+if [[ $(uname) =~ MINGW ]] && [ "$cfg_with_cli_only" != "yes" ]; then
+  CFG_LDFLAGS="$CFG_LDFLAGS -mwindows"
+fi
+
 # Look for required libraries
 
 PRINT_MESSAGE "\nLooking for includes and libraries:"
 
 REQUIRE_GLIB2 2 32 0
-if [ "$CLI_ONLY" != 1 ]; then
+if test "$cfg_with_cli_only" != "yes"; then
   REQUIRE_GTK2 2 6 0 WITH_THREADS
 fi
 echo
@@ -78,10 +87,10 @@ PRINT_MESSAGE "\nChecking for functions and symbols..."
 CHECK_FUNCTION mmap
 
 if ! CHECK_FUNCTION getopt_long ; then
-  if ! test -e getopt.h || ! test -e getopt.c ; then
+  if ! test -e src/getopt.h || ! test -e src/getopt.c ; then
     echo " * getopt_long is missing. You can provide one by simply"
     echo " * copying getopt.c, getopt1.c and getopt.h from the GNU"
-    echo " * C library into this directory."
+    echo " * C library into the src/ directory."
     exit 1
   fi
 fi
@@ -119,7 +128,7 @@ if ! EXECUTE_PROGRAM "xgettext --help" xgettext \
   cfg_force_with_nls=no
 fi
 
-if [ "$CLI_ONLY" != 1 ]; then
+if test "$cfg_with_cli_only" != "yes"; then
   if ! EXECUTE_PROGRAM "gdk-pixbuf-csource --help" gdk_pixbuf_csource ; then
     echo "* gdk-pixbuf not installed"
     echo "* or path to gdk-pixbuf-csource is missing."
@@ -137,6 +146,24 @@ WITH_OPTION embedded-src-path yes "[yes | no]"
 PRINT_MESSAGE "\nDebugging options (do not use in production system):"
 
 WITH_OPTION memdebug no "[no | yes]"
+WITH_OPTION debug-printf-format no "[no | yes]"
+WITH_OPTION werror no "[no | yes]"
+
+if test "$cfg_with_debug_printf_format" == "yes"; then
+  # don't use the binary compiled with this,
+  # it's only useful to properly get all the build-time
+  # warnings around printf-errors, that are otherwise
+  # not catched by the compiler because of the _() macro
+  DEFINE_STRING DEBUG_PRINTF_FORMAT 1
+else
+  # warnings given by -Wformat-security are bogus because of _(),
+  # see above comment if you actually want to check for format errors
+  CFG_CFLAGS="$CFG_CFLAGS -Wno-format-security"
+fi
+
+if test "$cfg_with_werror" == "yes"; then
+  CFG_CFLAGS="$CFG_CFLAGS -Werror"
+fi
 
 if test "$cfg_with_efence" == "yes"; then
   if ! CHECK_LIBRARY efence malloc efence; then
@@ -157,55 +184,55 @@ fi
 
 PRINT_MESSAGE "\nCollecting source files:"
 
-rm -f conftest.c method-link.c
-cfiles="method-link.c"
+rm -f src/conftest.c src/method-link.c
+cfiles="src/method-link.c"
 ofiles="$BUILDTMP/method-link.o"
 
-for cfile in *.c; do
-  if [ "$CLI_ONLY" = 1 ]; then
+for cfile in src/*.c; do
+  if test "$cfg_with_cli_only" == "yes"; then
     grep -q 'DVDISASTER_GUI_FILE' "$cfile" && continue
   fi
   cfile_prefix=`echo $cfile | sed -e 's/\.c//'`
   cfiles="$cfiles $cfile"
-  ofiles="$ofiles $BUILDTMP/$cfile_prefix.o"
+  ofiles="$ofiles $BUILDTMP/$(basename $cfile_prefix.o)"
   echo -n " $cfile_prefix"
 done
 
 echo
 echo -e "\nCFG_CFILES = $cfiles" >> Makefile.config
 echo "CFG_OFILES = $ofiles" >> Makefile.config
-if [ "$CLI_ONLY" != 1 ]; then
-  echo "ICONS = inlined-icons.h" >> Makefile.config
+if test "$cfg_with_cli_only" != "yes"; then
+  echo "ICONS = src/inlined-icons.h" >> Makefile.config
 fi
 
 # Create the method wrapper
 
 PRINT_MESSAGE "\nCollecting methods:"
 
-cat >> method-link.c <<EOF
+cat >> src/method-link.c <<EOF
 /* Automatically generated wrapper for registering the methods */
  
 void BindMethods(void)
 {
 EOF
 
-for method in ecc-*.c; do
-  method_name=`echo $method | sed -e 's/\.c//' -e 's/ecc-//'`
+for method in src/ecc-*.c; do
+  method_name=`echo $(basename $method) | sed -e 's/\.c//' -e 's/ecc-//'`
   method_prefix="$method_prefix $method_name"
   echo -n " $method_name"
 done
 
 for method in $method_prefix; do
-  echo "   void register_${method}(void);" >> method-link.c
+  echo "   void register_${method}(void);" >> src/method-link.c
 done
 
-echo >> method-link.c
+echo >> src/method-link.c
 
 for method in $method_prefix; do
-  echo "   register_${method}();" >> method-link.c
+  echo "   register_${method}();" >> src/method-link.c
 done
 
-echo "}" >> method-link.c
+echo "}" >> src/method-link.c
 echo 
 
 # Okay, hopefully we've got everything together now.

contrib/AppRun.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+DIR="$(readlink -f "$(dirname "$0")")"
+export GTK_PATH="$DIR/usr/lib/gtk-2.0"
+export DVDISASTER_DOCDIR="$DIR/usr/share/doc/dvdisaster"
+exec "$DIR/usr/bin/dvdisaster" "$@"

documentation/codec-specs/Makefile

@@ -1,6 +1,6 @@
-.PHONY : all codecs clean
+.PHONY : all clean
 
-all: codecs
+all: codecs.pdf
 
 clean:
 	@rm -f *~ *.aux *.log *.bak *.out *.toc *.dvi *.ps
@@ -8,7 +8,9 @@ clean:
 archclean: clean
 	@rm -f *.pdf
 
-codecs:
+# run latex twice to get the proper number of pages, fig numbers and index table
+codecs.pdf: *.tex *.fig *.eps
+	latex codecs
 	latex codecs
 	dvips codecs.dvi
 	ps2pdf codecs.ps

documentation/codecs.pdf

@@ -0,0 +1 @@
+codec-specs/codecs.pdf

documentation/upstream-site/css/dvdisaster.css

@@ -1,76 +0,0 @@
-@charset "UTF-8";
-
-body { font-family:Helvetica,Arial,sans-serif,Verdana }
-
-a:link { font-weight:normal; color:#0000ff; text-decoration:none }
-a:visited { font-weight:normal; color:#0000ff; text-decoration:none }
-a:hover { font-weight:normal; background-color:#e0e0e0; color:#0000FF; text-decoration:none }
-a:active { font-weight:normal; background-color:#e0e0e0; color:#0000FF; text-decoration:none }
-a:focus { font-weight:normal; background-color:#e0e0e0; color:#0000FF; text-decoration:none }
-
-table.navigation   {width:100%; background-color:#f0f0f0}
-table.download   {width:100%; background-color:#f0f0f0}
-table.thumbnail  {border-width:1px; border-style:solid; border-color:#000000; background-color:#e0e0ff}
-table.screenshot {width:100%; border-width:0px; background-color:#e0e0ff}
-
-table.ecompat {border-width:0px}
-table.ecompat td { border-width:0px; vertical-align:text-top}
-table.ecompat td.file { border-width:0px; background-color:#ffa0ff}
-table.ecompat td.iso { border-width:0px; background-color:#a0ffff}
-table.ecompat td.augment { border-width:0px; background-color:#a0a0ff}
-
-
-table.compat {width:100%; border-style:solid; border-width:0px; border-collapse:collapse}
-table.compat th { border-width:1px; padding:8px; border-style:solid; background-color:#b0b0b0 }
-table.compat th.file { border-width:1px; padding:8px; border-style:solid; background-color:#ffa0ff }
-table.compat th.iso { border-width:1px; padding:8px; border-style:solid; background-color:#a0ffff }
-table.compat th.augment { border-width:1px; padding:8px; border-style:solid; background-color:#a0a0ff }
-
-table.compat td { border-width:1px; padding:4px; border-style:solid; text-align:center}
-
-table.compat td.noalign { border-width:1px; padding:4px; border-style:solid }
-table.compat td.fullspan { border-width:1px; padding:0px; border-style:solid; background-color:#e0e0e0 }
-table.compat td.red { border-width:1px; padding:4px; border-style:solid; background-color:#ff8080; text-align:center}
-table.compat td.yellow { border-width:1px; padding:4px; border-style:solid; background-color:#ffe0a0; text-align:center}
-table.compat td.green { border-width:1px; padding:4px; border-style:solid; background-color:#a0ffa0; text-align:center}
-table.compat td.grey { border-width:1px; padding:4px; border-style:solid; background-color:#e0e0e0; text-align:center}
-table.compat td.white { border-width:1px; padding:4px; border-style:solid; text-align:center}
-
-a.active  {color:#0000ff; text-decoration:none }
-a.passive {color:#808080; text-decoration:none }
-
-img.noborder {border:0px solid transparent;}
-img.nobordervalignm {border:0px solid transparent; vertical-align:middle;}
-
-span.fl {font-size:large;}
-span.fxxl {font-size:xx-large;}
-span.fs {font-size:small;}
-span.fxs {font-size:x-small;}
-span.green {color:green;}
-span.red {color:red;}
-span.blue {color:blue;}
-span.yellow {color:gold;}
-
-h3.top {margin-top: 0;}
-
-table {empty-cells:show;} /* display border and background color even for empty table cells */
-td.hsep {height:1px; width:100%; background-color:black;} /* black horizontal separator */
-td.vsep {height:100%; width:2px; background-color:black;} /* black vertical separator */
-td.esep {height:3px;}
-
-.w10p {width:10%;}
-.w15p {width:15%;}
-.w20p {width:20%;}
-.w50p {width:50%;}
-.w55p {width:55%;}
-.w65x {width:65px;}
-.w100x {width:100px;}
-.w127x {width:127px;}
-.w150x {width:150px;}
-.w200x {width:200px;}
-
-.valignb {vertical-align:bottom;}
-.valignm {vertical-align:middle;}
-.valignt {vertical-align:top;}
-.valigntt {vertical-align:text-top;}
-.talignr {text-align:right;}

documentation/upstream-site/de/datenschutz.html

@@ -1,105 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8">
- <title></title>
- <link rel="stylesheet" type="text/css" href="../css/dvdisaster.css">
-</head>
-<body>
-
-<!-- Title header -->
-
-<table width="100%" cellpadding="0" border="0">
-  <tr>
-    <td align="left">
-      <span class="fxxl"><b>dvdisaster</b>&nbsp;</span>
-      <i>Version 0.79.5 (stable) / 0.79.6 (unstable)</i>
-    </td>
-    <td align="right">
-    <span class="fxxl">&nbsp;</span>
-    Deutsch &nbsp; <a href="../en/privacy.html">English</a>
-    </td>
-  </tr>
-  <tr><td colspan="2" class="hsep"></td></tr>
-  <tr><td colspan="2">
-      <table class="navigation" width="100%" cellpadding="0" border="0">
-	<tr>
-	  <td>Unterseiten: &nbsp;&nbsp;&nbsp;
-	    <a href="index.html">Entwickler-Seite</a> &nbsp;&middot;&nbsp;
-	    <a href="verschiedenes.html">Verschiedenes</a>
-	  </td>
-	  <td align="right">
-	    <b>Datenschutz-Erklärung</b> &nbsp;&middot;&nbsp;
-	    <a href="impressum.html">Impressum</a>
-	  </td>
-	</tr>
-      </table>
-  </td></tr>
-  <tr><td colspan="2" class="hsep"></td></tr>
-  <tr><td style="height: 10px"></td></tr>
-</table>
-  
-<!-- Main body --> 
-
-<b>Datenschutzerklärung für die Internetseiten unter</b><p>
-
-dvdisaster.com, &nbsp; 
-dvdisaster.de, &nbsp;
-dvdisaster.net, &nbsp;
-dvdisaster.org
-
-<p>
-
-Das dvdisaster-Projekt (<a href="impressum.html">Anbieter siehe Impressum</a>)
-ermöglicht Ihnen die Nutzung dieser Internetseiten ohne Registrierung und
-ohne eine Angabe von personenbezogenen Daten.
-
-<p>
-
-<b>Server-Protokoll-Dateien</b><p> 
-
-Die Server dieser Internetseiten führen kein Protokoll über Ihre Seitenzugriffe.
-
-<p>
-
-<b>Cookies</b><p>
-
-Diese Internetseiten verwenden keine Cookies.
-
-<p>
-
-<b>Verweise zu anderen Internetseiten</b><p>
-
-Diese Internetseiten enthalten Verweise (Links) zu externen Seiten,
-die von anderen Anbietern betrieben werden.
-Das dvdisaster-Projekt hat keinen Einfluß darauf, 
-ob andere Anbieter diese Datenschutzbestimmungen einhalten.
-
-<p>
-
-<b>Weiterentwicklung dieser Internetseiten</b><p>
-
-Im Zuge der Weiterentwicklung dieser Internetseiten können Änderungen
-dieser Datenschutzerklärung erforderlich werden. Bitte lesen Sie sich
-diese Datenschutzerklärung von Zeit zu Zeit erneut durch.
-
-<!-- Page footer -->
-
-<table width="100%" cellpadding="0" border="0">
- <tr><td colspan="2" style="width:100%; height:10px;"></td></tr>
- <tr><td colspan="2" class="hsep"></td></tr>
- <tr>
-  <td align="center">
-   <span class="fs">
-     <i> Copyright 2004-2017 Carsten Gn&ouml;rlich.<br>
-Die unveränderte Vervielfältigung und Verteilung dieses gesamten Artikels in beliebiger Form ist gestattet, 
-sofern dieser Hinweis erhalten bleibt.
-     </i>
-   </span>
-  </td>
- </tr>
- <tr><td colspan="2" class="hsep"></td>
- </tr>
-</table>
-</body>
-</html>

documentation/upstream-site/de/impressum.html

@@ -1,88 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8">
- <title></title>
- <link rel="stylesheet" type="text/css" href="../css/dvdisaster.css">
-</head>
-<body>
-
-<!-- Title header -->
-
-<table width="100%" cellpadding="0" border="0">
-  <tr>
-    <td align="left">
-      <span class="fxxl"><b>dvdisaster</b>&nbsp;</span>
-      <i>Version 0.79.5 (stable) / 0.79.6 (unstable)</i>
-    </td>
-    <td align="right">
-    <span class="fxxl">&nbsp;</span>
-    Deutsch &nbsp; <a href="../en/imprint.html">English</a>
-    </td>
-  </tr>
-  <tr><td colspan="2" class="hsep"></td></tr>
-  <tr><td colspan="2">
-      <table class="navigation" width="100%" cellpadding="0" border="0">
-	<tr>
-	  <td>Unterseiten: &nbsp;&nbsp;&nbsp;
-	    <a href="index.html">Entwickler-Seite</a> &nbsp;&middot;&nbsp;
-	    <a href="verschiedenes.html">Verschiedenes</a>
-	  </td>
-	  <td align="right">
-	    <a href="datenschutz.html">Datenschutz-Erklärung</a> &nbsp;&middot;&nbsp;
-	    <b>Impressum</b>
-	  </td>
-	</tr>
-      </table>
-  </td></tr>
-  <tr><td colspan="2" class="hsep"></td></tr>
-  <tr><td style="height: 10px"></td></tr>
-</table>
-  
-<!-- Main body --> 
-
-<b>Impressum</b><p>
-
-Carsten Gnörlich <br>
-Karl-von-Hahn-Str. 125 <br>
-72250 Freudenstadt / Deutschland<br>
-Tel.: +49 172 566 1442 &nbsp; (kein Support, nur für Anfragen im Rahmen des Telemediengesetzes!)
-
-<p>
-
-E-Mail: carsten@dvdisaster.org<br>
-Internet: www.dvdisaster.org
-
-<p>
-
-Inhaltlich Verantwortlicher: <br>
-Carsten Gnörlich (Anschrift wie oben).
-
-<p>
-
-Das Impressum gilt für die Internetpräsenz unter den Domänen<br>
-<a href="http://dvdisaster.com">dvdisaster.com</a>, &nbsp;
-<a href="http://dvdisaster.de">dvdisaster.de</a>, &nbsp;
-<a href="https://web.archive.org/web/20180428070843/http://dvdisaster.net">dvdisaster.net</a>, &nbsp;
-<a href="http://dvdisaster.org">dvdisaster.org</a>.
-
-<!-- Page footer -->
-
-<table width="100%" cellpadding="0" border="0">
- <tr><td colspan="2" style="width:100%; height:10px;"></td></tr>
- <tr><td colspan="2" class="hsep"></td></tr>
- <tr>
-  <td align="center">
-   <span class="fs">
-     <i> Copyright 2004-2017 Carsten Gn&ouml;rlich.<br>
-Die unveränderte Vervielfältigung und Verteilung dieses gesamten Artikels in beliebiger Form ist gestattet, 
-sofern dieser Hinweis erhalten bleibt.
-     </i>
-   </span>
-  </td>
- </tr>
- <tr><td colspan="2" class="hsep"></td>
- </tr>
-</table>
-</body>
-</html>

documentation/upstream-site/de/index.html

@@ -1,147 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8">
- <title></title>
- <link rel="stylesheet" type="text/css" href="../css/dvdisaster.css">
-</head>
-<body>
-
-<!-- Title header -->
-
-<table width="100%" cellpadding="0" border="0">
-  <tr>
-    <td align="left">
-      <span class="fxxl"><b>dvdisaster</b>&nbsp;</span>
-      <i>Version 0.79.5 (stable) / 0.79.6 (unstable)</i>
-    </td>
-    <td align="right">
-    <span class="fxxl">&nbsp;</span>
-    Deutsch &nbsp; <a href="../en/index.html">English</a>
-    </td>
-  </tr>
-  <tr><td colspan="2" class="hsep"></td></tr>
-  <tr><td colspan="2">
-      <table class="navigation" width="100%" cellpadding="0" border="0">
-	<tr>
-	  <td>Unterseiten: &nbsp;&nbsp;&nbsp;
-	    <b>Entwickler-Seite</b> &nbsp;&middot;&nbsp;
-	    <a href="verschiedenes.html">Verschiedenes</a>
-	  </td>
-	  <td align="right"><a href="datenschutz.html">Datenschutz-Erklärung</a> &nbsp;&middot;&nbsp; <a href="impressum.html">Impressum</a></td>
-	</tr>
-      </table>
-  </td></tr>
-  <tr><td colspan="2" class="hsep"></td></tr>
-  <tr><td style="height: 10px"></td></tr>
-</table>
-  
-<!-- Main body --> 
-
-  
-<b>Entwickler-Seite</a></b><p>
-
-Auf dieser Seite finden Sie den neuesten Quellkode
-von <i>dvdisaster</i> für die Betriebssysteme
-FreeBSD, GNU/Linux und NetBSD. Der Inhalt dieser
-Seite richtet sich vorwiegend an die Betreuer
-von Binärpaketen für die genannten Plattformen.
-Typischerweise ist es bequemer, wenn Sie sich
-dvdisaster aus dem Paketsystem Ihres Betriebssystems
-bzw. Ihrer Distribution installieren.
-Natürlich können Sie sich 
-den Quellkode von dvdisaster aber auch selbst
-herunterladen und übersetzen, wenn Sie dies
-lieber möchten.<br>
-
-Diese Seite enthält <i>keine</i> Informationen
-über den Sinn und die Benutzung von dvdisaster.
-Dies ist an anderen Stellen besser beschrieben -
-zum Beispiel in zahlreichen Foren und (in englischer Sprache) im
-<a href="verschiedenes.html#manual">Benutzerhandbuch</a>.
-
-<p>
-
-<a name="download"></a>
-<b>Quellkode herunterladen</b>
-
-<table width="100%">
-<tr>
-  <td>dvdisaster unterstützt die Betriebssysteme <b>FreeBSD</b>, <b>GNU/Linux</b> und <b>NetBSD</b>.
-    Es wird Ihnen 
-    als <a href="http://www.germany.fsfeurope.org/documents/freesoftware.de.html">freie Software</a> 
-    unter der <a href="http://www.gnu.org/licenses/gpl-3.0.txt">GNU General Public License v3</a>  zur 
-    Verfügung gestellt.
-  </td>
-  <td class="w127x" valign="top"><img src="../images/gplv3-127x51.png" alt="GPLv3-Logo" width="127">
-  </td>
-</tr>
-</table>
-<p>
-
-<table>
-  <tr>
-    <td>Aktuelle Version:&nbsp;</td> 
-    <td><a href="../downloads/dvdisaster-0.79.5.tar.bz2">dvdisaster-0.79.5.tar.bz2</a></td>
-    <td>(<a href="../downloads/dvdisaster-0.79.5.tar.bz2.gpg">digitale Unterschrift</a>,
-      MD5-Prüfsumme: ceef990a2239c43314bc6427c6afb181)</td>
-  </tr>
-</table>
-<p>
-
-Die Archive können mit einer <a href="verschiedenes.html#pubkey">digitalen Unterschrift</a> auf 
-ihren Ursprungszustand überprüft werden. In den Archiven gibt die Datei
-<tt>INSTALL</tt> weitere Informationen zum Übersetzen des Programmes.
-
-<p>
-
-Die Unterstützung von OS X und Windows wurde eingestellt.
-Die <a href="verschiedenes.html#windows">letzte veröffentlichte Version 0.72.3 für Windows</a> ist noch verfügbar.
-  
-<p>
-<b>Die Entwickler-Versionen sind zurück!</b><p>
-
-Der ursprüngliche Plan, alle paar Monate eine stabile Version zu veröffentlichen, kann derzeit aus Zeitmangel nicht umgesetzt werden. In der Zwischenzeit werden (unstabile) Entwicklerversionen veröffentlicht, wenn sich die Notwendigkeit für eine kurzfristige Aktualisierung ergibt. Bitte beachten Sie, daß diese Versionen nicht dokumentiert sind. Sie können unvollständige oder fehlerhafte Eigenschaften aufweisen. Sie sollten diese Versionen nur nutzen, wenn Sie eine Funktionalität aus der unten aufgeführten Liste benötigen.<p>
-
-<a href="../downloads/dvdisaster-0.79.6.tar.bz2">dvdisaster-0.79.6.tar.bz2</a></td>
-    <td>(<a href="../downloads/dvdisaster-0.79.6.tar.bz2.gpg">digitale Unterschrift</a>,
-      MD5-Prüfsumme: ceef990a2239c43314bc6427c6afb181)
-
-<ul>
-  <li> Das "Datenträger-Info"-Werkzeug zeigt nun die korrekte Leerkapazität an (vorher wurde immer Null ausgegeben).</li>
-  <li> Unterstützung für BDXL-TL-Datenträger (dreilagig, 100GB).</li>
-  <li> Sektoren-Prüfsummen und Abbild-Prüfsummen werden während des Lesens von
-    Datenträgern zwischengespeichert und beim Erstellen von Fehlerkorrektur-Daten
-    wiederverwendet. Das Erstellen von Fehlerkorrektur-Daten wird dadurch beschleunigt
-    und RS03-Fehlerkorrektur-Daten enthalten die optionale Abbild-Prüfsumme,
-    wenn der Datenträger vorher einmal komplett eingelesen wurde.
-  </li>
-</ul>
-<p>
-
-<p>
-<b>Was ist mit den alten dvdisaster-Seiten passiert?</b><p>
-
-Bitte schauen Sie in das <i>Vorwort zur Version 0.79.5</i> im
-englischen <a href="verschiedenes.html#manual">Benutzerhandbuch</a>.
-
-<!-- Page footer -->
-
-<table width="100%" cellpadding="0" border="0">
- <tr><td colspan="2" style="width:100%; height:10px;"></td></tr>
- <tr><td colspan="2" class="hsep"></td></tr>
- <tr>
-  <td align="center">
-   <span class="fs">
-     <i> Copyright 2004-2017 Carsten Gn&ouml;rlich.<br>
-Die unveränderte Vervielfältigung und Verteilung dieses gesamten Artikels in beliebiger Form ist gestattet, 
-sofern dieser Hinweis erhalten bleibt.
-     </i>
-   </span>
-  </td>
- </tr>
- <tr><td colspan="2" class="hsep"></td>
- </tr>
-</table>
-</body>
-</html>

documentation/upstream-site/de/verschiedenes.html

@@ -1,140 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8">
- <title></title>
- <link rel="stylesheet" type="text/css" href="../css/dvdisaster.css">
-</head>
-<body>
-
-<!-- Title header -->
-
-<table width="100%" cellpadding="0" border="0">
-  <tr>
-    <td align="left">
-      <span class="fxxl"><b>dvdisaster</b>&nbsp;</span>
-      <i>Version 0.79.5 (stable) / 0.79.6 (unstable)</i>
-    </td>
-    <td align="right">
-    <span class="fxxl">&nbsp;</span>
-    Deutsch &nbsp; <a href="../en/misc.html">English</a>
-    </td>
-  </tr>
-  <tr><td colspan="2" class="hsep"></td></tr>
-  <tr><td colspan="2">
-      <table class="navigation" width="100%" cellpadding="0" border="0">
-	<tr>
-	  <td>Unterseiten: &nbsp;&nbsp;&nbsp;
-	    <a href="index.html">Entwickler-Seite</a> &nbsp;&middot;&nbsp;
-	    <b>Verschiedenes</b>
-	  </td>
-	  <td align="right"><a href="datenschutz.html">Datenschutz-Erklärung</a> &nbsp;&middot;&nbsp; <a href="impressum.html">Impressum</a></td>
-	</tr>
-      </table>
-  </td></tr>
-  <tr><td colspan="2" class="hsep"></td></tr>
-  <tr><td style="height: 10px"></td></tr>
-</table>
-  
-<!-- Main body --> 
-
-<a name="pubkey"></a>
-<b>Öffentlicher Schlüssel für die digitale Unterschrift</b><p>
-
-Die herunterladbaren Pakete enthalten
-eine mit <a href="http://www.gnupg.org">GnuPG</a> erstellte 
-digitale Unterschrift, damit Sie nachprüfen können,
-ob sich die Software in ihrem ursprünglichen Zustand befindet.<p>
-
-Ab Version 0.79.5 werden Pakete mit diesem
-<a href="../downloads/pubkey2.asc">4096bit RSA-Schlüssel</a> unterschrieben:
-
-<pre>
-pub   4096R/64F770B2 2015-10-05
-  Schl.-Fingerabdruck = E3AF E703 96CC C0D9 E5D8  381C B0DB CA7D 64F7 70B2
-uid                  dvdisaster (pkg signing key #2)
-sub   4096R/758BCC23 2015-10-05
-</pre>
-
-
-Ältere Versionen (bis zu 0.79.3) wurden mit einem
-<a href="../downloads/pubkey1.asc">1024bit DSA-Schlüssel</a> unterschrieben,
-der noch zum Vergleich hier verfügbar ist.
-
-Sie können den Fingerabdruck der öffentlichen Schlüssel auch direkt von
-den Entwicklern erhalten, indem Sie eine E-Mail 
-an carsten@dvdisaster.org schreiben. Bitte verwenden Sie
-den Betreff "GPG finger print".
-<p>
-
-<b>Benutzerhandbuch</b><p>
-<a name="manual"></a>
-
-Das Benutzerhandbuch zu dvdisaster gibt es - leider aus Zeitgründen nur
-in englischer Sprache - als <a href="../downloads/manual.pdf">PDF-Dokument (manual.pdf)</a>.
-Es erläutert die Benutzung von dvdisaster anhand einiger
-grundlegender Beispiele und enthält weitere Hintergrundinformationen
-zu seiner Funktionsweise.
-Sie brauchen das Handbuch hier nicht herunterzuladen, wenn Sie bereits
-das Quellkode-Archiv haben - dort ist ebenfalls ein Exemplar enthalten.
-<p>
-
-<b>Kodierer-Spezifikation</b><p>
-
-Die Spezifikation der RS01-, RS02- und RS03-Kodierer
-ist als <a href="../downloads/codecs.pdf">PDF-Dokument (codecs.pdf)</a>
-verfügbar.
-
-Dieses Dokument ist zur Diskussion der Kodierer-Implementierung unter
-den Entwicklern vorgesehen. Er erfordert Kenntnisse in Kodierungstheorie
-und ist nicht als Endbenutzer-Dokumentation gedacht.
-
-<table>
-<tr><td>
-<a href="http://pdfreaders.org/"><img src="http://pdfreaders.org/graphics/pdfreaders-lang-neutral.png" alt="pdfreaders.org" /></a></td>
-<td>Programme zum Lesen von PDF-Dokumenten sind bei <a href="http://pdfreaders.org">PDFreaders.org</a> verfügbar.</td>
-</tr>
-</table>
-
-<p>
-<b>Letzte Windows-Version</b><p>
-
-Ein anderer Entwickler hat angefangen, eine Version von dvdisaster direkt für Windows zu
-erstellen, aber es gibt dazu noch nichts anzukündigen. Verwenden Sie
-bis dahin bitte weiterhin die letzte veröffentlichte Version für Windows:
-  
-<table>
-  <tr>
-    <td>Quellkode:&nbsp;</td> 
-    <td><a href="../downloads/dvdisaster-0.72.3.tar.bz2">dvdisaster-0.72.3.tar.bz2</a></td>
-    <td>(<a href="../downloads/dvdisaster-0.72.3.tar.bz2.gpg">Digitale Unterschrift</a>,
-      MD5-Prüfsumme: 4eb09c1aa3cdbc1dafdb075148fb471d)</td>
-  </tr>
-  <tr>
-    <td>Installierbare Binärversion:&nbsp;</td> 
-    <td><a href="../downloads/dvdisaster-0.72.3-setup.exe">dvdisaster-0.72.3-setup.exe</a></td>
-    <td>(<a href="../downloads/dvdisaster-0.72.3-setup.exe.gpg">Digitale Unterschrift</a>,
-      MD5-Prüfsumme: b6861ba1e8de6d91a2da5342a14870e0)</td>
-  </tr>
-</table>
-
-<!-- Page footer -->
-
-<table width="100%" cellpadding="0" border="0">
- <tr><td colspan="2" style="width:100%; height:10px;"></td></tr>
- <tr><td colspan="2" class="hsep"></td></tr>
- <tr>
-  <td align="center">
-   <span class="fs">
-     <i> Copyright 2004-2017 Carsten Gn&ouml;rlich.<br>
-Die unveränderte Vervielfältigung und Verteilung dieses gesamten Artikels in beliebiger Form ist gestattet, 
-sofern dieser Hinweis erhalten bleibt.
-     </i>
-   </span>
-  </td>
- </tr>
- <tr><td colspan="2" class="hsep"></td>
- </tr>
-</table>
-</body>
-</html>

documentation/upstream-site/downloads/pubkey1.asc

@@ -1,24 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-mQGiBD9GYJcRBACXa6CzZ0WPqUvit1d7LvnSOqLDxYQiiphnzjQc+ssJvScNxv9+
-ThELKXHxaKfDpL9/C4+5qh1pfrsEEpuQ7m+RfXFqz5UPZITgza5Ko/5WPhhVRxkh
-8b8ux7DIeFlbgmd5YSFPoYIwGWCAtI5OiUC6qa149gAq7k0vtgb+hbxn2wCg0lTu
-XGNjX7qMNggbnx3aBVVd9SMD/RYWIr2c66w6Kt/EYLLgYGqgZL9MkmocuUoJVgiI
-Y2pi3SPbIvX3enk1OIRBCFbweEgXiVw+FWu6aK09eZrJcDv2Uns4ecTvzz1d83RH
-gssV7ulB6P5mU3u6NT39CHW6fJ5Xi1HPkw380+y3dbaRxh/1htmk5Ao0DmDGRohL
-vzgIA/9P/bdqh0WG0j4qY+8pcsNn0/ymiJXPZzvyr2cEc56AaHgLAVZHMUyE3Rd9
-9rSZjVS+x/oGbkzVOd8IySUSRx7f2Sxve1sxoaNlwdqcE0vq16PH1iMBQ6KJAvUA
-NAM4QZhAI7Lav9yB/tXblGrHHjll+fwFB/9t6G0hO9JoJDaEgbQmQ2Fyc3RlbiBH
-bsO2cmxpY2ggKHBrZyBzaWduaW5nIGtleSAjMSmIXgQTEQIAHgUCQCvkqQIbAwYL
-CQgHAwIDFQIDAxYCAQIeAQIXgAAKCRBaWQ7+9fbEbGfsAJ9NrkdlRobMhtWpAyeW
-wPUe8XHzsACfYbMooS0D/UmRGo7wW7rBnrVqLxy5AQ0EP0ZgmBAEAKJos9WBWgw1
-sGFFM/1eKEzZqGYMt8qk2r/djPyZYEIzqT47aR7P9gPIXDTplOmBgL43hU8MlE9K
-Q92s4RVP/x/OvMWF04vSO3vBEmeR3HncpbIk4AP17MZGuqEGtyAe1e5hcGiho1CL
-/6fSanYydC2iciKbfyyfzL9oISHedad7AAMFA/4wtrdqwTI2p05NAGxRA2r4egYI
-m7x+ixyYuHGkzZzHMdos5zDg/dzNRnarib98JgAkZR+EVT6K0Ez6ykz57oteCt6f
-jyGjOwI9bUyOFa+LyGJ+QRaeVozhqLLu/b4wgKCuBcKNt2ebpKFHi9JKiGE9hOJz
-4nanjCbtihUJaf1DLIhJBBgRAgAJBQI/RmCYAhsMAAoJEFpZDv719sRsbk4An2JZ
-q/8GBvugzgfu5AxacsuiZzfgAKCwzLAuoUTw/Sz6bYaAUfec362gFw==
-=Sidz
------END PGP PUBLIC KEY BLOCK-----

documentation/upstream-site/downloads/pubkey2.asc

@@ -1,53 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-mQINBFYS0XkBEACxsIQ1dI0k1TiybBztU6BC3DeQsDGC9TeaGBgYDo+62B8U5uiJ
-AD9ofBXglj0/DOweAIoLdcVsvFzU0sxk4tUnb84plk09qG+UfU2227DWeKTP3YPv
-E8A6uWopr6Yoc8WGG9mKl9L1CCiqQmNB4L4Um2/yDPrhtN3TxzpMLBoNUo/f271Q
-yLxQZMEsUDTZq7JxbEQ9hLbBn69zIptsZHyNJwCerqXqhzQcB11BVqZyLrRC+0ZT
-eUtO1o10Y/EAEi86ivi1upLsgVi5u2LcP9ICIhTVv6MQ+turhThFOIcEvbw/15Hp
-4Vlb0yZlBx2j4Hr4tDSrWeQ1lmBNA1qhrLkPOIQv+scXhcyzY5nKIjRDKYS1v8OM
-uMhfVakK/YS+flN5nyS4Ku0x99sae75+PArMjbLNfP738Zw4ywC4i+i958SEIcky
-4Bia+kyTCPRZWZ5BJe3+GAPDdI1XntS0D1uXPiwi8u91jg1cAEChwjwe2pr0RG+h
-8ft5BTezJyAeZ9haU8OyrW5GZNddhyBH4QxdRYvMTdmQIbjxNuTYGpBXl4qgTqKn
-A7Gxbr24hgdUHKIe//AlDQ41VbBTdyBmgyORGCL+uaSpDerADPXh+bwE2vQsKs13
-+HcVldLBJmL9tYeRZvpvR/vwFBvfkrgAN8+NdPnSzwvLI0JMrL50DOhapwARAQAB
-tB9kdmRpc2FzdGVyIChwa2cgc2lnbmluZyBrZXkgIzIpiQI4BBMBAgAiBQJWEtF5
-AhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCw28p9ZPdwsivVD/4wiomj
-IFNUG0lb4sIvXHZR2sv0rVz1eN74B+Ngefp3viZvjvmXji2cbzPhTsoAq4ys5/nD
-m9fLnm+mG2TfLKTqXBNRDeEDmknK0aXlFVbdUfgeExvU9Tj1giOORTvTiNPdJpkF
-qKMrjvtB4t2sHuuL/SNwQAWlWfDUuK52yf1SAZasdFPTAvAuzo+lqfYbi5tnjIY/
-GkR9e3ZjMEaWvxc0N5CJg7ibKpuX476eo+04oKkNvSbyE7Lpcho4AHy6e4UoJ9e+
-UBL3o84MtChwrlP5HmMPan1hIL5iyswDUrxUfL36GqAEcAM8tIbZ6A6CfQT+FgnI
-e/E1dm3FWEje8F7uD2xkCGRBYTN8BG5+UMTF9MaQGU3kxBMPt8xvHmCNZHR6QrdL
-+vysa+02QmSM1jZz4J37yctM69WY1x3JDC+HGHMxCX3G+BrDntLG3yQkox1nBi2l
-8JiKTdoX7LhRn1xCijIpYdbszMao0lN/XEiOgx2eygG9a3fQDOqR/yi9tTqmKQM4
-H/il88tkdsaioWXspWEhrS+8MhiUdr8yz3LA9+DawddnW8ZbTee2R4ARMlKhfXBE
-kvXO2L37Ub2sX97S9qbKkwaYIs2PHn7NFNRB6OP8Oz0scMuritvUZrNfNjaGba3e
-YNgR36NFvroM3R2a+Yr0zjbY+rqjJSdNSfcsxIhGBBARAgAGBQJWEtXYAAoJEFpZ
-Dv719sRsj6kAoL8AIsw7wF1F/LBHOZc/56GmYlAfAJ4nYQAjhx0Hh3fLpsjxtoH7
-oIuwCLkCDQRWEtF5ARAA3KvEpeB7vbCxolIlzxuF/RHJ770GUYSfTVbYIKSl4Hby
-wrDak7uXlDWIJ/u1lunu5+albUEHIaduYolrzaTG6A/sslXHgk8RUxZonzAw2/8C
-0fQCBAPjs2nlwzt61g75/EPJlESocapdRi97EleGmGGK5L6N2CyTX8pjj1DkXwiW
-X95EOcgWRoLXpf/bpThqFCsRjoJfHO7zcA0b5iIR7LQenMG/3AeGFRr1Oh2UzAL6
-0MuPypu8NBv3IUXZ6mXdFTNM4bQc/RlmVDoB8B8mz4M1IL0fP98LN+b9ZfUUDz1z
-k9W8H+OCvfdOVj1srDq+uhaSwDC6jDu7wTaFlaJaPBoqCXCk7xGbVxKdZot6oN5Z
-rAvMMnD0Jc+QX+MKSodMk5LQRFB+WGI82IwgeS7kqQX2Bt0w7d4xL/3AKTNgQQAG
-zXRi7dzXR//diKEmESSmaRccVpLZYtR4PdUuY6ZXyayEvZCosV6B7P+lV842lN9Q
-/KgrZjH09SYKK8pzqRPoAIvPJNT4fP8FeTztnKu9gfS0Zs2MnkKjEK85E8OMSidp
-ISqn0xgHeuldMPL7gGxJKj95BF4jFUs4fQa8nD1jnnUbKdAsGd5ujpEAjAfV+kkG
-ZPUyVrJokhGlCLLt2dG4PrgZ4tNXdEQwVGNskHYjs6YU+CGYjzfopvrUPast+cUA
-EQEAAYkCHwQYAQIACQUCVhLReQIbDAAKCRCw28p9ZPdwsrmqD/sFsulD6nl5DRzn
-ofkqBJwwl6zdtNN9OKsEi8UKc10iuq+ZvynWFbcARqW9sgbBCoCM5KuA5zMIQ0hv
-rvlb+HOt8v7DA2D0d/IPU1BPnxoEuMDq5g+a3MYzmP+4Wmp8r6NNAW0ArWhazQsN
-dIhAVv4ItUCos7+S7q8srsflpEVG78/fC4Fw4sRjAaCd1NsP6D3vHwENtbuoQaT6
-3kyfPK+r6EADTxmeFe7anovQo6MirRCnLoo3NdPVfQlgXkdL3wiBpwm7W/PYY+9Z
-6HIfE2AIBs+C5SdxYPR+tVz3+3QC9998egxTRnJMaKkDQ+nG/ROSVpCqXwhzob6H
-lrKhoe7H7GKVZyl/IVllpUQHKi5C03S8JQxpaJoB85/C5ZlcMtb0e1YUYeVhTKWI
-REFsx5FlxXcJh5CLVplZKxfn0oiIgnyKHtCOeNcXP2mOYClN8RmhW+/Z198bTmzM
-rB2jq7a3xbLGWKJqfgfZ6EPwCEu/jZTBSQgyssrrGahyyOIDadEcyfYV+r5pUm1+
-+1YxSe0/hZ89RjGAIneWmo6sDLwPd44GLKAAb/E/yS/320bu031426gU8Zdw7bK1
-dVNVQxWOpRc/RTRjmVjrO9NIN+7DSNOFnvep13/48UEDSFXkNnh+VgxGpvpOouw2
-xUBVNZuhjPr589pvAEQFUyxCTI0uwQ==
-=sd4U
------END PGP PUBLIC KEY BLOCK-----

documentation/upstream-site/en/imprint.html

@@ -1,87 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8">
- <title></title>
- <link rel="stylesheet" type="text/css" href="../css/dvdisaster.css">
-</head>
-<body>
-
-<!-- Title header -->
-
-<table width="100%" cellpadding="0" border="0">
-  <tr>
-    <td align="left">
-      <span class="fxxl"><b>dvdisaster</b>&nbsp;</span>
-      <i>Version 0.79.5 (stable) / 0.79.6 (unstable)</i>
-    </td>
-    <td align="right">
-    <span class="fxxl">&nbsp;</span>
-    <a href="../de/impressum.html">Deutsch</a> &nbsp; English
-    </td>
-  </tr>
-  <tr><td colspan="2" class="hsep"></td></tr>
-  <tr><td colspan="2">
-      <table class="navigation" width="100%" cellpadding="0" border="0">
-	<tr>
-	  <td>Navigation: &nbsp;&nbsp;&nbsp;
-	    <a href="index.html">Developer site</a> &nbsp;&middot;&nbsp;
-	    <a href="misc.html">Miscellaneous</a>
-	  </td>
-	  <td align="right">
-	    <a href="privacy.html">Privacy policy</a> &nbsp;&middot;&nbsp;
-	    <b>Contact information</b>
-	  </td>
-	</tr>
-      </table>
-  </td></tr>
-  <tr><td colspan="2" class="hsep"></td></tr>
-  <tr><td style="height: 10px"></td></tr>
-</table>
-  
-<!-- Main body --> 
-
-<b>Contact information</b><p>
-
-Carsten Gnörlich <br>
-Karl-von-Hahn-Str. 125 <br>
-72250 Freudenstadt / Germany<br>
-Tel.: +49 172 566 1442
-
-<p>
-
-E-Mail: carsten@dvdisaster.org<br>
-Internet: www.dvdisaster.org
-
-<p>
-
-Responsible for the website content: <br>
-Carsten Gnörlich (see above for address).
-
-<p>
-
-This notice covers the web sites under the domains<br>
-<a href="http://dvdisaster.com">dvdisaster.com</a>, &nbsp;
-<a href="http://dvdisaster.de">dvdisaster.de</a>, &nbsp;
-<a href="https://web.archive.org/web/20180428070843/http://dvdisaster.net">dvdisaster.net</a>, &nbsp;
-<a href="http://dvdisaster.org">dvdisaster.org</a>.<br>
-    
-<!-- Page footer -->
-
-<table width="100%" cellpadding="0" border="0">
- <tr><td colspan="2" style="width:100%; height:10px;"></td></tr>
- <tr><td colspan="2" class="hsep"></td></tr>
- <tr>
-  <td align="center">
-   <span class="fs">
-     <i> Copyright 2004-2017 Carsten Gn&ouml;rlich.<br>
-Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. 
-     </i>
-   </span>
-  </td>
- </tr>
- <tr><td colspan="2" class="hsep"></td>
- </tr>
-</table>
-</body>
-</html>

documentation/upstream-site/en/index.html

@@ -1,139 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8">
- <title></title>
- <link rel="stylesheet" type="text/css" href="../css/dvdisaster.css">
-</head>
-<body>
-
-<!-- Title header -->
-
-<table width="100%" cellpadding="0" border="0">
-  <tr>
-    <td align="left">
-      <span class="fxxl"><b>dvdisaster</b>&nbsp;</span>
-      <i>Version 0.79.5 (stable) / 0.79.6 (unstable)</i>
-    </td>
-    <td align="right">
-    <span class="fxxl">&nbsp;</span>
-    <a href="../de/index.html">Deutsch</a> &nbsp; English
-    </td>
-  </tr>
-  <tr><td colspan="2" class="hsep"></td></tr>
-  <tr><td colspan="2">
-      <table class="navigation" width="100%" cellpadding="0" border="0">
-	<tr>
-	  <td>Navigation: &nbsp;&nbsp;&nbsp;
-	    <b>Developer site</b> &nbsp;&middot;&nbsp;
-	    <a href="misc.html">Miscellaneous</a>
-	  </td>
-	  <td align="right">
-	    <a href="privacy.html">Privacy policy</a> &nbsp;&middot;&nbsp;
-	    <a href="imprint.html">Contact information</a>
-	  </td>
-	</tr>
-      </table>
-  </td></tr>
-  <tr><td colspan="2" class="hsep"></td></tr>
-  <tr><td style="height: 10px"></td></tr>
-</table>
-  
-<!-- Main body --> 
-
-<b>Developer site</b><p>
-
-    This site provides the latest source code release of dvdisaster for the
-    FreeBSD, GNU/Linux and NetBSD operating systems. It is mostly aimed at
-    maintainers of binary packages for the beforementioned platforms.
-    End users might find it more convenient to install dvdisaster from the
-    package system of their operating system bundle or distribution.
-    But if you prefer to download and compile the source package on your own,
-    you're welcome, too.<br>
-    
-    This site does <i>not</i> provide information on the purpose and usage
-    of dvdisaster. This is better described at other places, e.g. 
-    in the <a href="misc.html#manual">user manual</a> and numerous online
-    forums.
-<p>
-
-<a name="download"></a>
-<b>Download the source code</b>
-
-<table width="100%">
-<tr>
-  <td>dvdisaster is available for the <b>FreeBSD</b>, <b>GNU/Linux</b> und <b>NetBSD</b>
-      operating systems.
-    It is provided as
-    <a href="http://fsfe.org/about/basics/freesoftware.en.html">free software</a> 
-    under the <a href="http://www.gnu.org/licenses/gpl-3.0.txt">GNU General Public License v3</a>.   </td>
-  <td class="w127x" valign="top"><img src="../images/gplv3-127x51.png" alt="GPLv3-Logo" width="127">
-  </td>
-</tr>
-</table>
-<p>
-
-<table>
-  <tr>
-    <td>Current stable version:&nbsp;</td> 
-    <td><a href="../downloads/dvdisaster-0.79.5.tar.bz2">dvdisaster-0.79.5.tar.bz2</a></td>
-    <td>(<a href="../downloads/dvdisaster-0.79.5.tar.bz2.gpg">digital signature</a>,
-      MD5 sum: ceef990a2239c43314bc6427c6afb181)</td>
-  </tr>
-</table>
-<p>
-
-A <a href="misc.html#pubkey">digital signature</a> is provided for
-verification that the packages are in their original state. The archives
-contain a file <tt>INSTALL</tt> with further instructions for building dvdisaster.
-
-<p>
-  OS X and Windows are no longer supported.
-  The <a href="misc.html#windows">last published version for Windows (0.72.3)</a> is still available. 
-
-<p>
-<b>The developer versions are back!</b><p>
-
-The original plan of publishing stable versions every few months did not work out due to continued lack of time. In the mean time, developer (unstable) versions are published whenever the need arises for a current update. Please be aware that developer versions are undocumented and may contain unfinished or otherwise defective functionality. You should only use them if you need some of the features detailed in the list below.<p>
-
-
-<a href="../downloads/dvdisaster-0.79.6.tar.bz2">dvdisaster-0.79.6.tar.bz2</a></td>
-    <td>(<a href="../downloads/dvdisaster-0.79.6.tar.bz2.gpg">digital signature</a>,
-      MD5 sum: ceef990a2239c43314bc6427c6afb181)
-
-<ul>
-  <li> The "medium info" tool will now correctly show the blank capacity (was previously always shown as zero)</li>
-  <li> added support for BDXL-TL (triple layer, 100GB) media</li>
-  <li> Sector CRC sums and the image MD5 sums are collected during
-    reading the medium and can be re-used by the ecc data creation
-    process. Speeds up ecc generation and enables RS03 image
-    checksums when generating ecc data was preceeded by a read.
-  </li>
-</ul>
-
-<p>
-<b>What happened to the old dvdisaster site?</b><p>
-
-  Please see the <i>Preface for version 0.79.5</i> in the <a href="misc.html#manual">user manual</a>.
-    
-    
-    
-<!-- Page footer -->
-
-<table width="100%" cellpadding="0" border="0">
- <tr><td colspan="2" style="width:100%; height:10px;"></td></tr>
- <tr><td colspan="2" class="hsep"></td></tr>
- <tr>
-  <td align="center">
-   <span class="fs">
-     <i> Copyright 2004-2017 Carsten Gn&ouml;rlich.<br>
-Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. 
-     </i>
-   </span>
-  </td>
- </tr>
- <tr><td colspan="2" class="hsep"></td>
- </tr>
-</table>
-</body>
-</html>

documentation/upstream-site/en/misc.html

@@ -1,138 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8">
- <title></title>
- <link rel="stylesheet" type="text/css" href="../css/dvdisaster.css">
-</head>
-<body>
-
-<!-- Title header -->
-
-<table width="100%" cellpadding="0" border="0">
-  <tr>
-    <td align="left">
-      <span class="fxxl"><b>dvdisaster</b>&nbsp;</span>
-      <i>Version 0.79.5 (stable) / 0.79.6 (unstable)</i>
-    </td>
-    <td align="right">
-    <span class="fxxl">&nbsp;</span>
-    <a href="../de/verschiedenes.html">Deutsch</a> &nbsp; English
-    </td>
-  </tr>
-  <tr><td colspan="2" class="hsep"></td></tr>
-  <tr><td colspan="2">
-      <table class="navigation" width="100%" cellpadding="0" border="0">
-	<tr>
-	  <td>Navigation: &nbsp;&nbsp;&nbsp;
-	    <a href="index.html">Developer site</a> &nbsp;&middot;&nbsp;
-	    <b>Miscellaneous</b>
-	  </td>
-	  <td align="right">
-	    <a href="privacy.html">Privacy policy</a> &nbsp;&middot;&nbsp;
-	    <a href="imprint.html">Contact information</a>
-	  </td>
-	</tr>
-      </table>
-  </td></tr>
-  <tr><td colspan="2" class="hsep"></td></tr>
-  <tr><td style="height: 10px"></td></tr>
-</table>
-  
-<!-- Main body --> 
-
-<b>Public key for the digital signature</b><p>
-
-The downloadable dvdisaster packages have been digitally signed using
-<a href="http://www.gnupg.org">GnuPG</a> so that you can verify
-that the software is in its original state.<p>
-
-Starting with version 0.79.5, releases are signed with this
-<a href="../downloads/pubkey2.asc">4096bit RSA key</a>:
-
-<pre>
-pub   4096R/64F770B2 2015-10-05
-      Key fingerprint = E3AF E703 96CC C0D9 E5D8  381C B0DB CA7D 64F7 70B2
-uid                  dvdisaster (pkg signing key #2)
-sub   4096R/758BCC23 2015-10-05
-
-</pre>
-
-
-The <a href="../downloads/pubkey1.asc">1024bit DSA key</a> used to sign releases up to version 0.79.3 is
-still available for reference.
-Feel free to send an email to carsten@dvdisaster.org to obtain 
-any of these fingerprints directly from the developers. 
-Please include "GPG finger print" in the subject line.
-
-<p>
-
-<b>User's manual</b><p>
-<a name="manual"></a>
-
-
-The user manual is provided as a <a href="../downloads/manual.pdf">PDF document (manual.pdf)</a>.
-It contains several basic examples of using dvdisaster and some background
-information on its way of working. 
-You do not need to download the manual if you already have the
-source code archive - a copy of the manual is contained there.
-<p>
-
-<b>Codec specification</b><p>
-
-The specification of the RS01, RS02 and RS03 codec
-is available as a <a href="../downloads/codecs.pdf">PDF document (codecs.pdf)</a>.
-
-This document is meant to discuss the codec implementation among developers.
-It requires knowledge in the area of coding theory and is not meant as end
-user documentation.
-
-<table>
-<tr><td>
-<a href="http://pdfreaders.org/"><img src="http://pdfreaders.org/graphics/pdfreaders-lang-neutral.png" alt="pdfreaders.org" /></a></td>
-<td>Software for reading the PDF document is available at <a href="http://pdfreaders.org">PDFreaders.org</a>.</td>
-</tr>
-</table>
-
-<p>
-<b>Last Windows release</b><p>
-<a name="windows"></a>
-
-A native Windows fork of dvdisaster will be started soon by another developer,
-but there is nothing to announce yet.
-In the mean time, please continue using the last published version for Windows (0.72.3):
-  
-<table>
-  <tr>
-    <td>Source code:&nbsp;</td> 
-    <td><a href="../downloads/dvdisaster-0.72.3.tar.bz2">dvdisaster-0.72.3.tar.bz2</a></td>
-    <td>(<a href="../downloads/dvdisaster-0.72.3.tar.bz2.gpg">digital signature</a>,
-      MD5 checksum: 4eb09c1aa3cdbc1dafdb075148fb471d)</td>
-  </tr>
-  <tr>
-    <td>Binary installer:&nbsp;</td> 
-    <td><a href="../downloads/dvdisaster-0.72.3-setup.exe">dvdisaster-0.72.3-setup.exe</a></td>
-    <td>(<a href="../downloads/dvdisaster-0.72.3-setup.exe.gpg">digital signature</a>,
-      MD5 checksum: b6861ba1e8de6d91a2da5342a14870e0)</td>
-  </tr>
-</table>
-
-<!-- Page footer -->
-
-<table width="100%" cellpadding="0" border="0">
- <tr><td colspan="2" style="width:100%; height:10px;"></td></tr>
- <tr><td colspan="2" class="hsep"></td></tr>
- <tr>
-  <td align="center">
-   <span class="fs">
-     <i> Copyright 2004-2017 Carsten Gn&ouml;rlich.<br>
-Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. 
-     </i>
-   </span>
-  </td>
- </tr>
- <tr><td colspan="2" class="hsep"></td>
- </tr>
-</table>
-</body>
-</html>

documentation/upstream-site/en/privacy.html

@@ -1,102 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8">
- <title></title>
- <link rel="stylesheet" type="text/css" href="../css/dvdisaster.css">
-</head>
-<body>
-
-<!-- Title header -->
-
-<table width="100%" cellpadding="0" border="0">
-  <tr>
-    <td align="left">
-      <span class="fxxl"><b>dvdisaster</b>&nbsp;</span>
-      <i>Version 0.79.5 (stable) / 0.79.6 (unstable)</i>
-    </td>
-    <td align="right">
-    <span class="fxxl">&nbsp;</span>
-    <a href="../de/datenschutz.html">Deutsch</a> &nbsp; English
-    </td>
-  </tr>
-  <tr><td colspan="2" class="hsep"></td></tr>
-  <tr><td colspan="2">
-      <table class="navigation" width="100%" cellpadding="0" border="0">
-	<tr>
-	  <td>Navigation: &nbsp;&nbsp;&nbsp;
-	    <a href="index.html">Developer site</a> &nbsp;&middot;&nbsp;
-	    <a href="misc.html">Miscellaneous</a>
-	  </td>
-	  <td align="right">
-	    <b>Privacy policy</b> &nbsp;&middot;&nbsp;
-	    <a href="imprint.html">Contact information</a>
-	  </td>
-	</tr>
-      </table>
-  </td></tr>
-  <tr><td colspan="2" class="hsep"></td></tr>
-  <tr><td style="height: 10px"></td></tr>
-</table>
-  
-<!-- Main body --> 
-
-<b>Privacy statement for the web sites</b><p>
-
-dvdisaster.com, &nbsp; 
-dvdisaster.de, &nbsp;
-dvdisaster.net, &nbsp;
-dvdisaster.org
-
-<p>
-
-The dvdisaster project (<a href="imprint.html">see the contact page for representatives</a>)
-provides its internet sites to you without requiring a registration or entering personal data.
-
-<p>
-
-<b>Server log files</b><p>
-
-The servers of this internet site create no logs about your visit.
-    
-<p>
-
-<b>Cookies</b><p>
-
-This internet site does not use cookies.
-
-<p>
-
-<b>Links to other internet sites</b><p>
-
-Our internet pages contain links to other internet sites.
-The dvdisaster project has no control over their publishers,
-and whether they follow our privacy policy.
-
-<p>
-
-<b>Further development of these internet pages</b><p>
-
-Further development of these internet pages may require our privacy policy
-to be changed. Please revisit this policy statement occasionally and watch for
-change notices. 
-    
-<!-- Page footer -->
-
-<table width="100%" cellpadding="0" border="0">
- <tr><td colspan="2" style="width:100%; height:10px;"></td></tr>
- <tr><td colspan="2" class="hsep"></td></tr>
- <tr>
-  <td align="center">
-   <span class="fs">
-     <i> Copyright 2004-2017 Carsten Gn&ouml;rlich.<br>
-Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved. 
-     </i>
-   </span>
-  </td>
- </tr>
- <tr><td colspan="2" class="hsep"></td>
- </tr>
-</table>
-</body>
-</html>

fingerprints.md5

@@ -1,83 +1,83 @@
-b064d001e5e4ed8221eb9f10d784cf45 *dvdisaster.h
-79abb986b900ec06a73256876ba0d65c *galois-inlines.h
-14eb94f981903fcffe2ccb33aa2cb9db *md5.h
-f2d723717ca5f450ee8cc0b556f5506a *read-linear.h
-100127beaecc24b28b2b80d76bbf68c8 *rs01-includes.h
-5b39a23de01c988d562d70ed68682ab7 *rs02-includes.h
-4407ce43eae55b19409be9980432c94f *rs03-includes.h
-2a5980c706c67bec479e4532ab9a7093 *scsi-layer.h
-c779a2908542c6a519ed7cdfc4e5e073 *udf.h
-8f86a75f83a3bc9b6ce54cce037b3c75 *bitmap.c
-5230bd572fc8ef1857063c885c00463a *build.c
-7b59033ebffd6d8230efaf6834b2f942 *cacheprobe.c
-bfb6d7ed2a921ce18dc0339774f72f41 *closure.c
-e5bd212395758ae0b7e97d70c7a2df55 *crc32.c
-7f5951182421a0366782b191a0b4ba82 *crcbuf.c
-abb7c9decfd43935c943bc0dd1bab0d5 *curve.c
-f96a3e006fc5d1c5d181e5056377c9ce *debug.c
-6f8843d1cccc55506771ab02168b2df3 *ds-marker.c
-19d0f85d035115f3bd8d4472e6379058 *dvdisaster.c
-1c8136affed485adaf60e7904d9930a4 *ecc-rs01.c
-7b301352a60c18c25f84c8cc7a36fd48 *ecc-rs02.c
-91aa71f03dc9dade2e97dc59d7ec38f0 *ecc-rs03.c
-39900d26ddcbb7c7e2a9198de14bace1 *endian.c
-3f6e9dffb9de733dcccc916ca38292ca *galois.c
-abc8a8d55248eab5416c45104a033171 *help-dialogs.c
-547bf9a9d005419a0ed601317aeb4e14 *heuristic-lec.c
-746666ade12c2db41ce9af6f55e4c13c *icon-factory.c
-b3db603f77fd2735a6e8b1c568f7bdac *image.c
-fe9de426f96e6d206d1482a24f589253 *large-io.c
-abed1a50b9751387dc1e3cbc84a61fba *l-ec.c
-6960647dc7fc5ce8a2727326946aaff1 *logfile.c
-92e81646ef4e8618ded5d82db6a6163a *maintenance.c
-3c3eebc43fc7aff3865022207e06153b *main-window.c
-913554f7e994e212f6a52b769eef24bb *md5.c
-8f0acf2f7d98a55d05a4721d97741c7c *medium-info.c
-ce145372a25e0fb96070d460da7bdbb4 *memtrack.c
-66cdf82b59fd973e3060d163b6887a20 *menubar.c
-5006b2db93b210be3fb630e8d9463239 *method.c
-17183bad35db217e2c352178844ceda3 *method-link.c
-2af6685017c247de7458e9c4d39b6ed5 *misc.c
-6523662e8e5aa2daf38a7e8c07ce1180 *preferences.c
-5e7b077020e063951cc72ea57f5f046a *print-sense.c
-cdde449dd2a8f64b560ff18a36f86234 *random.c
-28f42d264cd18bb2e0ccdd8e15a0172e *raw-editor.c
-1d416f611a175ba15be27f7f5686dd98 *raw-sector-cache.c
-7f281312b3a65666f7eebaadb62e7f6e *read-adaptive.c
-ccdc572bb24d20ae6fb53f360318b492 *read-adaptive-window.c
-af7a757cad586d3766a3eaad382c6737 *read-linear.c
-47dc58effd96f2b23182a4595ca36171 *read-linear-window.c
-edc0e564573d595c1196c4dc0e70e659 *recover-raw.c
-ea4d6894e717d4957cde686f88d7bdfd *rs01-common.c
-aa9d409ee4eeaa7ba92d731cf32ee727 *rs01-create.c
-ab15d7470a2fe950ebb33134018f044f *rs01-fix.c
-cb3722894665baf9c4ff4c26ff79737b *rs01-verify.c
-5cdecc33da1579733f0545944c4069ab *rs01-window.c
-b33a0982df485b4e52e56fc1c61285ae *rs02-common.c
-a1025fcc9455219937bae5bfadf0abf5 *rs02-create.c
-f466c8296a37ea88b64aec9c870d6d75 *rs02-fix.c
-369ec37d67674ffd2627f0373a566f0c *rs02-recognize.c
-8cc283e60a73493ac6ba60a2f4af1754 *rs02-verify.c
-eccac3ed74b32508b27de0e0d363c6b1 *rs02-window.c
-9a9b966171f1b375cf3381b545a1c6d4 *rs03-common.c
-2502514702687a2a252feace096d20f4 *rs03-create.c
-19676ef95e635206c19dfe12b957e4b2 *rs03-fix.c
-b012df78d2c546c87f6dd75769515409 *rs03-preferences.c
-7d6101e6a95aeb45d6cd03ffe8891b96 *rs03-recognize.c
-b7a6a6c64b4034380c581a5499940db4 *rs03-verify.c
-1d2b071943c121bf0c47a2e047317262 *rs03-window.c
-a2e1e28a609af85d9b83f01339b33a62 *rs-decoder.c
-3882a92849cd23e64c81262be6e52650 *rs-encoder-altivec.c
-1fc6cad3af2461e7974bf49e8f1bf5e9 *rs-encoder.c
-f7f3e2708f0c389ed53c0f1083567a55 *rs-encoder-sse2.c
-2e099a3d88f25f81420b96fe9bd62f44 *scsi-freebsd.c
-cd58a45387267fe0728f439d7bb2045d *scsi-layer.c
-b1b6bd57433eedab3a4f35389a182d14 *scsi-linux.c
-7064327dc15a2d88e5375176d4c64132 *scsi-netbsd.c
-3c0e100cdd499b1c23ac5e12b1fd6694 *scsi-simulated.c
-be42d574e6340845d984c21dc902af1a *scsi-unknown.c
-85aa8093f41c36ce791363e94f488dec *show-manual.c
-6099911dd508701b0b8b5d09105faf95 *smart-lec.c
-10f3e2b054fe3c1ac69c738b97f1beaa *spiral.c
-dec5fbde631058d48866cc1d77446d37 *udf.c
-6741fc5457e9c2026451403f2d45096c *welcome-window.c
+b064d001e5e4ed8221eb9f10d784cf45 *src/dvdisaster.h
+79abb986b900ec06a73256876ba0d65c *src/galois-inlines.h
+14eb94f981903fcffe2ccb33aa2cb9db *src/md5.h
+f2d723717ca5f450ee8cc0b556f5506a *src/read-linear.h
+100127beaecc24b28b2b80d76bbf68c8 *src/rs01-includes.h
+5b39a23de01c988d562d70ed68682ab7 *src/rs02-includes.h
+4407ce43eae55b19409be9980432c94f *src/rs03-includes.h
+2a5980c706c67bec479e4532ab9a7093 *src/scsi-layer.h
+c779a2908542c6a519ed7cdfc4e5e073 *src/udf.h
+8f86a75f83a3bc9b6ce54cce037b3c75 *src/bitmap.c
+5230bd572fc8ef1857063c885c00463a *src/build.c
+7b59033ebffd6d8230efaf6834b2f942 *src/cacheprobe.c
+bfb6d7ed2a921ce18dc0339774f72f41 *src/closure.c
+e5bd212395758ae0b7e97d70c7a2df55 *src/crc32.c
+7f5951182421a0366782b191a0b4ba82 *src/crcbuf.c
+abb7c9decfd43935c943bc0dd1bab0d5 *src/curve.c
+f96a3e006fc5d1c5d181e5056377c9ce *src/debug.c
+6f8843d1cccc55506771ab02168b2df3 *src/ds-marker.c
+19d0f85d035115f3bd8d4472e6379058 *src/dvdisaster.c
+1c8136affed485adaf60e7904d9930a4 *src/ecc-rs01.c
+7b301352a60c18c25f84c8cc7a36fd48 *src/ecc-rs02.c
+91aa71f03dc9dade2e97dc59d7ec38f0 *src/ecc-rs03.c
+39900d26ddcbb7c7e2a9198de14bace1 *src/endian.c
+3f6e9dffb9de733dcccc916ca38292ca *src/galois.c
+abc8a8d55248eab5416c45104a033171 *src/help-dialogs.c
+547bf9a9d005419a0ed601317aeb4e14 *src/heuristic-lec.c
+746666ade12c2db41ce9af6f55e4c13c *src/icon-factory.c
+b3db603f77fd2735a6e8b1c568f7bdac *src/image.c
+fe9de426f96e6d206d1482a24f589253 *src/large-io.c
+abed1a50b9751387dc1e3cbc84a61fba *src/l-ec.c
+6960647dc7fc5ce8a2727326946aaff1 *src/logfile.c
+92e81646ef4e8618ded5d82db6a6163a *src/maintenance.c
+3c3eebc43fc7aff3865022207e06153b *src/main-window.c
+913554f7e994e212f6a52b769eef24bb *src/md5.c
+8f0acf2f7d98a55d05a4721d97741c7c *src/medium-info.c
+ce145372a25e0fb96070d460da7bdbb4 *src/memtrack.c
+66cdf82b59fd973e3060d163b6887a20 *src/menubar.c
+5006b2db93b210be3fb630e8d9463239 *src/method.c
+17183bad35db217e2c352178844ceda3 *src/method-link.c
+2af6685017c247de7458e9c4d39b6ed5 *src/misc.c
+6523662e8e5aa2daf38a7e8c07ce1180 *src/preferences.c
+5e7b077020e063951cc72ea57f5f046a *src/print-sense.c
+cdde449dd2a8f64b560ff18a36f86234 *src/random.c
+28f42d264cd18bb2e0ccdd8e15a0172e *src/raw-editor.c
+1d416f611a175ba15be27f7f5686dd98 *src/raw-sector-cache.c
+7f281312b3a65666f7eebaadb62e7f6e *src/read-adaptive.c
+ccdc572bb24d20ae6fb53f360318b492 *src/read-adaptive-window.c
+af7a757cad586d3766a3eaad382c6737 *src/read-linear.c
+47dc58effd96f2b23182a4595ca36171 *src/read-linear-window.c
+edc0e564573d595c1196c4dc0e70e659 *src/recover-raw.c
+ea4d6894e717d4957cde686f88d7bdfd *src/rs01-common.c
+aa9d409ee4eeaa7ba92d731cf32ee727 *src/rs01-create.c
+ab15d7470a2fe950ebb33134018f044f *src/rs01-fix.c
+cb3722894665baf9c4ff4c26ff79737b *src/rs01-verify.c
+5cdecc33da1579733f0545944c4069ab *src/rs01-window.c
+b33a0982df485b4e52e56fc1c61285ae *src/rs02-common.c
+a1025fcc9455219937bae5bfadf0abf5 *src/rs02-create.c
+f466c8296a37ea88b64aec9c870d6d75 *src/rs02-fix.c
+369ec37d67674ffd2627f0373a566f0c *src/rs02-recognize.c
+8cc283e60a73493ac6ba60a2f4af1754 *src/rs02-verify.c
+eccac3ed74b32508b27de0e0d363c6b1 *src/rs02-window.c
+9a9b966171f1b375cf3381b545a1c6d4 *src/rs03-common.c
+2502514702687a2a252feace096d20f4 *src/rs03-create.c
+19676ef95e635206c19dfe12b957e4b2 *src/rs03-fix.c
+b012df78d2c546c87f6dd75769515409 *src/rs03-preferences.c
+7d6101e6a95aeb45d6cd03ffe8891b96 *src/rs03-recognize.c
+b7a6a6c64b4034380c581a5499940db4 *src/rs03-verify.c
+1d2b071943c121bf0c47a2e047317262 *src/rs03-window.c
+a2e1e28a609af85d9b83f01339b33a62 *src/rs-decoder.c
+3882a92849cd23e64c81262be6e52650 *src/rs-encoder-altivec.c
+1fc6cad3af2461e7974bf49e8f1bf5e9 *src/rs-encoder.c
+f7f3e2708f0c389ed53c0f1083567a55 *src/rs-encoder-sse2.c
+2e099a3d88f25f81420b96fe9bd62f44 *src/scsi-freebsd.c
+cd58a45387267fe0728f439d7bb2045d *src/scsi-layer.c
+b1b6bd57433eedab3a4f35389a182d14 *src/scsi-linux.c
+7064327dc15a2d88e5375176d4c64132 *src/scsi-netbsd.c
+3c0e100cdd499b1c23ac5e12b1fd6694 *src/scsi-simulated.c
+be42d574e6340845d984c21dc902af1a *src/scsi-unknown.c
+85aa8093f41c36ce791363e94f488dec *src/show-manual.c
+6099911dd508701b0b8b5d09105faf95 *src/smart-lec.c
+10f3e2b054fe3c1ac69c738b97f1beaa *src/spiral.c
+dec5fbde631058d48866cc1d77446d37 *src/udf.c
+6741fc5457e9c2026451403f2d45096c *src/welcome-window.c

locale/create-makefile

@@ -7,7 +7,7 @@ cat > Makefile <<EOF
 
 EOF
 
-for i in ../*.c; do
+for i in ../src/*.c; do
   cfiles="$cfiles $i"
   nopath=`echo $i | sed -e 's/..\///'`
   cfiles2="$cfiles2 $nopath"
@@ -34,7 +34,7 @@ messages.pot: \$(CFILES)
 	@cd ..; xgettext --no-wrap -cTRANSLATORS: -o locale/messages.pot -k_ -k_utf \$(CFILES_NP)
 
 clean:
-	rm -f messages.pot
+	@rm -f messages.pot
 
 EOF
 

regtest/common.bash

@@ -28,28 +28,26 @@ if ! $MD5SUM $RNDSEQ >/dev/null 2>&1; then
     MD5SUM=../simple-md5sum
 fi
 
-# Assemble sed expressions for removal of variable output contents
-
-SED_REMOVE_ISO_DIR="([a-zA-Z]:/[a-zA-Z0-9/]+)?${ISODIR}/"
+nbfailed=0
 
 # For MSYS2
 
 if [ -n "$ORIGINAL_TEMP" ]; then
     ISODIR="$ORIGINAL_TEMP"
     # /c/ => C:/
-    SED_REMOVE_ISO_DIR="$(echo "$ISODIR" | cut -c2 | tr a-z A-Z):$(echo "$ISODIR" | cut -c3-)/"
     NON_EXISTENT_DEVICE=V:
 fi
 
 # Usage
 
 if test "$1" == "--help" || test "$1" == "-h"; then
-    echo "Usage: $0 [gui] [all|cont <test case>]"
+    echo "Usage: $0 [gui] [all|[cont|only] <test case>]"
     exit 1;
 fi
 
 doall="no"
 cont_at="false"
+only_this_one="false"
 gui_mode="false"
 
 param=($*)
@@ -59,6 +57,7 @@ case "${param[0]}" in
 	gui_mode="true"
 	param[0]="${param[1]}"
 	param[1]="${param[2]}"
+	param[2]="${param[3]}"
 	;;
 esac
 	
@@ -69,6 +68,9 @@ case "${param[0]}" in
     cont)
 	cont_at="${param[1]}"
 	;;
+    only)
+	only_this_one="${param[1]}"
+	;;
 esac
 
 # Sanity check
@@ -118,9 +120,19 @@ function try()
        cont_at="false"
    fi
 
+   if test "$only_this_one" != "false"; then
+       if test "$only_this_one" != "${CODEC_PREFIX}_$2"; then
+           return 1
+       elif test "$only_this_one" == "done_please_exit"; then
+           exit $nbfailed
+       else
+           only_this_one="done_please_exit"
+       fi
+   fi
+
    doit=$(echo $doit | cut -d\  -f 2) 
 
-   if test $doall = "yes" || test $doit = "yes"; then
+   if test $doall = "yes" || test $doit = "yes" || test $only_this_one != "false"; then
        # Clean up temporary files
        if test -n "$TMPISO" && test -f "$TMPISO"; then
 	   rm -f $TMPISO
@@ -179,7 +191,7 @@ function run_regtest()
    local testeccopt=""
    local image_md5=""
    local ecc_md5=""
-   local pass="true"
+   local pass="false"
 
    local fail_on_bad=$(grep "FAIL_ON_BAD" $CONFIGFILE)
    fail_on_bad=$(echo $fail_on_bad | cut -d\  -f 2) 
@@ -197,60 +209,69 @@ function run_regtest()
    REFLOG=${DATABASE}/${CODEC_PREFIX}_${testsymbol}
 
    if test "$gui_mode" == "false"; then
-     rm -f $NEWLOG
+      rm -f $NEWLOG
 
-     echo "LANG=en_EN.UTF-8 $NEWVER --regtest --no-progress -i${testiso} ${testeccopt} ${extra_args} ${testparms}" >>$LOGFILE 
-     LANG=en_EN.UTF-8 $NEWVER --regtest --no-progress -i${testiso} ${testeccopt} ${extra_args} ${testparms} 2>&1 | tail -n +3  >>$NEWLOG 
+      echo "LANG=en_EN.UTF-8 $NEWVER --regtest --no-progress -i${testiso} ${testeccopt} ${extra_args} ${testparms}" >>$LOGFILE 
+      LANG=en_EN.UTF-8 $NEWVER --regtest --no-progress -i${testiso} ${testeccopt} ${extra_args} ${testparms} 2>&1 | tail -n +3  >>$NEWLOG 
 
-     if ! test -r $REFLOG; then
-	 echo -e "FAIL\n$REFLOG missing in log file database"
-	 return
-     fi
+      if ! test -r $REFLOG; then
+          pass="false"
+          if [ "$REGTEST_NO_UTF8" = 1 ]; then
+             echo "BAD; '$REFLOG' is missing in log file database"
+          else
+             printf "%b\r%b\n" "BAD; '$REFLOG' is missing in log file database" "[\e[31m✘\e[0m]"
+          fi
+      else
+         # ignore the memory tracker line when no memory leaks
+         # have been found
 
-     # ignore the memory tracker line when no memory leaks
-     # have been found
-     
-     grep -va "dvdisaster: No memory leaks found." $NEWLOG >$TMPLOG
-     mv $TMPLOG $NEWLOG
-     
-     # ignore log lines specified by user
-     
-     if test -n "$IGNORE_LOG_LINE"; then
-	 grep -Eva "$IGNORE_LOG_LINE" $NEWLOG >$TMPLOG
-	 mv $TMPLOG $NEWLOG
-     fi
+         grep -va "dvdisaster: No memory leaks found." $NEWLOG >$TMPLOG
+         mv $TMPLOG $NEWLOG
 
-     filter=cat
-     echo "$options" | grep -qw SORTED && filter=sort
-     if [ "${CODEC_PREFIX}_${testsymbol}" = RS01_scan_no_device ] || [ "${CODEC_PREFIX}_${testsymbol}" = RS01_read_no_device ]; then
-	     # for Windows
-	     sed -i -re "s=device $NON_EXISTENT_DEVICE\.=/dev/sdz: No such file or directory=" $NEWLOG
-     fi
-       
-     if ! diff <(tail -n +3 $REFLOG | $filter) <(sed -re "s=${SED_REMOVE_ISO_DIR}==g" $NEWLOG | $filter) >${DIFFLOG}; then
-	 if [ "$REGTEST_NO_UTF8" = 1 ]; then
-	   echo "BAD; diffs found (<expected; >created):"
-	 else
-	   printf "%b\r%b\n" "BAD; diffs found (<expected; >created):" "[\e[31m✘\e[0m]"
-	 fi
-	 cat ${DIFFLOG}
+         # ignore log lines specified by user
 
-	 if test "$interactive_diff" == "yes"; then
-	   echo
-	   echo ">> The diff can also be seen with: vimdiff $REFLOG $NEWLOG"
-	   read -n 1 -p ">> Press 'a' to accept this diff; any other key to fail this test:" -e answer
-	   if test "$answer" == "a"; then
-	       cp $REFLOG $LOGDIR
-	       head -n 2 $LOGDIR/${CODEC_PREFIX}_${testsymbol} >$REFLOG 
-	       sed -e "s=${SED_REMOVE_ISO_DIR}==g" $NEWLOG >>$REFLOG
-	       pass="skip"
-	   else
-	       pass="false"
-	   fi
-	 else
-	   pass="false"
-	 fi
-     fi
+         if test -n "$IGNORE_LOG_LINE"; then
+            grep -Eva "$IGNORE_LOG_LINE" $NEWLOG >$TMPLOG
+            mv $TMPLOG $NEWLOG
+         fi
+
+         filter=cat
+         echo "$options" | grep -qw SORTED && filter=sort
+         if [ "${CODEC_PREFIX}_${testsymbol}" = RS01_scan_no_device ] || \
+            [ "${CODEC_PREFIX}_${testsymbol}" = RS01_read_no_device ] || \
+            [ "${CODEC_PREFIX}_${testsymbol}" = RS01_adaptive_no_device ]; then
+            # for Windows
+            sed -i -re "s=device $NON_EXISTENT_DEVICE\.=/dev/sdz: No such file or directory=" $NEWLOG
+         fi
+
+         if ! diff <(tail -n +3 $REFLOG | $filter) <(sed -re "s=[a-zA-Z:/]+/([a-z0-9_-]+\.(ecc|iso))=\1=g;s=$ISODIR/==g" $NEWLOG | $filter) >${DIFFLOG}; then
+            if [ "$REGTEST_NO_UTF8" = 1 ]; then
+               echo "BAD; diffs found (<expected; >created):"
+            else
+               printf "%b\r%b\n" "BAD; diffs found (<expected; >created):" "[\e[31m✘\e[0m]"
+            fi
+            cat ${DIFFLOG}
+
+            if test "$interactive_diff" == "yes"; then
+               while true; do
+                  read -n 1 -p ">> Press 'a' to accept this diff; 'v' to vimdiff; any other key to fail this test:" -e answer
+                  if test "$answer" == "a"; then
+                     cp $REFLOG $LOGDIR
+                     head -n 2 $LOGDIR/${CODEC_PREFIX}_${testsymbol} >$REFLOG 
+                     sed -re "s=[a-zA-Z:/]+/([a-z0-9_-]+\.(ecc|iso))=\1=g;s=$ISODIR/==g" $NEWLOG >>$REFLOG
+                     pass="skip"
+                  elif test "$answer" == "v"; then
+                     vimdiff $REFLOG $NEWLOG
+
+                     continue
+                  fi
+                  break
+               done
+            fi
+         else
+            pass="true"
+         fi
+      fi
    else  # gui mode
        replace_config last-image "$testiso"
        if test -n "${testecc}"; then
@@ -269,10 +290,15 @@ function run_regtest()
 
    unset extra_args
      
-   image_md5=$(head -n 1 $REFLOG)
-   ecc_md5=$(head -n 2 $REFLOG | tail -n 1)
+   if test -r "$REFLOG"; then
+      image_md5=$(head -n 1 $REFLOG)
+      ecc_md5=$(head -n 2 $REFLOG | tail -n 1)
+   else
+      image_md5=ignore
+      ecc_md5=ignore
+   fi
 
-   if test ${image_md5} != "ignore"; then
+   if test "${image_md5}" != "ignore"; then
        md5=$($MD5SUM ${testiso} | cut -d\  -f 1)
        if test "$image_md5" != "$md5"; then
 	   if [ "$REGTEST_NO_UTF8" = 1 ]; then
@@ -286,7 +312,7 @@ function run_regtest()
        fi
    fi	   
 
-   if test ${ecc_md5} != "ignore"; then
+   if test "${ecc_md5}" != "ignore"; then
        md5=$($MD5SUM ${testecc} | cut -d\  -f 1)
        if test "$ecc_md5" != "$md5"; then
 	   if [ "$pass" = false ] || [ "$REGTEST_NO_UTF8" = 1 ]; then
@@ -313,9 +339,11 @@ function run_regtest()
       ;;
      
      *)
+      nbfailed=$((nbfailed + 1))
+      [ $nbfailed -ge 256 ] && nbfailed=255
       echo "test symbol for config: $testsymbol"
       if test "$fail_on_bad" == "yes"; then
-	next=$(grep -A 1  ${CODEC_PREFIX}_$testsymbol config.txt | tail -n 1 | cut -d\  -f 1)
+	next=$(grep -A 1 "${CODEC_PREFIX}_$testsymbol" config.txt | tail -n 1 | cut -d\  -f 1)
 	echo "FAIL_ON_BAD set to yes -- exiting"
 	if test "$gui_mode" == "true"; then
 	    guiarg="gui"

regtest/config.txt

@@ -1,6 +1,6 @@
 # Global toggles
 
-FAIL_ON_BAD yes
+FAIL_ON_BAD no
 SPAWN_LOG_WINDOW no
 INTERACTIVE_DIFF yes
 
@@ -170,6 +170,11 @@ RS01_adaptive_medium_with_dsm yes
 
 ### RS02 tests
 
+# Strip tests
+
+RS02_strip_ecc yes
+RS02_strip_ecc_not yes
+
 # Verify tests
 RS02_good yes
 RS02_good_quick yes
@@ -335,6 +340,11 @@ RS02_adaptive_with_wrong_rs03_file yes
 
 ### RS03 augmented image tests
 
+# Strip tests
+
+RS03i_strip_ecc yes
+RS03i_strip_ecc_not yes
+
 # Verify tests
 
 RS03i_good yes

regtest/database/RS01_adapive_wrong_fp_with_ecc

@@ -9,6 +9,7 @@ Device: sim-cd, Simulated CD drive 1.00
 Using READ CD.
 Medium "Random Image": CD-R mode 1, 21000 sectors, created 16-07-2006.
 
+RS01-type ECC found
 Adaptive reading: Trying to collect enough data for error correction.
 
 *

regtest/database/RS01_adaptive_crc_errors_with_ecc

@@ -9,6 +9,7 @@ Device: sim-cd, Simulated CD drive 1.00
 Using READ CD.
 Medium "Random Image": CD-R mode 1, 21000 sectors, created 16-07-2006.
 
+RS01-type ECC found
 Adaptive reading: Trying to collect enough data for error correction.
 Creating new rs01-tmp.iso image.
 Repairable:  0.0% (correctable: 0; now reading [0..20999], size 21000)

regtest/database/RS01_adaptive_defective_large_skip

@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
-RS03Recognize: medium sim-cd
+RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***

regtest/database/RS01_adaptive_defective_no_ecc

@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
-RS03Recognize: medium sim-cd
+RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***

regtest/database/RS01_adaptive_longer_with_ecc

@@ -9,6 +9,7 @@ Device: sim-cd, Simulated CD drive 1.00
 Using READ CD.
 Medium "Random Image": CD-R mode 1, 21044 sectors, created 16-07-2006.
 
+RS01-type ECC found
 Adaptive reading: Trying to collect enough data for error correction.
 * Warning: Medium contains 44 sectors more as recorded in the .ecc file
 *          (Medium: 21044 sectors; expected from .ecc file: 21000 sectors).

regtest/database/RS01_adaptive_shorter_with_ecc

@@ -9,6 +9,7 @@ Device: sim-cd, Simulated CD drive 1.00
 Using READ CD.
 Medium "Random Image": CD-R mode 1, 20956 sectors, created 16-07-2006.
 
+RS01-type ECC found
 Adaptive reading: Trying to collect enough data for error correction.
 * Warning: Medium contains 44 sectors less as recorded in the .ecc file
 *          (Medium: 20956 sectors; expected from .ecc file: 21000 sectors).

regtest/database/RS01_adaptive_tao_tail_with_ecc

@@ -9,6 +9,7 @@ Device: sim-cd, Simulated CD drive 1.00
 Using READ CD.
 Medium "Random Image": CD-R mode 1, 21002 sectors, created 16-07-2006.
 
+RS01-type ECC found
 Adaptive reading: Trying to collect enough data for error correction.
 * Warning: Medium contains 2 sectors more as recorded in the .ecc file
 *          (Medium: 21002 sectors; expected from .ecc file: 21000 sectors).

regtest/database/RS01_ecc_create_after_partial_read

@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
@@ -153,6 +221,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976

regtest/database/RS01_ecc_create_after_read

@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
@@ -154,6 +222,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976

regtest/database/RS01_ecc_recreate_after_read_rs01

@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
@@ -156,6 +224,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976

regtest/database/RS01_ecc_recreate_after_read_rs03f

@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
@@ -170,6 +238,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976

regtest/database/RS01_ecc_recreate_after_read_rs03i

@@ -84,7 +84,67 @@ try_sector: trying sector 21000
 try_sector: no cookie, skipping current modulo
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+try_sector: trying sector 24576
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 4096
+Sector 24576 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 2048
+try_sector: trying sector 26624
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
@@ -166,6 +226,7 @@ try_sector: trying sector 21000
 try_sector: no cookie, skipping current modulo
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976

regtest/database/RS01_read_medium_with_dsm_in_image2_verbose

@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***

regtest/database/RS01_read_medium_with_dsm_in_image_verbose

@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***

regtest/database/RS01_read_medium_with_dsm_verbose

@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***

regtest/database/RS01_uncorrectable_dsm_in_image2_verbose

@@ -50,6 +50,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976

regtest/database/RS01_uncorrectable_dsm_in_image_verbose

@@ -50,6 +50,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976

regtest/database/RS02_adaptive_incompatible_ecc

@@ -9,6 +9,7 @@ Device: sim-cd, Simulated CD drive 1.00
 Using READ CD.
 Medium "Random Image": CD-R mode 1, 34932 sectors, Ecc, created 16-07-2006.
 
+RS02-type ECC found
 * Warning: This image requires dvdisaster-99.99!
 *          Proceeding could trigger incorrect behaviour.
 *          Please visit http://www.dvdisaster.org for an upgrade.

regtest/database/RS02_adaptive_missing_data_sectors

@@ -9,6 +9,7 @@ Device: sim-cd, Simulated CD drive 1.00
 Using READ CD.
 Medium "Random Image": CD-R mode 1, 34932 sectors, Ecc, created 16-07-2006.
 
+RS02-type ECC found
 Adaptive reading: Trying to collect enough data for error correction.
 Creating new rs02-tmp.iso image.
 Repairable:  0.2% (missing: 34932; now reading [0..34931], size 34932)Repairable:  0.3% (missing: 34900; now reading [0..34931], size 34932)Repairable:  0.4% (missing: 34868; now reading [0..34931], size 34932)Repairable:  0.5% (missing: 34820; now reading [0..34931], size 34932)Repairable:  0.6% (missing: 34788; now reading [0..34931], size 34932)Repairable:  0.7% (missing: 34756; now reading [0..34931], size 34932)Repairable:  0.8% (missing: 34724; now reading [0..34931], size 34932)Repairable:  0.9% (missing: 34692; now reading [0..34931], size 34932)Repairable:  1.0% (missing: 34644; now reading [0..34931], size 34932)Repairable:  1.1% (missing: 34612; now reading [0..34931], size 34932)Repairable:  1.2% (missing: 34580; now reading [0..34931], size 34932)Repairable:  1.3% (missing: 34548; now reading [0..34931], size 34932)Repairable:  1.4% (missing: 34516; now reading [0..34931], size 34932)Repairable:  1.5% (missing: 34484; now reading [0..34931], size 34932)Repairable:  1.6% (missing: 34436; now reading [0..34931], size 34932)Repairable:  1.7% (missing: 34404; now reading [0..34931], size 34932)Repairable:  1.8% (missing: 34372; now reading [0..34931], size 34932)Repairable:  1.9% (missing: 34340; now reading [0..34931], size 34932)Repairable:  2.0% (missing: 34308; now reading [0..34931], size 34932)Repairable:  2.1% (missing: 34260; now reading [0..34931], size 34932)Repairable:  2.2% (missing: 34228; now reading [0..34931], size 34932)Repairable:  2.3% (missing: 34196; now reading [0..34931], size 34932)Repairable:  2.4% (missing: 34164; now reading [0..34931], size 34932)Repairable:  2.5% (missing: 34132; now reading [0..34931], size 34932)Repairable:  2.6% (missing: 34084; now reading [0..34931], size 34932)Repairable:  2.7% (missing: 34052; now reading [0..34931], size 34932)Repairable:  2.8% (missing: 34020; now reading [0..34931], size 34932)Repairable:  2.9% (missing: 33988; now reading [0..34931], size 34932)Repairable:  3.0% (missing: 33956; now reading [0..34931], size 34932)Sector 992, try 1: Medium Error; Unrecovered read error.

regtest/database/RS02_adaptive_with_wrong_rs01_file

@@ -9,6 +9,7 @@ Device: sim-cd, Simulated CD drive 1.00
 Using READ CD.
 Medium "Random Image": CD-R mode 1, 34932 sectors, Ecc, created 16-07-2006.
 
+RS01-type ECC found
 Adaptive reading: Trying to collect enough data for error correction.
 
 *

regtest/database/RS02_bad_master

@@ -50,6 +50,7 @@ try_sector: trying sector 30000
 try_sector: read error, trying next header
 try_sector: trying sector 29850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976

regtest/database/RS02_read_bad_master

@@ -84,11 +84,74 @@ try_sector: trying sector 30000
 try_sector: read error, trying next header
 try_sector: trying sector 29850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+try_sector: trying sector 32768
+try_sector: read error, trying next header
+FindHeaderInMedium: Trying modulo 16384
+Sector 32768 cached; skipping
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 32768 cached; skipping
+try_sector: trying sector 24576
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***

regtest/database/RS02_read_bad_master_exhaustive

@@ -84,6 +84,7 @@ try_sector: trying sector 30000
 try_sector: read error, trying next header
 try_sector: trying sector 29850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 Medium rewriteable: FALSE
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
@@ -166,6 +167,334 @@ Reading CRC information from ecc data (RS02) ... RS02LayoutFromImage(): returnin
 done.
 Sector 30000, try 1: Medium Error; Unrecovered read error.
 Sector 30000: Medium Error; Unrecovered read error. Skipping 15 sectors.
+Current sector: 30001. This session: NewSectorsReadOK=30000, ReadErrors=1
+Current sector: 30002. This session: NewSectorsReadOK=30000, ReadErrors=2
+Current sector: 30003. This session: NewSectorsReadOK=30000, ReadErrors=3
+Current sector: 30004. This session: NewSectorsReadOK=30000, ReadErrors=4
+Current sector: 30005. This session: NewSectorsReadOK=30000, ReadErrors=5
+Current sector: 30006. This session: NewSectorsReadOK=30000, ReadErrors=6
+Current sector: 30007. This session: NewSectorsReadOK=30000, ReadErrors=7
+Current sector: 30008. This session: NewSectorsReadOK=30000, ReadErrors=8
+Current sector: 30009. This session: NewSectorsReadOK=30000, ReadErrors=9
+Current sector: 30010. This session: NewSectorsReadOK=30000, ReadErrors=10
+Current sector: 30011. This session: NewSectorsReadOK=30000, ReadErrors=11
+Current sector: 30012. This session: NewSectorsReadOK=30000, ReadErrors=12
+Current sector: 30013. This session: NewSectorsReadOK=30000, ReadErrors=13
+Current sector: 30014. This session: NewSectorsReadOK=30000, ReadErrors=14
+Current sector: 30015. This session: NewSectorsReadOK=30000, ReadErrors=15
+Current sector: 30016. This session: NewSectorsReadOK=30000, ReadErrors=16
+Current sector: 30016. This session: NewSectorsReadOK=30000, ReadErrors=16
+Current sector: 30032. This session: NewSectorsReadOK=30016, ReadErrors=16
+Current sector: 30048. This session: NewSectorsReadOK=30032, ReadErrors=16
+Current sector: 30064. This session: NewSectorsReadOK=30048, ReadErrors=16
+Current sector: 30080. This session: NewSectorsReadOK=30064, ReadErrors=16
+Current sector: 30096. This session: NewSectorsReadOK=30080, ReadErrors=16
+Current sector: 30112. This session: NewSectorsReadOK=30096, ReadErrors=16
+Current sector: 30128. This session: NewSectorsReadOK=30112, ReadErrors=16
+Current sector: 30144. This session: NewSectorsReadOK=30128, ReadErrors=16
+Current sector: 30160. This session: NewSectorsReadOK=30144, ReadErrors=16
+Current sector: 30176. This session: NewSectorsReadOK=30160, ReadErrors=16
+Current sector: 30192. This session: NewSectorsReadOK=30176, ReadErrors=16
+Current sector: 30208. This session: NewSectorsReadOK=30192, ReadErrors=16
+Current sector: 30224. This session: NewSectorsReadOK=30208, ReadErrors=16
+Current sector: 30240. This session: NewSectorsReadOK=30224, ReadErrors=16
+Current sector: 30256. This session: NewSectorsReadOK=30240, ReadErrors=16
+Current sector: 30272. This session: NewSectorsReadOK=30256, ReadErrors=16
+Current sector: 30288. This session: NewSectorsReadOK=30272, ReadErrors=16
+Current sector: 30304. This session: NewSectorsReadOK=30288, ReadErrors=16
+Current sector: 30320. This session: NewSectorsReadOK=30304, ReadErrors=16
+Current sector: 30336. This session: NewSectorsReadOK=30320, ReadErrors=16
+Current sector: 30352. This session: NewSectorsReadOK=30336, ReadErrors=16
+Current sector: 30368. This session: NewSectorsReadOK=30352, ReadErrors=16
+Current sector: 30384. This session: NewSectorsReadOK=30368, ReadErrors=16
+Current sector: 30400. This session: NewSectorsReadOK=30384, ReadErrors=16
+Current sector: 30416. This session: NewSectorsReadOK=30400, ReadErrors=16
+Current sector: 30432. This session: NewSectorsReadOK=30416, ReadErrors=16
+Current sector: 30448. This session: NewSectorsReadOK=30432, ReadErrors=16
+Current sector: 30464. This session: NewSectorsReadOK=30448, ReadErrors=16
+Current sector: 30480. This session: NewSectorsReadOK=30464, ReadErrors=16
+Current sector: 30496. This session: NewSectorsReadOK=30480, ReadErrors=16
+Current sector: 30512. This session: NewSectorsReadOK=30496, ReadErrors=16
+Current sector: 30528. This session: NewSectorsReadOK=30512, ReadErrors=16
+Current sector: 30544. This session: NewSectorsReadOK=30528, ReadErrors=16
+Current sector: 30560. This session: NewSectorsReadOK=30544, ReadErrors=16
+Current sector: 30576. This session: NewSectorsReadOK=30560, ReadErrors=16
+Current sector: 30592. This session: NewSectorsReadOK=30576, ReadErrors=16
+Current sector: 30608. This session: NewSectorsReadOK=30592, ReadErrors=16
+Current sector: 30624. This session: NewSectorsReadOK=30608, ReadErrors=16
+Current sector: 30640. This session: NewSectorsReadOK=30624, ReadErrors=16
+Current sector: 30656. This session: NewSectorsReadOK=30640, ReadErrors=16
+Current sector: 30672. This session: NewSectorsReadOK=30656, ReadErrors=16
+Current sector: 30688. This session: NewSectorsReadOK=30672, ReadErrors=16
+Current sector: 30704. This session: NewSectorsReadOK=30688, ReadErrors=16
+Current sector: 30720. This session: NewSectorsReadOK=30704, ReadErrors=16
+Current sector: 30736. This session: NewSectorsReadOK=30720, ReadErrors=16
+Current sector: 30752. This session: NewSectorsReadOK=30736, ReadErrors=16
+Current sector: 30768. This session: NewSectorsReadOK=30752, ReadErrors=16
+Current sector: 30784. This session: NewSectorsReadOK=30768, ReadErrors=16
+Current sector: 30800. This session: NewSectorsReadOK=30784, ReadErrors=16
+Current sector: 30816. This session: NewSectorsReadOK=30800, ReadErrors=16
+Current sector: 30832. This session: NewSectorsReadOK=30816, ReadErrors=16
+Current sector: 30848. This session: NewSectorsReadOK=30832, ReadErrors=16
+Current sector: 30864. This session: NewSectorsReadOK=30848, ReadErrors=16
+Current sector: 30880. This session: NewSectorsReadOK=30864, ReadErrors=16
+Current sector: 30896. This session: NewSectorsReadOK=30880, ReadErrors=16
+Current sector: 30912. This session: NewSectorsReadOK=30896, ReadErrors=16
+Current sector: 30928. This session: NewSectorsReadOK=30912, ReadErrors=16
+Current sector: 30944. This session: NewSectorsReadOK=30928, ReadErrors=16
+Current sector: 30960. This session: NewSectorsReadOK=30944, ReadErrors=16
+Current sector: 30976. This session: NewSectorsReadOK=30960, ReadErrors=16
+Current sector: 30992. This session: NewSectorsReadOK=30976, ReadErrors=16
+Current sector: 31008. This session: NewSectorsReadOK=30992, ReadErrors=16
+Current sector: 31024. This session: NewSectorsReadOK=31008, ReadErrors=16
+Current sector: 31040. This session: NewSectorsReadOK=31024, ReadErrors=16
+Current sector: 31056. This session: NewSectorsReadOK=31040, ReadErrors=16
+Current sector: 31072. This session: NewSectorsReadOK=31056, ReadErrors=16
+Current sector: 31088. This session: NewSectorsReadOK=31072, ReadErrors=16
+Current sector: 31104. This session: NewSectorsReadOK=31088, ReadErrors=16
+Current sector: 31120. This session: NewSectorsReadOK=31104, ReadErrors=16
+Current sector: 31136. This session: NewSectorsReadOK=31120, ReadErrors=16
+Current sector: 31152. This session: NewSectorsReadOK=31136, ReadErrors=16
+Current sector: 31168. This session: NewSectorsReadOK=31152, ReadErrors=16
+Current sector: 31184. This session: NewSectorsReadOK=31168, ReadErrors=16
+Current sector: 31200. This session: NewSectorsReadOK=31184, ReadErrors=16
+Current sector: 31216. This session: NewSectorsReadOK=31200, ReadErrors=16
+Current sector: 31232. This session: NewSectorsReadOK=31216, ReadErrors=16
+Current sector: 31248. This session: NewSectorsReadOK=31232, ReadErrors=16
+Current sector: 31264. This session: NewSectorsReadOK=31248, ReadErrors=16
+Current sector: 31280. This session: NewSectorsReadOK=31264, ReadErrors=16
+Current sector: 31296. This session: NewSectorsReadOK=31280, ReadErrors=16
+Current sector: 31312. This session: NewSectorsReadOK=31296, ReadErrors=16
+Current sector: 31328. This session: NewSectorsReadOK=31312, ReadErrors=16
+Current sector: 31344. This session: NewSectorsReadOK=31328, ReadErrors=16
+Current sector: 31360. This session: NewSectorsReadOK=31344, ReadErrors=16
+Current sector: 31376. This session: NewSectorsReadOK=31360, ReadErrors=16
+Current sector: 31392. This session: NewSectorsReadOK=31376, ReadErrors=16
+Current sector: 31408. This session: NewSectorsReadOK=31392, ReadErrors=16
+Current sector: 31424. This session: NewSectorsReadOK=31408, ReadErrors=16
+Current sector: 31440. This session: NewSectorsReadOK=31424, ReadErrors=16
+Current sector: 31456. This session: NewSectorsReadOK=31440, ReadErrors=16
+Current sector: 31472. This session: NewSectorsReadOK=31456, ReadErrors=16
+Current sector: 31488. This session: NewSectorsReadOK=31472, ReadErrors=16
+Current sector: 31504. This session: NewSectorsReadOK=31488, ReadErrors=16
+Current sector: 31520. This session: NewSectorsReadOK=31504, ReadErrors=16
+Current sector: 31536. This session: NewSectorsReadOK=31520, ReadErrors=16
+Current sector: 31552. This session: NewSectorsReadOK=31536, ReadErrors=16
+Current sector: 31568. This session: NewSectorsReadOK=31552, ReadErrors=16
+Current sector: 31584. This session: NewSectorsReadOK=31568, ReadErrors=16
+Current sector: 31600. This session: NewSectorsReadOK=31584, ReadErrors=16
+Current sector: 31616. This session: NewSectorsReadOK=31600, ReadErrors=16
+Current sector: 31632. This session: NewSectorsReadOK=31616, ReadErrors=16
+Current sector: 31648. This session: NewSectorsReadOK=31632, ReadErrors=16
+Current sector: 31664. This session: NewSectorsReadOK=31648, ReadErrors=16
+Current sector: 31680. This session: NewSectorsReadOK=31664, ReadErrors=16
+Current sector: 31696. This session: NewSectorsReadOK=31680, ReadErrors=16
+Current sector: 31712. This session: NewSectorsReadOK=31696, ReadErrors=16
+Current sector: 31728. This session: NewSectorsReadOK=31712, ReadErrors=16
+Current sector: 31744. This session: NewSectorsReadOK=31728, ReadErrors=16
+Current sector: 31760. This session: NewSectorsReadOK=31744, ReadErrors=16
+Current sector: 31776. This session: NewSectorsReadOK=31760, ReadErrors=16
+Current sector: 31792. This session: NewSectorsReadOK=31776, ReadErrors=16
+Current sector: 31808. This session: NewSectorsReadOK=31792, ReadErrors=16
+Current sector: 31824. This session: NewSectorsReadOK=31808, ReadErrors=16
+Current sector: 31840. This session: NewSectorsReadOK=31824, ReadErrors=16
+Current sector: 31856. This session: NewSectorsReadOK=31840, ReadErrors=16
+Current sector: 31872. This session: NewSectorsReadOK=31856, ReadErrors=16
+Current sector: 31888. This session: NewSectorsReadOK=31872, ReadErrors=16
+Current sector: 31904. This session: NewSectorsReadOK=31888, ReadErrors=16
+Current sector: 31920. This session: NewSectorsReadOK=31904, ReadErrors=16
+Current sector: 31936. This session: NewSectorsReadOK=31920, ReadErrors=16
+Current sector: 31952. This session: NewSectorsReadOK=31936, ReadErrors=16
+Current sector: 31968. This session: NewSectorsReadOK=31952, ReadErrors=16
+Current sector: 31984. This session: NewSectorsReadOK=31968, ReadErrors=16
+Current sector: 32000. This session: NewSectorsReadOK=31984, ReadErrors=16
+Current sector: 32016. This session: NewSectorsReadOK=32000, ReadErrors=16
+Current sector: 32032. This session: NewSectorsReadOK=32016, ReadErrors=16
+Current sector: 32048. This session: NewSectorsReadOK=32032, ReadErrors=16
+Current sector: 32064. This session: NewSectorsReadOK=32048, ReadErrors=16
+Current sector: 32080. This session: NewSectorsReadOK=32064, ReadErrors=16
+Current sector: 32096. This session: NewSectorsReadOK=32080, ReadErrors=16
+Current sector: 32112. This session: NewSectorsReadOK=32096, ReadErrors=16
+Current sector: 32128. This session: NewSectorsReadOK=32112, ReadErrors=16
+Current sector: 32144. This session: NewSectorsReadOK=32128, ReadErrors=16
+Current sector: 32160. This session: NewSectorsReadOK=32144, ReadErrors=16
+Current sector: 32176. This session: NewSectorsReadOK=32160, ReadErrors=16
+Current sector: 32192. This session: NewSectorsReadOK=32176, ReadErrors=16
+Current sector: 32208. This session: NewSectorsReadOK=32192, ReadErrors=16
+Current sector: 32224. This session: NewSectorsReadOK=32208, ReadErrors=16
+Current sector: 32240. This session: NewSectorsReadOK=32224, ReadErrors=16
+Current sector: 32256. This session: NewSectorsReadOK=32240, ReadErrors=16
+Current sector: 32272. This session: NewSectorsReadOK=32256, ReadErrors=16
+Current sector: 32288. This session: NewSectorsReadOK=32272, ReadErrors=16
+Current sector: 32304. This session: NewSectorsReadOK=32288, ReadErrors=16
+Current sector: 32320. This session: NewSectorsReadOK=32304, ReadErrors=16
+Current sector: 32336. This session: NewSectorsReadOK=32320, ReadErrors=16
+Current sector: 32352. This session: NewSectorsReadOK=32336, ReadErrors=16
+Current sector: 32368. This session: NewSectorsReadOK=32352, ReadErrors=16
+Current sector: 32384. This session: NewSectorsReadOK=32368, ReadErrors=16
+Current sector: 32400. This session: NewSectorsReadOK=32384, ReadErrors=16
+Current sector: 32416. This session: NewSectorsReadOK=32400, ReadErrors=16
+Current sector: 32432. This session: NewSectorsReadOK=32416, ReadErrors=16
+Current sector: 32448. This session: NewSectorsReadOK=32432, ReadErrors=16
+Current sector: 32464. This session: NewSectorsReadOK=32448, ReadErrors=16
+Current sector: 32480. This session: NewSectorsReadOK=32464, ReadErrors=16
+Current sector: 32496. This session: NewSectorsReadOK=32480, ReadErrors=16
+Current sector: 32512. This session: NewSectorsReadOK=32496, ReadErrors=16
+Current sector: 32528. This session: NewSectorsReadOK=32512, ReadErrors=16
+Current sector: 32544. This session: NewSectorsReadOK=32528, ReadErrors=16
+Current sector: 32560. This session: NewSectorsReadOK=32544, ReadErrors=16
+Current sector: 32576. This session: NewSectorsReadOK=32560, ReadErrors=16
+Current sector: 32592. This session: NewSectorsReadOK=32576, ReadErrors=16
+Current sector: 32608. This session: NewSectorsReadOK=32592, ReadErrors=16
+Current sector: 32624. This session: NewSectorsReadOK=32608, ReadErrors=16
+Current sector: 32640. This session: NewSectorsReadOK=32624, ReadErrors=16
+Current sector: 32656. This session: NewSectorsReadOK=32640, ReadErrors=16
+Current sector: 32672. This session: NewSectorsReadOK=32656, ReadErrors=16
+Current sector: 32688. This session: NewSectorsReadOK=32672, ReadErrors=16
+Current sector: 32704. This session: NewSectorsReadOK=32688, ReadErrors=16
+Current sector: 32720. This session: NewSectorsReadOK=32704, ReadErrors=16
+Current sector: 32736. This session: NewSectorsReadOK=32720, ReadErrors=16
+Current sector: 32752. This session: NewSectorsReadOK=32736, ReadErrors=16
+Current sector: 32768. This session: NewSectorsReadOK=32752, ReadErrors=16
+Current sector: 32784. This session: NewSectorsReadOK=32768, ReadErrors=16
+Current sector: 32800. This session: NewSectorsReadOK=32784, ReadErrors=16
+Current sector: 32816. This session: NewSectorsReadOK=32800, ReadErrors=16
+Current sector: 32832. This session: NewSectorsReadOK=32816, ReadErrors=16
+Current sector: 32848. This session: NewSectorsReadOK=32832, ReadErrors=16
+Current sector: 32864. This session: NewSectorsReadOK=32848, ReadErrors=16
+Current sector: 32880. This session: NewSectorsReadOK=32864, ReadErrors=16
+Current sector: 32896. This session: NewSectorsReadOK=32880, ReadErrors=16
+Current sector: 32912. This session: NewSectorsReadOK=32896, ReadErrors=16
+Current sector: 32928. This session: NewSectorsReadOK=32912, ReadErrors=16
+Current sector: 32944. This session: NewSectorsReadOK=32928, ReadErrors=16
+Current sector: 32960. This session: NewSectorsReadOK=32944, ReadErrors=16
+Current sector: 32976. This session: NewSectorsReadOK=32960, ReadErrors=16
+Current sector: 32992. This session: NewSectorsReadOK=32976, ReadErrors=16
+Current sector: 33008. This session: NewSectorsReadOK=32992, ReadErrors=16
+Current sector: 33024. This session: NewSectorsReadOK=33008, ReadErrors=16
+Current sector: 33040. This session: NewSectorsReadOK=33024, ReadErrors=16
+Current sector: 33056. This session: NewSectorsReadOK=33040, ReadErrors=16
+Current sector: 33072. This session: NewSectorsReadOK=33056, ReadErrors=16
+Current sector: 33088. This session: NewSectorsReadOK=33072, ReadErrors=16
+Current sector: 33104. This session: NewSectorsReadOK=33088, ReadErrors=16
+Current sector: 33120. This session: NewSectorsReadOK=33104, ReadErrors=16
+Current sector: 33136. This session: NewSectorsReadOK=33120, ReadErrors=16
+Current sector: 33152. This session: NewSectorsReadOK=33136, ReadErrors=16
+Current sector: 33168. This session: NewSectorsReadOK=33152, ReadErrors=16
+Current sector: 33184. This session: NewSectorsReadOK=33168, ReadErrors=16
+Current sector: 33200. This session: NewSectorsReadOK=33184, ReadErrors=16
+Current sector: 33216. This session: NewSectorsReadOK=33200, ReadErrors=16
+Current sector: 33232. This session: NewSectorsReadOK=33216, ReadErrors=16
+Current sector: 33248. This session: NewSectorsReadOK=33232, ReadErrors=16
+Current sector: 33264. This session: NewSectorsReadOK=33248, ReadErrors=16
+Current sector: 33280. This session: NewSectorsReadOK=33264, ReadErrors=16
+Current sector: 33296. This session: NewSectorsReadOK=33280, ReadErrors=16
+Current sector: 33312. This session: NewSectorsReadOK=33296, ReadErrors=16
+Current sector: 33328. This session: NewSectorsReadOK=33312, ReadErrors=16
+Current sector: 33344. This session: NewSectorsReadOK=33328, ReadErrors=16
+Current sector: 33360. This session: NewSectorsReadOK=33344, ReadErrors=16
+Current sector: 33376. This session: NewSectorsReadOK=33360, ReadErrors=16
+Current sector: 33392. This session: NewSectorsReadOK=33376, ReadErrors=16
+Current sector: 33408. This session: NewSectorsReadOK=33392, ReadErrors=16
+Current sector: 33424. This session: NewSectorsReadOK=33408, ReadErrors=16
+Current sector: 33440. This session: NewSectorsReadOK=33424, ReadErrors=16
+Current sector: 33456. This session: NewSectorsReadOK=33440, ReadErrors=16
+Current sector: 33472. This session: NewSectorsReadOK=33456, ReadErrors=16
+Current sector: 33488. This session: NewSectorsReadOK=33472, ReadErrors=16
+Current sector: 33504. This session: NewSectorsReadOK=33488, ReadErrors=16
+Current sector: 33520. This session: NewSectorsReadOK=33504, ReadErrors=16
+Current sector: 33536. This session: NewSectorsReadOK=33520, ReadErrors=16
+Current sector: 33552. This session: NewSectorsReadOK=33536, ReadErrors=16
+Current sector: 33568. This session: NewSectorsReadOK=33552, ReadErrors=16
+Current sector: 33584. This session: NewSectorsReadOK=33568, ReadErrors=16
+Current sector: 33600. This session: NewSectorsReadOK=33584, ReadErrors=16
+Current sector: 33616. This session: NewSectorsReadOK=33600, ReadErrors=16
+Current sector: 33632. This session: NewSectorsReadOK=33616, ReadErrors=16
+Current sector: 33648. This session: NewSectorsReadOK=33632, ReadErrors=16
+Current sector: 33664. This session: NewSectorsReadOK=33648, ReadErrors=16
+Current sector: 33680. This session: NewSectorsReadOK=33664, ReadErrors=16
+Current sector: 33696. This session: NewSectorsReadOK=33680, ReadErrors=16
+Current sector: 33712. This session: NewSectorsReadOK=33696, ReadErrors=16
+Current sector: 33728. This session: NewSectorsReadOK=33712, ReadErrors=16
+Current sector: 33744. This session: NewSectorsReadOK=33728, ReadErrors=16
+Current sector: 33760. This session: NewSectorsReadOK=33744, ReadErrors=16
+Current sector: 33776. This session: NewSectorsReadOK=33760, ReadErrors=16
+Current sector: 33792. This session: NewSectorsReadOK=33776, ReadErrors=16
+Current sector: 33808. This session: NewSectorsReadOK=33792, ReadErrors=16
+Current sector: 33824. This session: NewSectorsReadOK=33808, ReadErrors=16
+Current sector: 33840. This session: NewSectorsReadOK=33824, ReadErrors=16
+Current sector: 33856. This session: NewSectorsReadOK=33840, ReadErrors=16
+Current sector: 33872. This session: NewSectorsReadOK=33856, ReadErrors=16
+Current sector: 33888. This session: NewSectorsReadOK=33872, ReadErrors=16
+Current sector: 33904. This session: NewSectorsReadOK=33888, ReadErrors=16
+Current sector: 33920. This session: NewSectorsReadOK=33904, ReadErrors=16
+Current sector: 33936. This session: NewSectorsReadOK=33920, ReadErrors=16
+Current sector: 33952. This session: NewSectorsReadOK=33936, ReadErrors=16
+Current sector: 33968. This session: NewSectorsReadOK=33952, ReadErrors=16
+Current sector: 33984. This session: NewSectorsReadOK=33968, ReadErrors=16
+Current sector: 34000. This session: NewSectorsReadOK=33984, ReadErrors=16
+Current sector: 34016. This session: NewSectorsReadOK=34000, ReadErrors=16
+Current sector: 34032. This session: NewSectorsReadOK=34016, ReadErrors=16
+Current sector: 34048. This session: NewSectorsReadOK=34032, ReadErrors=16
+Current sector: 34064. This session: NewSectorsReadOK=34048, ReadErrors=16
+Current sector: 34080. This session: NewSectorsReadOK=34064, ReadErrors=16
+Current sector: 34096. This session: NewSectorsReadOK=34080, ReadErrors=16
+Current sector: 34112. This session: NewSectorsReadOK=34096, ReadErrors=16
+Current sector: 34128. This session: NewSectorsReadOK=34112, ReadErrors=16
+Current sector: 34144. This session: NewSectorsReadOK=34128, ReadErrors=16
+Current sector: 34160. This session: NewSectorsReadOK=34144, ReadErrors=16
+Current sector: 34176. This session: NewSectorsReadOK=34160, ReadErrors=16
+Current sector: 34192. This session: NewSectorsReadOK=34176, ReadErrors=16
+Current sector: 34208. This session: NewSectorsReadOK=34192, ReadErrors=16
+Current sector: 34224. This session: NewSectorsReadOK=34208, ReadErrors=16
+Current sector: 34240. This session: NewSectorsReadOK=34224, ReadErrors=16
+Current sector: 34256. This session: NewSectorsReadOK=34240, ReadErrors=16
+Current sector: 34272. This session: NewSectorsReadOK=34256, ReadErrors=16
+Current sector: 34288. This session: NewSectorsReadOK=34272, ReadErrors=16
+Current sector: 34304. This session: NewSectorsReadOK=34288, ReadErrors=16
+Current sector: 34320. This session: NewSectorsReadOK=34304, ReadErrors=16
+Current sector: 34336. This session: NewSectorsReadOK=34320, ReadErrors=16
+Current sector: 34352. This session: NewSectorsReadOK=34336, ReadErrors=16
+Current sector: 34368. This session: NewSectorsReadOK=34352, ReadErrors=16
+Current sector: 34384. This session: NewSectorsReadOK=34368, ReadErrors=16
+Current sector: 34400. This session: NewSectorsReadOK=34384, ReadErrors=16
+Current sector: 34416. This session: NewSectorsReadOK=34400, ReadErrors=16
+Current sector: 34432. This session: NewSectorsReadOK=34416, ReadErrors=16
+Current sector: 34448. This session: NewSectorsReadOK=34432, ReadErrors=16
+Current sector: 34464. This session: NewSectorsReadOK=34448, ReadErrors=16
+Current sector: 34480. This session: NewSectorsReadOK=34464, ReadErrors=16
+Current sector: 34496. This session: NewSectorsReadOK=34480, ReadErrors=16
+Current sector: 34512. This session: NewSectorsReadOK=34496, ReadErrors=16
+Current sector: 34528. This session: NewSectorsReadOK=34512, ReadErrors=16
+Current sector: 34544. This session: NewSectorsReadOK=34528, ReadErrors=16
+Current sector: 34560. This session: NewSectorsReadOK=34544, ReadErrors=16
+Current sector: 34576. This session: NewSectorsReadOK=34560, ReadErrors=16
+Current sector: 34592. This session: NewSectorsReadOK=34576, ReadErrors=16
+Current sector: 34608. This session: NewSectorsReadOK=34592, ReadErrors=16
+Current sector: 34624. This session: NewSectorsReadOK=34608, ReadErrors=16
+Current sector: 34640. This session: NewSectorsReadOK=34624, ReadErrors=16
+Current sector: 34656. This session: NewSectorsReadOK=34640, ReadErrors=16
+Current sector: 34672. This session: NewSectorsReadOK=34656, ReadErrors=16
+Current sector: 34688. This session: NewSectorsReadOK=34672, ReadErrors=16
+Current sector: 34704. This session: NewSectorsReadOK=34688, ReadErrors=16
+Current sector: 34720. This session: NewSectorsReadOK=34704, ReadErrors=16
+Current sector: 34736. This session: NewSectorsReadOK=34720, ReadErrors=16
+Current sector: 34752. This session: NewSectorsReadOK=34736, ReadErrors=16
+Current sector: 34768. This session: NewSectorsReadOK=34752, ReadErrors=16
+Current sector: 34784. This session: NewSectorsReadOK=34768, ReadErrors=16
+Current sector: 34800. This session: NewSectorsReadOK=34784, ReadErrors=16
+Current sector: 34816. This session: NewSectorsReadOK=34800, ReadErrors=16
+Current sector: 34832. This session: NewSectorsReadOK=34816, ReadErrors=16
+Current sector: 34848. This session: NewSectorsReadOK=34832, ReadErrors=16
+Current sector: 34864. This session: NewSectorsReadOK=34848, ReadErrors=16
+Current sector: 34880. This session: NewSectorsReadOK=34864, ReadErrors=16
+Current sector: 34896. This session: NewSectorsReadOK=34880, ReadErrors=16
+Current sector: 34912. This session: NewSectorsReadOK=34896, ReadErrors=16
+Current sector: 34928. This session: NewSectorsReadOK=34912, ReadErrors=16
+Current sector: 34929. This session: NewSectorsReadOK=34913, ReadErrors=16
+Current sector: 34930. This session: NewSectorsReadOK=34914, ReadErrors=16
+Current sector: 34931. This session: NewSectorsReadOK=34915, ReadErrors=16
+Current sector: 34932. This session: NewSectorsReadOK=34916, ReadErrors=16
 
 16 unreadable sectors.
 CrcBuf contents, image path none (medium):

regtest/database/RS02_read_modulo_glitch3

@@ -116,34 +116,177 @@ Reading CRC information from ecc data (RS02) ... RS02LayoutFromImage(): returnin
 done.
 Sector 357520, try 1: Illegal Request; Logical block address out of range.
 Sector 357520: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357521. This session: NewSectorsReadOK=357520, ReadErrors=1
+Current sector: 357522. This session: NewSectorsReadOK=357520, ReadErrors=2
+Current sector: 357523. This session: NewSectorsReadOK=357520, ReadErrors=3
+Current sector: 357524. This session: NewSectorsReadOK=357520, ReadErrors=4
+Current sector: 357525. This session: NewSectorsReadOK=357520, ReadErrors=5
+Current sector: 357526. This session: NewSectorsReadOK=357520, ReadErrors=6
+Current sector: 357527. This session: NewSectorsReadOK=357520, ReadErrors=7
+Current sector: 357528. This session: NewSectorsReadOK=357520, ReadErrors=8
+Current sector: 357529. This session: NewSectorsReadOK=357520, ReadErrors=9
+Current sector: 357530. This session: NewSectorsReadOK=357520, ReadErrors=10
+Current sector: 357531. This session: NewSectorsReadOK=357520, ReadErrors=11
+Current sector: 357532. This session: NewSectorsReadOK=357520, ReadErrors=12
+Current sector: 357533. This session: NewSectorsReadOK=357520, ReadErrors=13
+Current sector: 357534. This session: NewSectorsReadOK=357520, ReadErrors=14
+Current sector: 357535. This session: NewSectorsReadOK=357520, ReadErrors=15
+Current sector: 357536. This session: NewSectorsReadOK=357520, ReadErrors=16
+Current sector: 357536. This session: NewSectorsReadOK=357520, ReadErrors=16
 Sector 357536, try 1: Illegal Request; Logical block address out of range.
 Sector 357536: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357537. This session: NewSectorsReadOK=357520, ReadErrors=17
+Current sector: 357538. This session: NewSectorsReadOK=357520, ReadErrors=18
+Current sector: 357539. This session: NewSectorsReadOK=357520, ReadErrors=19
+Current sector: 357540. This session: NewSectorsReadOK=357520, ReadErrors=20
+Current sector: 357541. This session: NewSectorsReadOK=357520, ReadErrors=21
+Current sector: 357542. This session: NewSectorsReadOK=357520, ReadErrors=22
+Current sector: 357543. This session: NewSectorsReadOK=357520, ReadErrors=23
+Current sector: 357544. This session: NewSectorsReadOK=357520, ReadErrors=24
+Current sector: 357545. This session: NewSectorsReadOK=357520, ReadErrors=25
+Current sector: 357546. This session: NewSectorsReadOK=357520, ReadErrors=26
+Current sector: 357547. This session: NewSectorsReadOK=357520, ReadErrors=27
+Current sector: 357548. This session: NewSectorsReadOK=357520, ReadErrors=28
+Current sector: 357549. This session: NewSectorsReadOK=357520, ReadErrors=29
+Current sector: 357550. This session: NewSectorsReadOK=357520, ReadErrors=30
+Current sector: 357551. This session: NewSectorsReadOK=357520, ReadErrors=31
+Current sector: 357552. This session: NewSectorsReadOK=357520, ReadErrors=32
+Current sector: 357552. This session: NewSectorsReadOK=357520, ReadErrors=32
 Sector 357552, try 1: Illegal Request; Logical block address out of range.
 Sector 357552: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357553. This session: NewSectorsReadOK=357520, ReadErrors=33
+Current sector: 357554. This session: NewSectorsReadOK=357520, ReadErrors=34
+Current sector: 357555. This session: NewSectorsReadOK=357520, ReadErrors=35
+Current sector: 357556. This session: NewSectorsReadOK=357520, ReadErrors=36
+Current sector: 357557. This session: NewSectorsReadOK=357520, ReadErrors=37
+Current sector: 357558. This session: NewSectorsReadOK=357520, ReadErrors=38
+Current sector: 357559. This session: NewSectorsReadOK=357520, ReadErrors=39
+Current sector: 357560. This session: NewSectorsReadOK=357520, ReadErrors=40
+Current sector: 357561. This session: NewSectorsReadOK=357520, ReadErrors=41
+Current sector: 357562. This session: NewSectorsReadOK=357520, ReadErrors=42
+Current sector: 357563. This session: NewSectorsReadOK=357520, ReadErrors=43
+Current sector: 357564. This session: NewSectorsReadOK=357520, ReadErrors=44
+Current sector: 357565. This session: NewSectorsReadOK=357520, ReadErrors=45
+Current sector: 357566. This session: NewSectorsReadOK=357520, ReadErrors=46
+Current sector: 357567. This session: NewSectorsReadOK=357520, ReadErrors=47
+Current sector: 357568. This session: NewSectorsReadOK=357520, ReadErrors=48
+Current sector: 357568. This session: NewSectorsReadOK=357520, ReadErrors=48
 Sector 357568, try 1: Illegal Request; Logical block address out of range.
 Sector 357568: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357569. This session: NewSectorsReadOK=357520, ReadErrors=49
+Current sector: 357570. This session: NewSectorsReadOK=357520, ReadErrors=50
+Current sector: 357571. This session: NewSectorsReadOK=357520, ReadErrors=51
+Current sector: 357572. This session: NewSectorsReadOK=357520, ReadErrors=52
+Current sector: 357573. This session: NewSectorsReadOK=357520, ReadErrors=53
+Current sector: 357574. This session: NewSectorsReadOK=357520, ReadErrors=54
+Current sector: 357575. This session: NewSectorsReadOK=357520, ReadErrors=55
+Current sector: 357576. This session: NewSectorsReadOK=357520, ReadErrors=56
+Current sector: 357577. This session: NewSectorsReadOK=357520, ReadErrors=57
+Current sector: 357578. This session: NewSectorsReadOK=357520, ReadErrors=58
+Current sector: 357579. This session: NewSectorsReadOK=357520, ReadErrors=59
+Current sector: 357580. This session: NewSectorsReadOK=357520, ReadErrors=60
+Current sector: 357581. This session: NewSectorsReadOK=357520, ReadErrors=61
+Current sector: 357582. This session: NewSectorsReadOK=357520, ReadErrors=62
+Current sector: 357583. This session: NewSectorsReadOK=357520, ReadErrors=63
+Current sector: 357584. This session: NewSectorsReadOK=357520, ReadErrors=64
+Current sector: 357584. This session: NewSectorsReadOK=357520, ReadErrors=64
 Sector 357584, try 1: Illegal Request; Logical block address out of range.
 Sector 357584: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357585. This session: NewSectorsReadOK=357520, ReadErrors=65
+Current sector: 357586. This session: NewSectorsReadOK=357520, ReadErrors=66
+Current sector: 357587. This session: NewSectorsReadOK=357520, ReadErrors=67
+Current sector: 357588. This session: NewSectorsReadOK=357520, ReadErrors=68
+Current sector: 357589. This session: NewSectorsReadOK=357520, ReadErrors=69
+Current sector: 357590. This session: NewSectorsReadOK=357520, ReadErrors=70
+Current sector: 357591. This session: NewSectorsReadOK=357520, ReadErrors=71
+Current sector: 357592. This session: NewSectorsReadOK=357520, ReadErrors=72
+Current sector: 357593. This session: NewSectorsReadOK=357520, ReadErrors=73
+Current sector: 357594. This session: NewSectorsReadOK=357520, ReadErrors=74
+Current sector: 357595. This session: NewSectorsReadOK=357520, ReadErrors=75
+Current sector: 357596. This session: NewSectorsReadOK=357520, ReadErrors=76
+Current sector: 357597. This session: NewSectorsReadOK=357520, ReadErrors=77
+Current sector: 357598. This session: NewSectorsReadOK=357520, ReadErrors=78
+Current sector: 357599. This session: NewSectorsReadOK=357520, ReadErrors=79
+Current sector: 357600. This session: NewSectorsReadOK=357520, ReadErrors=80
+Current sector: 357600. This session: NewSectorsReadOK=357520, ReadErrors=80
 Sector 357600, try 1: Illegal Request; Logical block address out of range.
 Sector 357600: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357601. This session: NewSectorsReadOK=357520, ReadErrors=81
+Current sector: 357602. This session: NewSectorsReadOK=357520, ReadErrors=82
+Current sector: 357603. This session: NewSectorsReadOK=357520, ReadErrors=83
+Current sector: 357604. This session: NewSectorsReadOK=357520, ReadErrors=84
+Current sector: 357605. This session: NewSectorsReadOK=357520, ReadErrors=85
+Current sector: 357606. This session: NewSectorsReadOK=357520, ReadErrors=86
+Current sector: 357607. This session: NewSectorsReadOK=357520, ReadErrors=87
+Current sector: 357608. This session: NewSectorsReadOK=357520, ReadErrors=88
+Current sector: 357609. This session: NewSectorsReadOK=357520, ReadErrors=89
+Current sector: 357610. This session: NewSectorsReadOK=357520, ReadErrors=90
+Current sector: 357611. This session: NewSectorsReadOK=357520, ReadErrors=91
+Current sector: 357612. This session: NewSectorsReadOK=357520, ReadErrors=92
+Current sector: 357613. This session: NewSectorsReadOK=357520, ReadErrors=93
+Current sector: 357614. This session: NewSectorsReadOK=357520, ReadErrors=94
+Current sector: 357615. This session: NewSectorsReadOK=357520, ReadErrors=95
+Current sector: 357616. This session: NewSectorsReadOK=357520, ReadErrors=96
+Current sector: 357616. This session: NewSectorsReadOK=357520, ReadErrors=96
 Sector 357616, try 1: Illegal Request; Logical block address out of range.
 Sector 357616: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357617. This session: NewSectorsReadOK=357520, ReadErrors=97
+Current sector: 357618. This session: NewSectorsReadOK=357520, ReadErrors=98
+Current sector: 357619. This session: NewSectorsReadOK=357520, ReadErrors=99
+Current sector: 357620. This session: NewSectorsReadOK=357520, ReadErrors=100
+Current sector: 357621. This session: NewSectorsReadOK=357520, ReadErrors=101
+Current sector: 357622. This session: NewSectorsReadOK=357520, ReadErrors=102
+Current sector: 357623. This session: NewSectorsReadOK=357520, ReadErrors=103
+Current sector: 357624. This session: NewSectorsReadOK=357520, ReadErrors=104
+Current sector: 357625. This session: NewSectorsReadOK=357520, ReadErrors=105
+Current sector: 357626. This session: NewSectorsReadOK=357520, ReadErrors=106
+Current sector: 357627. This session: NewSectorsReadOK=357520, ReadErrors=107
+Current sector: 357628. This session: NewSectorsReadOK=357520, ReadErrors=108
+Current sector: 357629. This session: NewSectorsReadOK=357520, ReadErrors=109
+Current sector: 357630. This session: NewSectorsReadOK=357520, ReadErrors=110
+Current sector: 357631. This session: NewSectorsReadOK=357520, ReadErrors=111
+Current sector: 357632. This session: NewSectorsReadOK=357520, ReadErrors=112
+Current sector: 357632. This session: NewSectorsReadOK=357520, ReadErrors=112
 Sector 357632, try 1: Illegal Request; Logical block address out of range.
 Sector 357632: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357633. This session: NewSectorsReadOK=357520, ReadErrors=113
+Current sector: 357634. This session: NewSectorsReadOK=357520, ReadErrors=114
+Current sector: 357635. This session: NewSectorsReadOK=357520, ReadErrors=115
+Current sector: 357636. This session: NewSectorsReadOK=357520, ReadErrors=116
+Current sector: 357637. This session: NewSectorsReadOK=357520, ReadErrors=117
+Current sector: 357638. This session: NewSectorsReadOK=357520, ReadErrors=118
+Current sector: 357639. This session: NewSectorsReadOK=357520, ReadErrors=119
+Current sector: 357640. This session: NewSectorsReadOK=357520, ReadErrors=120
+Current sector: 357641. This session: NewSectorsReadOK=357520, ReadErrors=121
+Current sector: 357642. This session: NewSectorsReadOK=357520, ReadErrors=122
+Current sector: 357643. This session: NewSectorsReadOK=357520, ReadErrors=123
+Current sector: 357644. This session: NewSectorsReadOK=357520, ReadErrors=124
+Current sector: 357645. This session: NewSectorsReadOK=357520, ReadErrors=125
+Current sector: 357646. This session: NewSectorsReadOK=357520, ReadErrors=126
+Current sector: 357647. This session: NewSectorsReadOK=357520, ReadErrors=127
+Current sector: 357648. This session: NewSectorsReadOK=357520, ReadErrors=128
+Current sector: 357648. This session: NewSectorsReadOK=357520, ReadErrors=128
 Sector 357648, try 1: Illegal Request; Logical block address out of range.
 Sector 357648: Illegal Request; Logical block address out of range.
+Current sector: 357649. This session: NewSectorsReadOK=357520, ReadErrors=129
 Sector 357649, try 1: Illegal Request; Logical block address out of range.
 Sector 357649: Illegal Request; Logical block address out of range.
+Current sector: 357650. This session: NewSectorsReadOK=357520, ReadErrors=130
 Sector 357650, try 1: Illegal Request; Logical block address out of range.
 Sector 357650: Illegal Request; Logical block address out of range.
+Current sector: 357651. This session: NewSectorsReadOK=357520, ReadErrors=131
 Sector 357651, try 1: Illegal Request; Logical block address out of range.
 Sector 357651: Illegal Request; Logical block address out of range.
+Current sector: 357652. This session: NewSectorsReadOK=357520, ReadErrors=132
 Sector 357652, try 1: Illegal Request; Logical block address out of range.
 Sector 357652: Illegal Request; Logical block address out of range.
+Current sector: 357653. This session: NewSectorsReadOK=357520, ReadErrors=133
 Sector 357653, try 1: Illegal Request; Logical block address out of range.
 Sector 357653: Illegal Request; Logical block address out of range.
+Current sector: 357654. This session: NewSectorsReadOK=357520, ReadErrors=134
 Sector 357654, try 1: Illegal Request; Logical block address out of range.
 Sector 357654: Illegal Request; Logical block address out of range.
+Current sector: 357655. This session: NewSectorsReadOK=357520, ReadErrors=135
 
 135 unreadable sectors.
 CrcBuf contents, image path none (medium):

regtest/database/RS02_read_shorter

@@ -114,18 +114,73 @@ Reading CRC information from ecc data (RS02) ... RS02LayoutFromImage(): returnin
 done.
 Sector 34880, try 1: Illegal Request; Logical block address out of range.
 Sector 34880: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 34881. This session: NewSectorsReadOK=34880, ReadErrors=1
+Current sector: 34882. This session: NewSectorsReadOK=34880, ReadErrors=2
+Current sector: 34883. This session: NewSectorsReadOK=34880, ReadErrors=3
+Current sector: 34884. This session: NewSectorsReadOK=34880, ReadErrors=4
+Current sector: 34885. This session: NewSectorsReadOK=34880, ReadErrors=5
+Current sector: 34886. This session: NewSectorsReadOK=34880, ReadErrors=6
+Current sector: 34887. This session: NewSectorsReadOK=34880, ReadErrors=7
+Current sector: 34888. This session: NewSectorsReadOK=34880, ReadErrors=8
+Current sector: 34889. This session: NewSectorsReadOK=34880, ReadErrors=9
+Current sector: 34890. This session: NewSectorsReadOK=34880, ReadErrors=10
+Current sector: 34891. This session: NewSectorsReadOK=34880, ReadErrors=11
+Current sector: 34892. This session: NewSectorsReadOK=34880, ReadErrors=12
+Current sector: 34893. This session: NewSectorsReadOK=34880, ReadErrors=13
+Current sector: 34894. This session: NewSectorsReadOK=34880, ReadErrors=14
+Current sector: 34895. This session: NewSectorsReadOK=34880, ReadErrors=15
+Current sector: 34896. This session: NewSectorsReadOK=34880, ReadErrors=16
+Current sector: 34896. This session: NewSectorsReadOK=34880, ReadErrors=16
 Sector 34896, try 1: Illegal Request; Logical block address out of range.
 Sector 34896: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 34897. This session: NewSectorsReadOK=34880, ReadErrors=17
+Current sector: 34898. This session: NewSectorsReadOK=34880, ReadErrors=18
+Current sector: 34899. This session: NewSectorsReadOK=34880, ReadErrors=19
+Current sector: 34900. This session: NewSectorsReadOK=34880, ReadErrors=20
+Current sector: 34901. This session: NewSectorsReadOK=34880, ReadErrors=21
+Current sector: 34902. This session: NewSectorsReadOK=34880, ReadErrors=22
+Current sector: 34903. This session: NewSectorsReadOK=34880, ReadErrors=23
+Current sector: 34904. This session: NewSectorsReadOK=34880, ReadErrors=24
+Current sector: 34905. This session: NewSectorsReadOK=34880, ReadErrors=25
+Current sector: 34906. This session: NewSectorsReadOK=34880, ReadErrors=26
+Current sector: 34907. This session: NewSectorsReadOK=34880, ReadErrors=27
+Current sector: 34908. This session: NewSectorsReadOK=34880, ReadErrors=28
+Current sector: 34909. This session: NewSectorsReadOK=34880, ReadErrors=29
+Current sector: 34910. This session: NewSectorsReadOK=34880, ReadErrors=30
+Current sector: 34911. This session: NewSectorsReadOK=34880, ReadErrors=31
+Current sector: 34912. This session: NewSectorsReadOK=34880, ReadErrors=32
+Current sector: 34912. This session: NewSectorsReadOK=34880, ReadErrors=32
 Sector 34912, try 1: Illegal Request; Logical block address out of range.
 Sector 34912: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 34913. This session: NewSectorsReadOK=34880, ReadErrors=33
+Current sector: 34914. This session: NewSectorsReadOK=34880, ReadErrors=34
+Current sector: 34915. This session: NewSectorsReadOK=34880, ReadErrors=35
+Current sector: 34916. This session: NewSectorsReadOK=34880, ReadErrors=36
+Current sector: 34917. This session: NewSectorsReadOK=34880, ReadErrors=37
+Current sector: 34918. This session: NewSectorsReadOK=34880, ReadErrors=38
+Current sector: 34919. This session: NewSectorsReadOK=34880, ReadErrors=39
+Current sector: 34920. This session: NewSectorsReadOK=34880, ReadErrors=40
+Current sector: 34921. This session: NewSectorsReadOK=34880, ReadErrors=41
+Current sector: 34922. This session: NewSectorsReadOK=34880, ReadErrors=42
+Current sector: 34923. This session: NewSectorsReadOK=34880, ReadErrors=43
+Current sector: 34924. This session: NewSectorsReadOK=34880, ReadErrors=44
+Current sector: 34925. This session: NewSectorsReadOK=34880, ReadErrors=45
+Current sector: 34926. This session: NewSectorsReadOK=34880, ReadErrors=46
+Current sector: 34927. This session: NewSectorsReadOK=34880, ReadErrors=47
+Current sector: 34928. This session: NewSectorsReadOK=34880, ReadErrors=48
+Current sector: 34928. This session: NewSectorsReadOK=34880, ReadErrors=48
 Sector 34928, try 1: Illegal Request; Logical block address out of range.
 Sector 34928: Illegal Request; Logical block address out of range.
+Current sector: 34929. This session: NewSectorsReadOK=34880, ReadErrors=49
 Sector 34929, try 1: Illegal Request; Logical block address out of range.
 Sector 34929: Illegal Request; Logical block address out of range.
+Current sector: 34930. This session: NewSectorsReadOK=34880, ReadErrors=50
 Sector 34930, try 1: Illegal Request; Logical block address out of range.
 Sector 34930: Illegal Request; Logical block address out of range.
+Current sector: 34931. This session: NewSectorsReadOK=34880, ReadErrors=51
 Sector 34931, try 1: Illegal Request; Logical block address out of range.
 Sector 34931: Illegal Request; Logical block address out of range.
+Current sector: 34932. This session: NewSectorsReadOK=34880, ReadErrors=52
 
 52 unreadable sectors.
 CrcBuf contents, image path none (medium):

regtest/database/RS02_scan_modulo_glitch3

@@ -116,34 +116,177 @@ Reading CRC information from ecc data (RS02) ... RS02LayoutFromImage(): returnin
 done.
 Sector 357520, try 1: Illegal Request; Logical block address out of range.
 Sector 357520: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357521. This session: NewSectorsReadOK=357520, ReadErrors=1
+Current sector: 357522. This session: NewSectorsReadOK=357520, ReadErrors=2
+Current sector: 357523. This session: NewSectorsReadOK=357520, ReadErrors=3
+Current sector: 357524. This session: NewSectorsReadOK=357520, ReadErrors=4
+Current sector: 357525. This session: NewSectorsReadOK=357520, ReadErrors=5
+Current sector: 357526. This session: NewSectorsReadOK=357520, ReadErrors=6
+Current sector: 357527. This session: NewSectorsReadOK=357520, ReadErrors=7
+Current sector: 357528. This session: NewSectorsReadOK=357520, ReadErrors=8
+Current sector: 357529. This session: NewSectorsReadOK=357520, ReadErrors=9
+Current sector: 357530. This session: NewSectorsReadOK=357520, ReadErrors=10
+Current sector: 357531. This session: NewSectorsReadOK=357520, ReadErrors=11
+Current sector: 357532. This session: NewSectorsReadOK=357520, ReadErrors=12
+Current sector: 357533. This session: NewSectorsReadOK=357520, ReadErrors=13
+Current sector: 357534. This session: NewSectorsReadOK=357520, ReadErrors=14
+Current sector: 357535. This session: NewSectorsReadOK=357520, ReadErrors=15
+Current sector: 357536. This session: NewSectorsReadOK=357520, ReadErrors=16
+Current sector: 357536. This session: NewSectorsReadOK=357520, ReadErrors=16
 Sector 357536, try 1: Illegal Request; Logical block address out of range.
 Sector 357536: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357537. This session: NewSectorsReadOK=357520, ReadErrors=17
+Current sector: 357538. This session: NewSectorsReadOK=357520, ReadErrors=18
+Current sector: 357539. This session: NewSectorsReadOK=357520, ReadErrors=19
+Current sector: 357540. This session: NewSectorsReadOK=357520, ReadErrors=20
+Current sector: 357541. This session: NewSectorsReadOK=357520, ReadErrors=21
+Current sector: 357542. This session: NewSectorsReadOK=357520, ReadErrors=22
+Current sector: 357543. This session: NewSectorsReadOK=357520, ReadErrors=23
+Current sector: 357544. This session: NewSectorsReadOK=357520, ReadErrors=24
+Current sector: 357545. This session: NewSectorsReadOK=357520, ReadErrors=25
+Current sector: 357546. This session: NewSectorsReadOK=357520, ReadErrors=26
+Current sector: 357547. This session: NewSectorsReadOK=357520, ReadErrors=27
+Current sector: 357548. This session: NewSectorsReadOK=357520, ReadErrors=28
+Current sector: 357549. This session: NewSectorsReadOK=357520, ReadErrors=29
+Current sector: 357550. This session: NewSectorsReadOK=357520, ReadErrors=30
+Current sector: 357551. This session: NewSectorsReadOK=357520, ReadErrors=31
+Current sector: 357552. This session: NewSectorsReadOK=357520, ReadErrors=32
+Current sector: 357552. This session: NewSectorsReadOK=357520, ReadErrors=32
 Sector 357552, try 1: Illegal Request; Logical block address out of range.
 Sector 357552: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357553. This session: NewSectorsReadOK=357520, ReadErrors=33
+Current sector: 357554. This session: NewSectorsReadOK=357520, ReadErrors=34
+Current sector: 357555. This session: NewSectorsReadOK=357520, ReadErrors=35
+Current sector: 357556. This session: NewSectorsReadOK=357520, ReadErrors=36
+Current sector: 357557. This session: NewSectorsReadOK=357520, ReadErrors=37
+Current sector: 357558. This session: NewSectorsReadOK=357520, ReadErrors=38
+Current sector: 357559. This session: NewSectorsReadOK=357520, ReadErrors=39
+Current sector: 357560. This session: NewSectorsReadOK=357520, ReadErrors=40
+Current sector: 357561. This session: NewSectorsReadOK=357520, ReadErrors=41
+Current sector: 357562. This session: NewSectorsReadOK=357520, ReadErrors=42
+Current sector: 357563. This session: NewSectorsReadOK=357520, ReadErrors=43
+Current sector: 357564. This session: NewSectorsReadOK=357520, ReadErrors=44
+Current sector: 357565. This session: NewSectorsReadOK=357520, ReadErrors=45
+Current sector: 357566. This session: NewSectorsReadOK=357520, ReadErrors=46
+Current sector: 357567. This session: NewSectorsReadOK=357520, ReadErrors=47
+Current sector: 357568. This session: NewSectorsReadOK=357520, ReadErrors=48
+Current sector: 357568. This session: NewSectorsReadOK=357520, ReadErrors=48
 Sector 357568, try 1: Illegal Request; Logical block address out of range.
 Sector 357568: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357569. This session: NewSectorsReadOK=357520, ReadErrors=49
+Current sector: 357570. This session: NewSectorsReadOK=357520, ReadErrors=50
+Current sector: 357571. This session: NewSectorsReadOK=357520, ReadErrors=51
+Current sector: 357572. This session: NewSectorsReadOK=357520, ReadErrors=52
+Current sector: 357573. This session: NewSectorsReadOK=357520, ReadErrors=53
+Current sector: 357574. This session: NewSectorsReadOK=357520, ReadErrors=54
+Current sector: 357575. This session: NewSectorsReadOK=357520, ReadErrors=55
+Current sector: 357576. This session: NewSectorsReadOK=357520, ReadErrors=56
+Current sector: 357577. This session: NewSectorsReadOK=357520, ReadErrors=57
+Current sector: 357578. This session: NewSectorsReadOK=357520, ReadErrors=58
+Current sector: 357579. This session: NewSectorsReadOK=357520, ReadErrors=59
+Current sector: 357580. This session: NewSectorsReadOK=357520, ReadErrors=60
+Current sector: 357581. This session: NewSectorsReadOK=357520, ReadErrors=61
+Current sector: 357582. This session: NewSectorsReadOK=357520, ReadErrors=62
+Current sector: 357583. This session: NewSectorsReadOK=357520, ReadErrors=63
+Current sector: 357584. This session: NewSectorsReadOK=357520, ReadErrors=64
+Current sector: 357584. This session: NewSectorsReadOK=357520, ReadErrors=64
 Sector 357584, try 1: Illegal Request; Logical block address out of range.
 Sector 357584: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357585. This session: NewSectorsReadOK=357520, ReadErrors=65
+Current sector: 357586. This session: NewSectorsReadOK=357520, ReadErrors=66
+Current sector: 357587. This session: NewSectorsReadOK=357520, ReadErrors=67
+Current sector: 357588. This session: NewSectorsReadOK=357520, ReadErrors=68
+Current sector: 357589. This session: NewSectorsReadOK=357520, ReadErrors=69
+Current sector: 357590. This session: NewSectorsReadOK=357520, ReadErrors=70
+Current sector: 357591. This session: NewSectorsReadOK=357520, ReadErrors=71
+Current sector: 357592. This session: NewSectorsReadOK=357520, ReadErrors=72
+Current sector: 357593. This session: NewSectorsReadOK=357520, ReadErrors=73
+Current sector: 357594. This session: NewSectorsReadOK=357520, ReadErrors=74
+Current sector: 357595. This session: NewSectorsReadOK=357520, ReadErrors=75
+Current sector: 357596. This session: NewSectorsReadOK=357520, ReadErrors=76
+Current sector: 357597. This session: NewSectorsReadOK=357520, ReadErrors=77
+Current sector: 357598. This session: NewSectorsReadOK=357520, ReadErrors=78
+Current sector: 357599. This session: NewSectorsReadOK=357520, ReadErrors=79
+Current sector: 357600. This session: NewSectorsReadOK=357520, ReadErrors=80
+Current sector: 357600. This session: NewSectorsReadOK=357520, ReadErrors=80
 Sector 357600, try 1: Illegal Request; Logical block address out of range.
 Sector 357600: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357601. This session: NewSectorsReadOK=357520, ReadErrors=81
+Current sector: 357602. This session: NewSectorsReadOK=357520, ReadErrors=82
+Current sector: 357603. This session: NewSectorsReadOK=357520, ReadErrors=83
+Current sector: 357604. This session: NewSectorsReadOK=357520, ReadErrors=84
+Current sector: 357605. This session: NewSectorsReadOK=357520, ReadErrors=85
+Current sector: 357606. This session: NewSectorsReadOK=357520, ReadErrors=86
+Current sector: 357607. This session: NewSectorsReadOK=357520, ReadErrors=87
+Current sector: 357608. This session: NewSectorsReadOK=357520, ReadErrors=88
+Current sector: 357609. This session: NewSectorsReadOK=357520, ReadErrors=89
+Current sector: 357610. This session: NewSectorsReadOK=357520, ReadErrors=90
+Current sector: 357611. This session: NewSectorsReadOK=357520, ReadErrors=91
+Current sector: 357612. This session: NewSectorsReadOK=357520, ReadErrors=92
+Current sector: 357613. This session: NewSectorsReadOK=357520, ReadErrors=93
+Current sector: 357614. This session: NewSectorsReadOK=357520, ReadErrors=94
+Current sector: 357615. This session: NewSectorsReadOK=357520, ReadErrors=95
+Current sector: 357616. This session: NewSectorsReadOK=357520, ReadErrors=96
+Current sector: 357616. This session: NewSectorsReadOK=357520, ReadErrors=96
 Sector 357616, try 1: Illegal Request; Logical block address out of range.
 Sector 357616: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357617. This session: NewSectorsReadOK=357520, ReadErrors=97
+Current sector: 357618. This session: NewSectorsReadOK=357520, ReadErrors=98
+Current sector: 357619. This session: NewSectorsReadOK=357520, ReadErrors=99
+Current sector: 357620. This session: NewSectorsReadOK=357520, ReadErrors=100
+Current sector: 357621. This session: NewSectorsReadOK=357520, ReadErrors=101
+Current sector: 357622. This session: NewSectorsReadOK=357520, ReadErrors=102
+Current sector: 357623. This session: NewSectorsReadOK=357520, ReadErrors=103
+Current sector: 357624. This session: NewSectorsReadOK=357520, ReadErrors=104
+Current sector: 357625. This session: NewSectorsReadOK=357520, ReadErrors=105
+Current sector: 357626. This session: NewSectorsReadOK=357520, ReadErrors=106
+Current sector: 357627. This session: NewSectorsReadOK=357520, ReadErrors=107
+Current sector: 357628. This session: NewSectorsReadOK=357520, ReadErrors=108
+Current sector: 357629. This session: NewSectorsReadOK=357520, ReadErrors=109
+Current sector: 357630. This session: NewSectorsReadOK=357520, ReadErrors=110
+Current sector: 357631. This session: NewSectorsReadOK=357520, ReadErrors=111
+Current sector: 357632. This session: NewSectorsReadOK=357520, ReadErrors=112
+Current sector: 357632. This session: NewSectorsReadOK=357520, ReadErrors=112
 Sector 357632, try 1: Illegal Request; Logical block address out of range.
 Sector 357632: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 357633. This session: NewSectorsReadOK=357520, ReadErrors=113
+Current sector: 357634. This session: NewSectorsReadOK=357520, ReadErrors=114
+Current sector: 357635. This session: NewSectorsReadOK=357520, ReadErrors=115
+Current sector: 357636. This session: NewSectorsReadOK=357520, ReadErrors=116
+Current sector: 357637. This session: NewSectorsReadOK=357520, ReadErrors=117
+Current sector: 357638. This session: NewSectorsReadOK=357520, ReadErrors=118
+Current sector: 357639. This session: NewSectorsReadOK=357520, ReadErrors=119
+Current sector: 357640. This session: NewSectorsReadOK=357520, ReadErrors=120
+Current sector: 357641. This session: NewSectorsReadOK=357520, ReadErrors=121
+Current sector: 357642. This session: NewSectorsReadOK=357520, ReadErrors=122
+Current sector: 357643. This session: NewSectorsReadOK=357520, ReadErrors=123
+Current sector: 357644. This session: NewSectorsReadOK=357520, ReadErrors=124
+Current sector: 357645. This session: NewSectorsReadOK=357520, ReadErrors=125
+Current sector: 357646. This session: NewSectorsReadOK=357520, ReadErrors=126
+Current sector: 357647. This session: NewSectorsReadOK=357520, ReadErrors=127
+Current sector: 357648. This session: NewSectorsReadOK=357520, ReadErrors=128
+Current sector: 357648. This session: NewSectorsReadOK=357520, ReadErrors=128
 Sector 357648, try 1: Illegal Request; Logical block address out of range.
 Sector 357648: Illegal Request; Logical block address out of range.
+Current sector: 357649. This session: NewSectorsReadOK=357520, ReadErrors=129
 Sector 357649, try 1: Illegal Request; Logical block address out of range.
 Sector 357649: Illegal Request; Logical block address out of range.
+Current sector: 357650. This session: NewSectorsReadOK=357520, ReadErrors=130
 Sector 357650, try 1: Illegal Request; Logical block address out of range.
 Sector 357650: Illegal Request; Logical block address out of range.
+Current sector: 357651. This session: NewSectorsReadOK=357520, ReadErrors=131
 Sector 357651, try 1: Illegal Request; Logical block address out of range.
 Sector 357651: Illegal Request; Logical block address out of range.
+Current sector: 357652. This session: NewSectorsReadOK=357520, ReadErrors=132
 Sector 357652, try 1: Illegal Request; Logical block address out of range.
 Sector 357652: Illegal Request; Logical block address out of range.
+Current sector: 357653. This session: NewSectorsReadOK=357520, ReadErrors=133
 Sector 357653, try 1: Illegal Request; Logical block address out of range.
 Sector 357653: Illegal Request; Logical block address out of range.
+Current sector: 357654. This session: NewSectorsReadOK=357520, ReadErrors=134
 Sector 357654, try 1: Illegal Request; Logical block address out of range.
 Sector 357654: Illegal Request; Logical block address out of range.
+Current sector: 357655. This session: NewSectorsReadOK=357520, ReadErrors=135
 
 135 unreadable sectors.
 CrcBuf contents, image path none (medium):

regtest/database/RS02_scan_shorter

@@ -114,18 +114,73 @@ Reading CRC information from ecc data (RS02) ... RS02LayoutFromImage(): returnin
 done.
 Sector 34880, try 1: Illegal Request; Logical block address out of range.
 Sector 34880: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 34881. This session: NewSectorsReadOK=34880, ReadErrors=1
+Current sector: 34882. This session: NewSectorsReadOK=34880, ReadErrors=2
+Current sector: 34883. This session: NewSectorsReadOK=34880, ReadErrors=3
+Current sector: 34884. This session: NewSectorsReadOK=34880, ReadErrors=4
+Current sector: 34885. This session: NewSectorsReadOK=34880, ReadErrors=5
+Current sector: 34886. This session: NewSectorsReadOK=34880, ReadErrors=6
+Current sector: 34887. This session: NewSectorsReadOK=34880, ReadErrors=7
+Current sector: 34888. This session: NewSectorsReadOK=34880, ReadErrors=8
+Current sector: 34889. This session: NewSectorsReadOK=34880, ReadErrors=9
+Current sector: 34890. This session: NewSectorsReadOK=34880, ReadErrors=10
+Current sector: 34891. This session: NewSectorsReadOK=34880, ReadErrors=11
+Current sector: 34892. This session: NewSectorsReadOK=34880, ReadErrors=12
+Current sector: 34893. This session: NewSectorsReadOK=34880, ReadErrors=13
+Current sector: 34894. This session: NewSectorsReadOK=34880, ReadErrors=14
+Current sector: 34895. This session: NewSectorsReadOK=34880, ReadErrors=15
+Current sector: 34896. This session: NewSectorsReadOK=34880, ReadErrors=16
+Current sector: 34896. This session: NewSectorsReadOK=34880, ReadErrors=16
 Sector 34896, try 1: Illegal Request; Logical block address out of range.
 Sector 34896: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 34897. This session: NewSectorsReadOK=34880, ReadErrors=17
+Current sector: 34898. This session: NewSectorsReadOK=34880, ReadErrors=18
+Current sector: 34899. This session: NewSectorsReadOK=34880, ReadErrors=19
+Current sector: 34900. This session: NewSectorsReadOK=34880, ReadErrors=20
+Current sector: 34901. This session: NewSectorsReadOK=34880, ReadErrors=21
+Current sector: 34902. This session: NewSectorsReadOK=34880, ReadErrors=22
+Current sector: 34903. This session: NewSectorsReadOK=34880, ReadErrors=23
+Current sector: 34904. This session: NewSectorsReadOK=34880, ReadErrors=24
+Current sector: 34905. This session: NewSectorsReadOK=34880, ReadErrors=25
+Current sector: 34906. This session: NewSectorsReadOK=34880, ReadErrors=26
+Current sector: 34907. This session: NewSectorsReadOK=34880, ReadErrors=27
+Current sector: 34908. This session: NewSectorsReadOK=34880, ReadErrors=28
+Current sector: 34909. This session: NewSectorsReadOK=34880, ReadErrors=29
+Current sector: 34910. This session: NewSectorsReadOK=34880, ReadErrors=30
+Current sector: 34911. This session: NewSectorsReadOK=34880, ReadErrors=31
+Current sector: 34912. This session: NewSectorsReadOK=34880, ReadErrors=32
+Current sector: 34912. This session: NewSectorsReadOK=34880, ReadErrors=32
 Sector 34912, try 1: Illegal Request; Logical block address out of range.
 Sector 34912: Illegal Request; Logical block address out of range. Skipping 15 sectors.
+Current sector: 34913. This session: NewSectorsReadOK=34880, ReadErrors=33
+Current sector: 34914. This session: NewSectorsReadOK=34880, ReadErrors=34
+Current sector: 34915. This session: NewSectorsReadOK=34880, ReadErrors=35
+Current sector: 34916. This session: NewSectorsReadOK=34880, ReadErrors=36
+Current sector: 34917. This session: NewSectorsReadOK=34880, ReadErrors=37
+Current sector: 34918. This session: NewSectorsReadOK=34880, ReadErrors=38
+Current sector: 34919. This session: NewSectorsReadOK=34880, ReadErrors=39
+Current sector: 34920. This session: NewSectorsReadOK=34880, ReadErrors=40
+Current sector: 34921. This session: NewSectorsReadOK=34880, ReadErrors=41
+Current sector: 34922. This session: NewSectorsReadOK=34880, ReadErrors=42
+Current sector: 34923. This session: NewSectorsReadOK=34880, ReadErrors=43
+Current sector: 34924. This session: NewSectorsReadOK=34880, ReadErrors=44
+Current sector: 34925. This session: NewSectorsReadOK=34880, ReadErrors=45
+Current sector: 34926. This session: NewSectorsReadOK=34880, ReadErrors=46
+Current sector: 34927. This session: NewSectorsReadOK=34880, ReadErrors=47
+Current sector: 34928. This session: NewSectorsReadOK=34880, ReadErrors=48
+Current sector: 34928. This session: NewSectorsReadOK=34880, ReadErrors=48
 Sector 34928, try 1: Illegal Request; Logical block address out of range.
 Sector 34928: Illegal Request; Logical block address out of range.
+Current sector: 34929. This session: NewSectorsReadOK=34880, ReadErrors=49
 Sector 34929, try 1: Illegal Request; Logical block address out of range.
 Sector 34929: Illegal Request; Logical block address out of range.
+Current sector: 34930. This session: NewSectorsReadOK=34880, ReadErrors=50
 Sector 34930, try 1: Illegal Request; Logical block address out of range.
 Sector 34930: Illegal Request; Logical block address out of range.
+Current sector: 34931. This session: NewSectorsReadOK=34880, ReadErrors=51
 Sector 34931, try 1: Illegal Request; Logical block address out of range.
 Sector 34931: Illegal Request; Logical block address out of range.
+Current sector: 34932. This session: NewSectorsReadOK=34880, ReadErrors=52
 
 52 unreadable sectors.
 CrcBuf contents, image path none (medium):

regtest/database/RS02_strip_ecc

@@ -0,0 +1,75 @@
+cbadac3ca7b6e9bccfc889b7eaded254
+ignore
+This software comes with  ABSOLUTELY NO WARRANTY.  This
+is free software and you are welcome to redistribute it
+under the conditions of the GNU GENERAL PUBLIC LICENSE.
+See the file "COPYING" for further information.
+
+ExamineUDF(File: rs02-tmp.iso)
+ Examining the ISO file system...
+  Sector 16:
+   Volume descriptor type    = 1
+   Volume descriptor version = 1
+   Standard identifier       = CD001
+   -> primary volume descriptor:
+    System identifier         : |                                |
+    Volume identifier         : |RANDOM IMAGE                    |
+    Volume space size         : 30000 sectors
+    Volume set size           : 1
+    Volume sequence size      : 1
+    Logical block size        : 2048
+    Path table size           : 10 bytes
+    L-Path table location     : 19
+    Opt L-Path table location : 0
+    M-Path table location     : 20
+    Opt M-Path table location : 0
+    Volume creation date/time : 16-07-2006 10:35:46.23
+    Volume modification d/t   : 16-07-2006 10:35:46.23
+    Volume expiration d/t     : 16-07-2106 10:35:46.23
+    Volume effective d/t      : 16-07-2006 10:35:46.23
+    File structure version    : 1
+  Sector 17:
+   Volume descriptor type    = 2
+   Volume descriptor version = 1
+   Standard identifier       = CD001
+   -> supplementary volume descriptor: *skipped*
+  Sector 18:
+   Volume descriptor type    = 255
+   Volume descriptor version = 1
+   Standard identifier       = CD001
+   -> volume descriptor set terminator;
+      end of ISO file system parsing.
+ Examining the UDF file system...
+  not yet implemented.
+
+ExamineECC() started
+...trying RS01
+...trying RS02
+RS02Recognize: file rs02-tmp.iso
+try_sector: trying sector 30000
+try_sector: header at 30000: magic cookie found
+try_sector: CRC okay
+GetImageFingerprint(16): read & cached
+try_sector: fingerprint okay, header good
+Root sector search at +0 successful
+...augmented image found
+Expected size calculated from ecc header: 34932
+--> confirmed layout variant 1
+Calculated layout for RS02 image:
+data sectors      = 30000
+crc sectors       = 59
+protected sectors = 30061 (incl. 2 hdr sectors)
+reed solomon secs = 4795 (35 roots, 220 data)
+header repeats    = 38 (using modulo 128)
+added sectors     = 4932
+total image size  = 34932
+medium capacity   = n.a.
+
+Interleaving layout:
+137 sectors per ecc layer
+first layer sector with CRC data 136 (sector# 30002)
+
+GetImageFingerprint(16): cached
+Image is augmented (expected sectors = 34932)
+Truncating image to 30000 sectors.
+Image successfully truncated back to its original size.

regtest/database/RS02_strip_ecc_not

@@ -0,0 +1,143 @@
+cbadac3ca7b6e9bccfc889b7eaded254
+ignore
+This software comes with  ABSOLUTELY NO WARRANTY.  This
+is free software and you are welcome to redistribute it
+under the conditions of the GNU GENERAL PUBLIC LICENSE.
+See the file "COPYING" for further information.
+
+ExamineUDF(File: rs02-tmp.iso)
+ Examining the ISO file system...
+  Sector 16:
+   Volume descriptor type    = 1
+   Volume descriptor version = 1
+   Standard identifier       = CD001
+   -> primary volume descriptor:
+    System identifier         : |                                |
+    Volume identifier         : |RANDOM IMAGE                    |
+    Volume space size         : 30000 sectors
+    Volume set size           : 1
+    Volume sequence size      : 1
+    Logical block size        : 2048
+    Path table size           : 10 bytes
+    L-Path table location     : 19
+    Opt L-Path table location : 0
+    M-Path table location     : 20
+    Opt M-Path table location : 0
+    Volume creation date/time : 16-07-2006 10:35:46.23
+    Volume modification d/t   : 16-07-2006 10:35:46.23
+    Volume expiration d/t     : 16-07-2106 10:35:46.23
+    Volume effective d/t      : 16-07-2006 10:35:46.23
+    File structure version    : 1
+  Sector 17:
+   Volume descriptor type    = 2
+   Volume descriptor version = 1
+   Standard identifier       = CD001
+   -> supplementary volume descriptor: *skipped*
+  Sector 18:
+   Volume descriptor type    = 255
+   Volume descriptor version = 1
+   Standard identifier       = CD001
+   -> volume descriptor set terminator;
+      end of ISO file system parsing.
+ Examining the UDF file system...
+  not yet implemented.
+
+ExamineECC() started
+...trying RS01
+...trying RS02
+RS02Recognize: file rs02-tmp.iso
+try_sector: trying sector 30000
+try_sector: read error, trying next header
+try_sector: trying sector 29850
+try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+try_sector: trying sector 24576
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 28672
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 28672 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+try_sector: trying sector 29696
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 512
+Sector 29696 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 256
+try_sector: trying sector 29952
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 128
+Sector 29952 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 64
+Sector 29952 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 32
+try_sector: trying sector 29984
+try_sector: no cookie, skipping current modulo
+...trying RS03
+RS03RecognizeImage: file rs02-tmp.iso
+FindRS03HeaderInImage: file rs02-tmp.iso
+RS03RecognizeImage: No EH, entering exhaustive search
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
+...no augmented image detected.
+GetImageFingerprint(16): read & cached
+
+*
+* dvdisaster - can not continue:
+*
+Image is not augmented (no dvdisaster signature found).
+

regtest/database/RS03f_ecc_create_after_partial_read

@@ -84,11 +84,79 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
-RS02Recognize: skipping exhaustive RS02 search
+RS02Recognize: quick RS02 search, attempting up to 3 sector reads max
+Medium rewriteable: FALSE
+FindHeaderInMedium: Trying modulo 4611686018427387904
+FindHeaderInMedium: Trying modulo 2305843009213693952
+FindHeaderInMedium: Trying modulo 1152921504606846976
+FindHeaderInMedium: Trying modulo 576460752303423488
+FindHeaderInMedium: Trying modulo 288230376151711744
+FindHeaderInMedium: Trying modulo 144115188075855872
+FindHeaderInMedium: Trying modulo 72057594037927936
+FindHeaderInMedium: Trying modulo 36028797018963968
+FindHeaderInMedium: Trying modulo 18014398509481984
+FindHeaderInMedium: Trying modulo 9007199254740992
+FindHeaderInMedium: Trying modulo 4503599627370496
+FindHeaderInMedium: Trying modulo 2251799813685248
+FindHeaderInMedium: Trying modulo 1125899906842624
+FindHeaderInMedium: Trying modulo 562949953421312
+FindHeaderInMedium: Trying modulo 281474976710656
+FindHeaderInMedium: Trying modulo 140737488355328
+FindHeaderInMedium: Trying modulo 70368744177664
+FindHeaderInMedium: Trying modulo 35184372088832
+FindHeaderInMedium: Trying modulo 17592186044416
+FindHeaderInMedium: Trying modulo 8796093022208
+FindHeaderInMedium: Trying modulo 4398046511104
+FindHeaderInMedium: Trying modulo 2199023255552
+FindHeaderInMedium: Trying modulo 1099511627776
+FindHeaderInMedium: Trying modulo 549755813888
+FindHeaderInMedium: Trying modulo 274877906944
+FindHeaderInMedium: Trying modulo 137438953472
+FindHeaderInMedium: Trying modulo 68719476736
+FindHeaderInMedium: Trying modulo 34359738368
+FindHeaderInMedium: Trying modulo 17179869184
+FindHeaderInMedium: Trying modulo 8589934592
+FindHeaderInMedium: Trying modulo 4294967296
+FindHeaderInMedium: Trying modulo 2147483648
+FindHeaderInMedium: Trying modulo 1073741824
+FindHeaderInMedium: Trying modulo 536870912
+FindHeaderInMedium: Trying modulo 268435456
+FindHeaderInMedium: Trying modulo 134217728
+FindHeaderInMedium: Trying modulo 67108864
+FindHeaderInMedium: Trying modulo 33554432
+FindHeaderInMedium: Trying modulo 16777216
+FindHeaderInMedium: Trying modulo 8388608
+FindHeaderInMedium: Trying modulo 4194304
+FindHeaderInMedium: Trying modulo 2097152
+FindHeaderInMedium: Trying modulo 1048576
+FindHeaderInMedium: Trying modulo 524288
+FindHeaderInMedium: Trying modulo 262144
+FindHeaderInMedium: Trying modulo 131072
+FindHeaderInMedium: Trying modulo 65536
+FindHeaderInMedium: Trying modulo 32768
+FindHeaderInMedium: Trying modulo 16384
+try_sector: trying sector 16384
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 8192
+Sector 16384 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 4096
+try_sector: trying sector 20480
+try_sector: no cookie, skipping current modulo
+FindHeaderInMedium: Trying modulo 2048
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 1024
+Sector 20480 cached; skipping modulo
+FindHeaderInMedium: Trying modulo 512
+try_sector: trying sector 20992
+try_sector: no cookie, skipping current modulo
 ...trying RS03
 RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
-RS03RecognizeImage: skipping exhaustive RS03 search
+RS03RecognizeImage: quick RS03 search, attempting up to 3 sector reads max
+.. trying layer size 1409
+Scanning layers for signatures.
+- layer slice 0
+** All layers tested -> no RS03 data found
 ...no augmented image detected.
 # Calling query_size()
 # *** query_size(Simulated CD drive 1.00) ***
@@ -154,6 +222,7 @@ try_sector: trying sector 21000
 try_sector: read error, trying next header
 try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
+RS02Recognize: No EH, entering exhaustive search
 FindHeaderInMedium: Trying modulo 4611686018427387904
 FindHeaderInMedium: Trying modulo 2305843009213693952
 FindHeaderInMedium: Trying modulo 1152921504606846976