chore: update locales & changelog

The feature was disabled by the author in this version, as it missed RS03
awareness. We enable it if we find RS01, RS02 or no ECC data, and warn the
user if we find RS03, telling him that the wise choice is to cancel and
rely on linear read

.cvsignore

@@ -1,4 +0,0 @@
-PRIVATE
-test-cases
-regtest
-st

.github/workflows/make-dist.sh

@@ -0,0 +1,62 @@
+#!/bin/bash
+set -e
+set -x
+
+github_ref="$1"
+
+if [ -n "$GITHUB_EVENT_PATH" ] && [ -f "$GITHUB_EVENT_PATH" ]; then
+    if command -v jq >/dev/null; then
+        upload_url=$(jq -r '.release.upload_url' < $GITHUB_EVENT_PATH)
+        echo "Upload URL is $upload_url"
+        echo "::set-output name=upload_url::$upload_url"
+    fi
+else
+    echo "This should only be run from GitHub Actions"
+    exit 1
+fi
+
+case "$MSYSTEM" in
+    MINGW64) os=win64; exe=.exe;;
+    MINGW32) os=win32; exe=.exe;;
+    *)       os=linux64; exe='';;
+esac
+
+./dvdisaster$exe --version
+
+if ./dvdisaster$exe --version | grep -q NOGUI; then
+    GUI=0
+    suffix="$os-cli-only"
+else
+    GUI=1
+    suffix=$os-static
+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
+    cp -vr $MINGW_PREFIX/share/themes/MS-Windows dist/share/themes/
+    cp -vr $MINGW_PREFIX/lib/gtk-2.0 dist/lib/
+    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 dvdisaster documentation/dvdisaster.*.1 documentation/user-manual/manual.pdf dist/
+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

@@ -0,0 +1,210 @@
+name: autobuild
+
+on:
+  release:
+    types: [published]
+
+jobs:
+
+  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 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
+          file dvdisaster.exe
+          ./dvdisaster.exe --version | grep -q -e dirty -e NOGUI && exit 1
+          file dvdisaster.exe | grep -q 'x86-64, for MS Windows'
+    - 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: ${{ steps.dist.outputs.upload_url }}
+        asset_path: ./${{ steps.dist.outputs.archive }}
+        asset_name: ${{ steps.dist.outputs.archive }}
+        asset_content_type: application/zip
+
+  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 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
+          file dvdisaster.exe
+          ./dvdisaster.exe --version | grep -q -e dirty -e NOGUI && exit 1
+          file dvdisaster.exe | grep -q '386, for MS Windows'
+    - 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: ${{ steps.dist.outputs.upload_url }}
+        asset_path: ./${{ steps.dist.outputs.archive }}
+        asset_name: ${{ steps.dist.outputs.archive }}
+        asset_content_type: application/zip
+
+  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 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: env CLI_ONLY=1 ./configure
+    - name: make
+      run: nproc && make -j$(nproc)
+    - name: check executable
+      run: |
+          ./dvdisaster.exe --version
+          file dvdisaster.exe
+          ./dvdisaster.exe --version | grep -q -e dirty && exit 1
+          ./dvdisaster.exe --version | grep -q NOGUI
+          file dvdisaster.exe | grep -q 'x86-64, for MS Windows'
+    - 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: ${{ steps.dist.outputs.upload_url }}
+        asset_path: ./${{ steps.dist.outputs.archive }}
+        asset_name: ${{ steps.dist.outputs.archive }}
+        asset_content_type: application/zip
+
+  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 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: env CLI_ONLY=1 ./configure
+    - name: make
+      run: nproc && make -j$(nproc)
+    - name: check executable
+      run: |
+          ./dvdisaster.exe --version
+          file dvdisaster.exe
+          ./dvdisaster.exe --version | grep -q -e dirty && exit 1
+          ./dvdisaster.exe --version | grep -q NOGUI
+          file dvdisaster.exe | grep -q '386, for MS Windows'
+    - 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: ${{ steps.dist.outputs.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 jq
+    - name: configure
+      run: env CLI_ONLY=1 ./configure
+    - 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: ${{ 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

@@ -0,0 +1,187 @@
+name: non-regression tests
+
+on: [pull_request]
+
+jobs:
+
+  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 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
+          file dvdisaster.exe
+          ./dvdisaster.exe --version | grep -q -e dirty -e NOGUI && exit 1
+          file dvdisaster.exe | grep -q 'x86-64, for MS Windows'
+    - 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: regression tests
+      run: mkdir /var/tmp/regtest && export REGTEST_NO_UTF8=1 && ./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 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
+          file dvdisaster.exe
+          ./dvdisaster.exe --version | grep -q -e dirty -e NOGUI && exit 1
+          file dvdisaster.exe | grep -q '386, for MS Windows'
+    - 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: regression tests
+      run: mkdir /var/tmp/regtest && export REGTEST_NO_UTF8=1 && ./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 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: env CLI_ONLY=1 ./configure
+    - name: make
+      run: nproc && make -j$(nproc)
+    - name: check executable
+      run: |
+          ./dvdisaster.exe --version
+          file dvdisaster.exe
+          ./dvdisaster.exe --version | grep -q -e dirty && exit 1
+          ./dvdisaster.exe --version | grep -q NOGUI
+          file dvdisaster.exe | grep -q 'x86-64, for MS Windows'
+    - 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: regression tests
+      run: mkdir /var/tmp/regtest && export REGTEST_NO_UTF8=1 && ./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 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: env CLI_ONLY=1 ./configure
+    - name: make
+      run: nproc && make -j$(nproc)
+    - name: check executable
+      run: |
+          ./dvdisaster.exe --version
+          file dvdisaster.exe
+          ./dvdisaster.exe --version | grep -q -e dirty && exit 1
+          ./dvdisaster.exe --version | grep -q NOGUI
+          file dvdisaster.exe | grep -q '386, for MS Windows'
+    - 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: regression tests
+      run: mkdir /var/tmp/regtest && export REGTEST_NO_UTF8=1 && ./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 ghostscript man jq
+    - 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: prepare dist
+      run: ./.github/workflows/make-dist.sh ${{ github.ref }}
+    - name: regression tests
+      run: mkdir /var/tmp/regtest && export REGTEST_NO_UTF8=1 && ./regtest/runtests.sh
+
+  linux64-gui:
+    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 jq libgtk2.0-dev
+    - name: configure
+      run: ./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: prepare dist
+      run: ./.github/workflows/make-dist.sh ${{ github.ref }}
+    - name: regression tests
+      run: mkdir /var/tmp/regtest && export REGTEST_NO_UTF8=1 && ./regtest/runtests.sh
+

.gitignore

@@ -0,0 +1,18 @@
+.pc
+*.o
+*~
+*.gcno
+*.gcda
+*.gcov
+Makefile.config
+configure.log
+locale/Makefile
+GNUmakefile
+.gitignore
+simple-md5sum
+inlined-icons.h
+help-dialogs.h
+dvdisaster
+build.h
+dvdisaster.mo
+locale/messages.pot

CHANGELOG

@@ -1,5 +1,90 @@
 # dvdisaster changelog -*-text-*-
- 
+
+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
+
+0.79.6.patchlevel-2 30-08-2020 *UNOFFICIAL*
+- fix: Adjust BDXL_QL_SIZE and rollback BD_SL_SIZE to upstream version*
+- feat: add --no-bdr-defect-management to produce bigger augmented images with RS03
+- chore: remove 2 compiler warnings under Linux
+- chore: automatically run regtests under Win32, Win64, Linux64 (regular and CLI-only) on pull requests
+- chore: add a Linux CLI-only static make target
+- chore: fix make parallelism
+- chore: use tags to describe the build
+
+*:BD_SL_SIZE was mistakenly modified in 0.79.6-pl1, we restore the
+  previous upstream value to avoid having several dvdisaster versions
+  in the field with different values set for it.
+
+  If you created an RS03 augmented image with 0.79.6-pl1, you'll still
+  be able to conduct a repair of the image, should it be damaged,
+  by using any 0.79.6 version (with or without patchlevel), using
+  the following additional command-line parameters:
+  dvdisaster -f --debug -n 12219392
+  On the patchlevel versions, this is equivalent to saying:
+  dvdisaster -f --no-bdr-defect-management
+
+  BDXL_QL_SIZE (introduced in pl1) was also adjusted in this version,
+  To repair a damaged BD-R quadruple layer image created by pl1:
+  dvdisaster -f --debug -n 62500864
+  On the patchlevel versions, this is equivalent to saying:
+  dvdisaster -f --no-bdr-defect-management
+
+  The values that were present in pl1 were corresponding to a BD-R
+  burnt without formatting it for defect management first, which enabled
+  more space for parity data. You can still do it if you want, with
+  --no-bdr-defect-management (see manpage), but to follow upstream,
+  the default number of sectors for all BD-R implies that defect
+  management is enabled.
+
+0.79.6.patchlevel-1 20-08-2020 *UNOFFICIAL*
+- This is an UNOFFICIAL version, not from the original author,
+  based on the latest available pre-release, 0.79.6.
+  Changes will be kept minimal (this is not a hard fork),
+  to be able to merge in any new upstream version should it arise.
+- Most patches from the Debian maintainer have been applied,
+  up to Debian version 0.79.6-5. Patches that are purely Debian
+  specific have been omitted.
+- This release keeps the debian/ folder untouched, with only
+  the patches/series file adjusted. Building the package has
+  not been tested.
+- Added support for BDXL-QL (quadruple layer, 128GB)
+- Added support to compile a CLI-only version, without
+  the GTK dependency (only glib2), compile with:
+  $ CLI_ONLY=1 ./configure && make clean && make -j4
+- Added support to compile a Windows version under MingW (tested
+  with MSYS2)
+- All regression tests are passing on Linux 64, Win 32 and Win 64.
+- A few tweaks and fixes around have been done while massively
+  amending the source files to make the CLI-only version possible.
+  This hopefully removes a few quirks without adding too many.
+
+THE ORIGINAL UPSTREAM CHANGELOG IS KEPT BELOW:
+
 0.79.6 20-11-2017
 - The Verify/Test option will now output dvdisaster version
   numbers always in x.yy.zz format, as the old scheme

GNUmakefile

@@ -1,4 +0,0 @@
-all:
-	@echo
-	@echo "Please create a Makefile by entering \"bash configure\" first"
-	@echo

GNUmakefile.template

@@ -39,9 +39,9 @@ INTL_LIBS   = $(CFG_INTL_LIBS)
 CAM_LFLAGS = $(CFG_CAM_LFLAGS)
 CAM_LIBS   = $(CFG_CAM_LIBS)
 
-GTK_CFLAGS   = $(CFG_GTK2_CFLAGS)
-GTK_LIBS     = $(CFG_GTK2_LIBS)
-GTK_BINDIR   = $(CFG_GTK2_BINDIR)
+GTK_CFLAGS   = $(CFG_GTK2_CFLAGS) $(CFG_GLIB2_CFLAGS)
+GTK_LIBS     = $(CFG_GTK2_LIBS) $(CFG_GLIB2_LIBS)
+GTK_BINDIR   = $(CFG_GTK2_BINDIR) $(CFG_GLIB2_BINDIR)
 
 EFENCE_LFLAGS = $(CFG_EFENCE_LFLAGS)
 EFENCE_LIBS   = $(CFG_EFENCE_LIBS)
@@ -67,69 +67,78 @@ OFILES = $(CFG_OFILES)
 # Compilation related
 ######################################################################
 
-.PHONY : all help show locale time-stamp
+.PHONY : all help show locale
 
-${BUILDTMP}/%.o : %.c
+all: dvdisaster
+
+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 $@
 
-all: time-stamp dvdisaster
+${BUILDTMP}/build.o : src/build.c src/build.h
+	@echo "Compiling:" src/build.o
+	@$(CC) $(COPTS) -c src/build.c -o $@
+
+${BUILDTMP}/icon-factory.o : src/icon-factory.c src/inlined-icons.h
+	@echo "Compiling:" src/icon-factory.o
+	@$(CC) $(COPTS) -c src/icon-factory.c -o $@
 
 # Building the dvdisaster binary
 
-time-stamp:
-	@$(SRCDIR)/scripts/time-stamper.bash $(SRCDIR)/build.h
-
-dvdisaster: inlined-icons.h $(OFILES) 
+dvdisaster: $(ICONS) $(OFILES)
 	@echo "Linking  : dvdisaster"
-	@$(CC) $(LOPTS) $(OFILES) $(LIBS) -o dvdisaster
+	@if test $(CFG_SYS_OPTIONS) == -DSYS_MINGW; \
+	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 \
 	 || echo $(WITH_OPTIONS) | grep "NLS_NO" >/dev/null; \
 	then echo "not touching locale"; \
 	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
+src/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      >src/inlined-icons.h
+	@gdk-pixbuf-csource --raw --name=dvdisaster_create   icons/create.png   >>src/inlined-icons.h
+	@gdk-pixbuf-csource --raw --name=dvdisaster_scan     icons/scan.png     >>src/inlined-icons.h
+	@gdk-pixbuf-csource --raw --name=dvdisaster_fix      icons/fix.png      >>src/inlined-icons.h
+	@gdk-pixbuf-csource --raw --name=dvdisaster_verify   icons/verify.png   >>src/inlined-icons.h
+	@gdk-pixbuf-csource --raw --name=dvdisaster_open_ecc icons/open-ecc.png >>src/inlined-icons.h
+	@gdk-pixbuf-csource --raw --name=dvdisaster_open_img icons/open-img.png >>src/inlined-icons.h
+	@gdk-pixbuf-csource --raw --name=dvdisaster_cd icons/cd.png >>src/inlined-icons.h
+	@gdk-pixbuf-csource --raw --name=dvdisaster_gtk_help icons/gtk-help.png >>src/inlined-icons.h
+	@gdk-pixbuf-csource --raw --name=dvdisaster_gtk_index icons/gtk-index.png >>src/inlined-icons.h
+	@gdk-pixbuf-csource --raw --name=dvdisaster_gtk_preferences icons/gtk-preferences.png >>src/inlined-icons.h
+	@gdk-pixbuf-csource --raw --name=dvdisaster_gtk_quit icons/gtk-quit.png >>src/inlined-icons.h
+	@gdk-pixbuf-csource --raw --name=dvdisaster_gtk_stop icons/gtk-stop.png >>src/inlined-icons.h
 
-$(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
@@ -137,10 +146,11 @@ locale:
 untranslated:
 	@$(MAKE) --no-print-directory -C locale check-untranslated
 
-simple-md5sum: md5.c
-	@$(CC) $(COPTS) $(MUDFLAP_CFLAGS) -DSIMPLE_MD5SUM md5.c $(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
 	@echo "\\newcommand{\\projectversion}{$(VERSION)}" >$(SRCDIR)/documentation/config/version.tex
 
 manual: version.tex
@@ -221,7 +231,7 @@ show:
 ######################################################################
 
 .PHONY : install uninstall clean distclean arch
-.PHONY : srcdist
+.PHONY : srcdist dist
 
 install: dvdisaster manual
 	@echo "Installing package..."
@@ -239,9 +249,9 @@ install: dvdisaster manual
 	install -d $(BUILDROOT)$(MANDIR)/de/man1
 	cd documentation; \
 	  ESCAPED_DOCSUBDIR=`echo $(DOCSUBDIR) | sed -e 's/\//\\\\\//g'`; \
-	  sed "s/%docdir%/$$ESCAPED_DOCSUBDIR\/html/" <dvdisaster.en.1 >dvdisaster.updated; \
+	  sed "s/%docdir%/$$ESCAPED_DOCSUBDIR/" <dvdisaster.en.1 >dvdisaster.updated; \
 	  install -m 644 dvdisaster.updated $(BUILDROOT)$(MANDIR)/man1/dvdisaster.1; \
-	  sed "s/%docdir%/$$ESCAPED_DOCSUBDIR\/html/" <dvdisaster.de.1 >dvdisaster.updated; \
+	  sed "s/%docdir%/$$ESCAPED_DOCSUBDIR/" <dvdisaster.de.1 >dvdisaster.updated; \
 	  install -m 644 dvdisaster.updated $(BUILDROOT)$(MANDIR)/de/man1/dvdisaster.1; \
 	  rm dvdisaster.updated
 	if echo $(WITH_OPTIONS) | grep "NLS_YES" >/dev/null; then \
@@ -284,12 +294,8 @@ 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
-	@echo "all:" >>GNUmakefile
-	@echo -e "\t@echo" >>GNUmakefile
-	@echo -e "\t@echo \"Please create a Makefile by entering \\\"bash configure\\\" first\"" >>GNUmakefile
-	@echo -e "\t@echo" >>GNUmakefile
 
 # There might be a not executable simple-md5sum from a compiler run
 # under a different architecture, so make sure we have a working binary
@@ -298,7 +304,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;
@@ -311,15 +317,16 @@ 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
 	@$(MAKE) --no-print-directory -C $(SRCDIR)/documentation/codec-specs 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`
-arch:	archclean time-stamp
+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
@@ -329,5 +336,5 @@ srcdist: INSTALL distclean manual manualclean
 	@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 
 
-
-
+static: dvdisaster
+	$(CC) $(LOPTS) $(OFILES) $(LIBS) -pthread -static -o dvdisaster-static

INSTALL

@@ -127,6 +127,11 @@ Call the configuration script in the usual way:
 
 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
+
 The script will possibly print some errors about missing libraries.
 Type "configure --help" to learn about pointing configure 
 to the correct path of already installed libraries.

Makefile

@@ -4,8 +4,11 @@
 
 all:
 	@echo
-	@echo "dvdisaster requires GNU make to build."
-	@echo "Please try your command again using gmake."
+	@echo "Please run \`./configure' first."
+	@echo "To build a CLI-only version,"
+	@echo "run \`CLI_ONLY=1 ./configure' instead."
+	@echo "Note that dvdisaster requires GNU make to build."
+	@echo "Under non-Linux systems, it might be known as \`gmake'."
 	@echo
 
 show: all

README

@@ -65,8 +65,3 @@ locale
 scripts
 	Scripts needed for configuring and building dvdisaster are 
 	located in the "scripts" directory.
-
-tools
-	Auxiliary programs for the build and packaging process reside
-	in "tools".
-

README.md

@@ -0,0 +1,66 @@
+# What is dvdisaster?
+
+**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.
+
+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.
+
+Please refer to the [PDF manual](documentation/user-manual/manual.pdf) for more information.
+
+# 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](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, not 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)
+
+For more information please refer to the [CHANGELOG](CHANGELOG).
+
+## 3 available protection modes ("codecs")
+
+**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** 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** 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 error correction capacity than its RS01/RS02 counterparts on images with equal size.
+
+# 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
+
+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
+
+### Scanning a damaged CD under Windows
+
+![dvdisaster_damaged_cd](https://user-images.githubusercontent.com/218502/91434313-edaaf880-e864-11ea-8e41-7b58a1e97a70.PNG)
+
+### Scanning a healthy BD-R (single layer) with Linux GUI
+
+![dvdisaster_bdr_read](https://user-images.githubusercontent.com/218502/91436728-fbfb1380-e868-11ea-8444-04ebc60809d8.PNG)
+
+### Creating an RS03 error correction file with Linux GUI
+
+![dvdisaster_bdr_create](https://user-images.githubusercontent.com/218502/91436740-00273100-e869-11ea-837a-af0d0733fe87.PNG)
+
+### Verifying a BD-R image with Linux GUI
+
+![dvdisaster_bdr_verify](https://user-images.githubusercontent.com/218502/91436731-fc93aa00-e868-11ea-93e6-b8c277620df7.PNG)

build.h

@@ -1,2 +0,0 @@
-#define BUILD 272
-#define BDATE "17.11.17 (Freitag, 09:57)"

configure

@@ -3,14 +3,19 @@
 # Load the shell functions needed for the rest of this script.
 
 BASH_BASED_CONFIGURE=./scripts/bash-based-configure
-REQUIRED_CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -I." 
-RECOMMENDED_CFLAGS="-O2 -fomit-frame-pointer -Wall"
+BASH_BASED_CONFIGURE_OPTS="--buildtmp=$(pwd)/build"
+REQUIRED_CFLAGS="-DPATCHLEVEL=4 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -I. -pipe"
+RECOMMENDED_CFLAGS="-O2 -fomit-frame-pointer -Wall -Wno-deprecated-declarations -Wno-stringop-truncation"
 DEBUG_CFLAGS="-ggdb -Wall"
 
+if [ "$CLI_ONLY" = 1 ]; then
+  REQUIRED_CFLAGS="-DCLI $REQUIRED_CFLAGS"
+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."
@@ -48,7 +53,9 @@ GET_BUILDTMP
 PRINT_MESSAGE "\nLooking for includes and libraries:"
 
 REQUIRE_GLIB2 2 32 0
-REQUIRE_GTK2 2 6 0 WITH_THREADS
+if [ "$CLI_ONLY" != 1 ]; then
+  REQUIRE_GTK2 2 6 0 WITH_THREADS
+fi
 echo
 
 if ! CHECK_INCLUDE locale.h locale || ! CHECK_INCLUDE libintl.h intl ; then
@@ -69,10 +76,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
@@ -110,10 +117,12 @@ if ! EXECUTE_PROGRAM "xgettext --help" xgettext \
   cfg_force_with_nls=no
 fi
 
-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."
-  exit 1
+if [ "$CLI_ONLY" != 1 ]; 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."
+    exit 1
+  fi
 fi
 
 # Evaluate the --with* customization options
@@ -146,49 +155,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
+for cfile in src/*.c; do
+  if [ "$CLI_ONLY" = 1 ]; 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 = 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/dvdisaster.desktop

@@ -6,7 +6,8 @@ Comment=Additional error protection for CD/DVD media
 Comment[cs]=Přídavná ochrana pro média CD/DVD
 Comment[de]=Zusätzliche Fehlerkorrektur für CD/DVD
 Exec=dvdisaster
-Icon=dvdisaster48.png
+Icon=dvdisaster
 Terminal=false
 Type=Application
 Categories=Application;System;
+Keywords=CD;DVD;media;data loss;scratch;aging;error;protection;recovery;

debian/changelog

@@ -1,3 +1,33 @@
+dvdisaster (0.79.6-6) UNRELEASED; urgency=medium
+
+  * Use secure URI in debian/watch.
+  * Update standards version, no changes needed.
+  * Set debhelper-compat version in Build-Depends.
+  * Update standards version to 4.4.1, no changes needed.
+  * Remove obsolete fields Name, Contact from debian/upstream/metadata.
+  * Fix day-of-week for changelog entries 0.71~devel23-4.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Tue, 06 Aug 2019 16:08:20 +0000
+
+dvdisaster (0.79.6-5) experimental; urgency=medium
+
+  * Merge changes from 0.79.5-9.
+
+ -- Carlos Maddela <e7appew@gmail.com>  Sat, 02 Feb 2019 16:05:29 +1100
+
+dvdisaster (0.79.6-4) experimental; urgency=medium
+
+  * Merge changes from 0.79.5-8.
+
+ -- Carlos Maddela <e7appew@gmail.com>  Fri, 01 Feb 2019 23:13:16 +1100
+
+dvdisaster (0.79.6-3) experimental; urgency=medium
+
+  * Merge changes from 0.79.5-7.
+  * Update gbp.conf for debian/experimental branch.
+
+ -- Carlos Maddela <e7appew@gmail.com>  Thu, 31 Jan 2019 08:59:58 +1100
+
 dvdisaster (0.79.6-2) experimental; urgency=medium
 
   [ TANIGUCHI Takaki ]
@@ -19,6 +49,69 @@ dvdisaster (0.79.6-1) experimental; urgency=medium
   * Rebase patches.
 
  -- Carlos Maddela <e7appew@gmail.com>  Thu, 21 Dec 2017 05:51:54 +1100
+dvdisaster (0.79.5-9) unstable; urgency=medium
+
+  * Make sure that the upstream changelog remains uncompressed so
+    that the application can display it.
+
+ -- Carlos Maddela <e7appew@gmail.com>  Sat, 02 Feb 2019 13:32:34 +1100
+
+dvdisaster (0.79.5-9) unstable; urgency=medium
+
+  * Make sure that the upstream changelog remains uncompressed so
+    that the application can display it.
+  * Suggest to install dvdisaster-doc in error message, if the PDF manual
+    cannot be found.
+
+ -- Carlos Maddela <e7appew@gmail.com>  Sat, 02 Feb 2019 15:20:23 +1100
+
+dvdisaster (0.79.5-8) unstable; urgency=medium
+
+  * Fix parallel build of locale strings.
+
+ -- Carlos Maddela <e7appew@gmail.com>  Fri, 01 Feb 2019 23:03:13 +1100
+
+dvdisaster (0.79.5-7) unstable; urgency=medium
+
+  * Add debian/gbp.conf to conform with DEP14 conventions.
+  * Build with Debhelper compat level 12.
+  * Set "Rules-Requires-Root: no".
+  * Simplify process by which mutable files are backed up and restored.
+  * Build as verbosely as possible.
+  * Fix location of manual.
+  * Fix dh_auto_build overrides to take advantage of parallel builds.
+  * Fix format security compilation warning in GCC-8.
+  * Change homepage to one archived at web.archive.org.
+    http://dvdisaster.net has been unavailable for a while now.
+    Not certain if this is permanent though, as the domain name still
+    exists for mail.
+  * Add support for nodoc build profile.
+  * Add more details to upstream metadata.
+  * Indicate compliance with Debian Policy 4.3.0.
+
+ -- Carlos Maddela <e7appew@gmail.com>  Thu, 31 Jan 2019 07:10:46 +1100
+
+dvdisaster (0.79.5-6) unstable; urgency=medium
+
+  [ TANIGUCHI Takaki ]
+  * change Vcs-* path
+
+  [ Carlos Maddela ]
+  * Build with DH compat level 11.
+  * Indicate compliance with Debian Policy 4.1.4.
+  * Add machine-readable upstream metadata.
+  * Update debian/copyright.
+  * Update location of PDF manual registered with doc-base (required
+    as a result of DH compat level change).
+
+ -- Carlos Maddela <e7appew@gmail.com>  Sat, 23 Jun 2018 05:01:27 +1000
+
+dvdisaster (0.79.5-5) unstable; urgency=medium
+
+  * Update Vcs-* to salsa.debian.org
+  * Bump Standards-Version to 4.1.3
+
+ -- TANIGUCHI Takaki <takaki@debian.org>  Sat, 27 Jan 2018 23:34:08 +0900
 
 dvdisaster (0.79.5-4) unstable; urgency=medium
 
@@ -318,7 +411,7 @@ dvdisaster (0.71~devel23-4) unstable; urgency=low
 
   * Fixed clean target in rules (Closes: #442559).
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 17 Sep 2007 00:37:00 +0200
+ -- Daniel Baumann <daniel@debian.org>  Mon, 17 Sep 2007 00:37:00 +0200
 
 dvdisaster (0.71~devel23-3) unstable; urgency=medium
 

debian/compat

@@ -1 +0,0 @@
-11

debian/control

@@ -5,20 +5,22 @@ Maintainer: Optical Media Tools Team <pkg-opt-media-team@lists.alioth.debian.org
 Uploaders: TANIGUCHI Takaki <takaki@debian.org>,
            Rogério Brito <rbrito@ime.usp.br>,
            Carlos Maddela <e7appew@gmail.com>
-Build-Depends: debhelper (>= 11),
+Build-Depends: debhelper (>= 12),
                gettext,
                libbz2-dev,
                libcam-dev [kfreebsd-any],
                libgtk2.0-dev,
                libpng-dev,
-               pkg-config
-Build-Depends-Indep: texlive-fonts-recommended,
-                     texlive-latex-base,
-                     texlive-latex-extra
-Standards-Version: 4.1.4
+               pkg-config,
+               debhelper-compat (= 12)
+Build-Depends-Indep: texlive-fonts-recommended <!nodoc>,
+                     texlive-latex-base <!nodoc>,
+                     texlive-latex-extra  <!nodoc>
+Standards-Version: 4.4.1
 Vcs-Browser: https://salsa.debian.org/optical-media-team/dvdisaster
 Vcs-Git: https://salsa.debian.org/optical-media-team/dvdisaster.git
-Homepage: http://dvdisaster.net/
+Homepage: https://web.archive.org/web/20180428070843/http://dvdisaster.net/
+Rules-Requires-Root: no
 
 Package: dvdisaster
 Architecture: any
@@ -30,6 +32,7 @@ Description: data loss/scratch/aging protection for CD/DVD media
  used to recover unreadable sectors if the disc becomes damaged at a later time.
 
 Package: dvdisaster-doc
+Build-Profiles: <!nodoc>
 Section: doc
 Architecture: all
 Multi-Arch: foreign

debian/copyright

@@ -1,7 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Contact: Carsten Gnörlich <carsten@dvdisaster.org>
 Upstream-Name: dvdisaster
-Source: http://dvdisaster.net/
+Source: https://web.archive.org/web/20180428070843/http://dvdisaster.net/
 
 Files: *
 Copyright: 2004–2015, Carsten Gnörlich <carsten@dvdisaster.org>

debian/dvdisaster.docs

@@ -1,4 +1,3 @@
-CHANGELOG
 CREDITS.*
 README.MODIFYING
 TODO

debian/dvdisaster.lintian-overrides

@@ -0,0 +1 @@
+dvdisaster: changelog-file-not-compressed changelog

debian/gbp.conf

@@ -0,0 +1,5 @@
+[DEFAULT]
+debian-branch = debian/master
+upstream-branch = upstream/latest
+sign-tags = True
+pristine-tar = True

debian/patches/34-gcc8-format-security.patch

@@ -0,0 +1,27 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Thu, 31 Jan 2019 05:10:21 +1100
+Subject: Fix format security warning in GCC-8.
+
+Description: Fix format security warning in GCC-8.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: no
+Last-Update: 2019-01-31
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ udf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/udf.c b/udf.c
+index 174fa36..9e345c2 100644
+--- a/udf.c
++++ b/udf.c
+@@ -794,7 +794,7 @@ void FreeIsoHeader(IsoHeader *ih)
+ 
+ void AddFile(IsoHeader *ih, char *name, guint64 size)
+ {  static int n;
+-   char iso[20], joliet[strlen(name)+3];
++   char iso[22], joliet[strlen(name)+3];
+ 
+    n++;
+    sprintf(iso,"RAN_%04d.DAT;1", n);

debian/patches/35-archived-homepage.patch

@@ -0,0 +1,108 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Thu, 31 Jan 2019 05:31:03 +1100
+Subject: Change homepage to one archived at web.archive.org.
+
+Description: Change homepage to one archived at web.archive.org.
+ http://dvdisaster.net has been unavailable for a while now.
+ Not certain if this is permanent though, as the domain name still
+ exists for mail.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: not-needed
+Last-Update: 2019-01-31
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ documentation/codec-specs/rs01.tex            | 2 +-
+ documentation/codec-specs/rs02.tex            | 2 +-
+ documentation/upstream-site/de/impressum.html | 2 +-
+ documentation/upstream-site/en/imprint.html   | 2 +-
+ documentation/user-manual/background.tex      | 2 +-
+ documentation/user-manual/download.tex        | 4 ++--
+ 6 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/documentation/codec-specs/rs01.tex b/documentation/codec-specs/rs01.tex
+index a8c0d90..ca7f71f 100644
+--- a/documentation/codec-specs/rs01.tex
++++ b/documentation/codec-specs/rs01.tex
+@@ -44,7 +44,7 @@ correction files must be protected with an image level
+ error correction layer (by using RS01,RS02 or RS03 on the medium), 
+ since only image level error correction avoids meta 
+ data sectors to become a single point of failure. See the
+-discussion at \url{http://dvdisaster.net/en/qa32.html} for
++discussion at \url{https://web.archive.org/web/20180428070843/http://dvdisaster.net/en/qa32.html} for
+ more information on the advantages of image level data protection
+ over file level approaches.
+ 
+diff --git a/documentation/codec-specs/rs02.tex b/documentation/codec-specs/rs02.tex
+index fb88384..06e8126 100644
+--- a/documentation/codec-specs/rs02.tex
++++ b/documentation/codec-specs/rs02.tex
+@@ -74,7 +74,7 @@ the parity data portion of the image might not be written to the medium.
+ Most current writing programs do however measure the .iso image by examining
+ its file size, and will transfer the parity data correctly. To be sure you
+ should follow the steps described under ``Testing image compatibility''
+-at the dvdisaster site (\url{http://dvdisaster.net/en/howtos92.html}) once
++at the dvdisaster site (\url{https://web.archive.org/web/20180428070843/http://dvdisaster.net/en/howtos92.html}) once
+ before using each version of your optical media authoring software.
+ 
+ Like the other dvdisaster codecs, RS02 is based on a  RS(255,k) Reed-Solomon code
+diff --git a/documentation/upstream-site/de/impressum.html b/documentation/upstream-site/de/impressum.html
+index 7c5ded3..d8bf4f8 100644
+--- a/documentation/upstream-site/de/impressum.html
++++ b/documentation/upstream-site/de/impressum.html
+@@ -63,7 +63,7 @@ Carsten Gnörlich (Anschrift wie oben).
+ 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="http://dvdisaster.net">dvdisaster.net</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 -->
+diff --git a/documentation/upstream-site/en/imprint.html b/documentation/upstream-site/en/imprint.html
+index d99324b..43641f2 100644
+--- a/documentation/upstream-site/en/imprint.html
++++ b/documentation/upstream-site/en/imprint.html
+@@ -63,7 +63,7 @@ Carsten Gnörlich (see above for address).
+ 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="http://dvdisaster.net">dvdisaster.net</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 -->
+diff --git a/documentation/user-manual/background.tex b/documentation/user-manual/background.tex
+index ba602ef..9aba84f 100644
+--- a/documentation/user-manual/background.tex
++++ b/documentation/user-manual/background.tex
+@@ -272,7 +272,7 @@ media with augmented images may not play correctly on all units \\
+ \end{tabular}
+ 
+ \paragraph{Further reading.} The specification for the dvdisaster codecs 
+-has been specified in a separate document called \href{http://dvdisaster.net/downloads/codecs.pdf}{codecs.pdf}. 
++has been specified in a separate document called \href{https://web.archive.org/web/20180428070843/http://dvdisaster.net/downloads/codecs.pdf}{codecs.pdf}. 
+ Good knowledge in coding theory and programming is required.
+ 
+ \subsection{The linear reading strategy}
+diff --git a/documentation/user-manual/download.tex b/documentation/user-manual/download.tex
+index 79df7be..a91a44a 100644
+--- a/documentation/user-manual/download.tex
++++ b/documentation/user-manual/download.tex
+@@ -15,7 +15,7 @@ the \href{http://www.gnu.org/licenses/gpl-3.0.txt}{GNU General Public License v3
+ 
+ \bigskip
+ 
+-The dvdisaster developer site (\url{http://dvdisaster.net}) contains
++The dvdisaster developer site (\url{https://web.archive.org/web/20180428070843/http://dvdisaster.net}) contains
+ the latest source code releases for the FreeBSD, GNU/Linux and NetBSD
+ operating systems. These are mostly aimed at maintainers of binary packages for
+ the beforementioned platforms. As an end user you might find it more convenient
+@@ -133,6 +133,6 @@ We cannot accept them for various reasons.
+ \smallskip
+ 
+ dvdisaster releases are always published with cryptographic signatures
+-and md5 checksums. See the \href{http://dvdisaster.net}{download site} for examples.
++and md5 checksums. See the \href{https://web.archive.org/web/20180428070843/http://dvdisaster.net}{download site} for examples.
+ Be very cautious if signatures and checksums are missing, invalid or not
+ matching those published at the sites mentioned above.

debian/patches/36-fix-parallelism.patch

@@ -0,0 +1,54 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Fri, 1 Feb 2019 22:28:18 +1100
+Subject: Fix parallel build of locale strings.
+
+Description: Fix parallel build of locale strings.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: no
+Last-Update: 2019-02-01
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ GNUmakefile.template   |  1 +
+ locale/create-makefile | 10 +++++++---
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/GNUmakefile.template b/GNUmakefile.template
+index 4509c48..3aae04e 100644
+--- a/GNUmakefile.template
++++ b/GNUmakefile.template
+@@ -297,6 +297,7 @@ clean:
+ 	rm -f simple-md5sum
+ 	$(MAKE) --no-print-directory -C $(SRCDIR)/documentation/codec-specs 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`
+ arch:	archclean time-stamp
+diff --git a/locale/create-makefile b/locale/create-makefile
+index 5ed31ed..83a4abf 100644
+--- a/locale/create-makefile
++++ b/locale/create-makefile
+@@ -30,15 +30,19 @@ locale: \$(LOCALEFILES)
+ 
+ # Create the locale files. 
+ 
++messages.pot: \$(CFILES)
++	@cd ..; xgettext --no-wrap -cTRANSLATORS: -o locale/messages.pot -k_ -k_utf \$(CFILES_NP)
++
++clean:
++	rm -f messages.pot
++
+ EOF
+ 
+ for i in $prefixes; do
+ cat >> Makefile <<EOF
+-$i.po: \$(CFILES)
++$i.po: messages.pot
+ 	@echo "Updating $i.po"
+-	@cd ..; xgettext --no-wrap -cTRANSLATORS: -o locale/messages.pot -k_ -k_utf \$(CFILES_NP)
+ 	@msgmerge -q -U --no-wrap --no-fuzzy-matching $i.po messages.pot
+-	@rm -f messages.pot
+ 
+ $i/LC_MESSAGES/dvdisaster.mo: $i.po
+ 	@echo "Updating $i.mo"

debian/patches/37-suggest-dvdisaster-doc.patch

@@ -0,0 +1,137 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Sat, 2 Feb 2019 13:56:04 +1100
+Subject: Suggest to install dvdisaster-doc in error message
+
+Description: Suggest to install dvdisaster-doc in error message
+ if the PDF manual cannot be found.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: not-needed
+Last-Update: 2019-02-02
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ locale/cs.po    | 2 ++
+ locale/de.po    | 2 ++
+ locale/it.po    | 2 ++
+ locale/pt_BR.po | 2 ++
+ locale/ru.po    | 2 ++
+ locale/sv.po    | 2 ++
+ show-manual.c   | 3 ++-
+ 7 files changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/locale/cs.po b/locale/cs.po
+index d89ff4a..b55c45a 100644
+--- a/locale/cs.po
++++ b/locale/cs.po
+@@ -6077,10 +6077,12 @@ msgid ""
+ "Documentation file\n"
+ "%s\n"
+ "not found.\n"
++"Please install the dvdisaster-doc package.\n"
+ msgstr ""
+ "Soubor dokumentace\n"
+ "%s\n"
+ "nebyl nalezen.\n"
++"Nainstalujte prosím balíček dvdisaster-doc.\n"
+ 
+ #: show-manual.c:308
+ msgid "Please hang on until the viewer comes up!"
+diff --git a/locale/de.po b/locale/de.po
+index 8112b13..f54b083 100644
+--- a/locale/de.po
++++ b/locale/de.po
+@@ -6226,10 +6226,12 @@ msgid ""
+ "Documentation file\n"
+ "%s\n"
+ "not found.\n"
++"Please install the dvdisaster-doc package.\n"
+ msgstr ""
+ "Dokument-Datei\n"
+ "%s\n"
+ "nicht gefunden.\n"
++"Bitte installieren Sie das dvdisaster-doc-Paket.\n"
+ 
+ #: show-manual.c:308
+ msgid "Please hang on until the viewer comes up!"
+diff --git a/locale/it.po b/locale/it.po
+index b98f8d3..de60016 100644
+--- a/locale/it.po
++++ b/locale/it.po
+@@ -5629,10 +5629,12 @@ msgid ""
+ "Documentation file\n"
+ "%s\n"
+ "not found.\n"
++"Please install the dvdisaster-doc package.\n"
+ msgstr ""
+ "File di documentazione\n"
+ "%s\n"
+ "non trovati.\n"
++"Si prega di installare il pacchetto dvdisaster-doc.\n"
+ 
+ #: show-manual.c:308
+ msgid "Please hang on until the viewer comes up!"
+diff --git a/locale/pt_BR.po b/locale/pt_BR.po
+index 81ee14d..3659f11 100644
+--- a/locale/pt_BR.po
++++ b/locale/pt_BR.po
+@@ -5950,10 +5950,12 @@ msgid ""
+ "Documentation file\n"
+ "%s\n"
+ "not found.\n"
++"Please install the dvdisaster-doc package.\n"
+ msgstr ""
+ "Arquivo de documentação\n"
+ "%s\n"
+ "não encontrado.\n"
++"Por favor, instale o pacote dvdisaster-doc.\n"
+ 
+ #: show-manual.c:308
+ msgid "Please hang on until the viewer comes up!"
+diff --git a/locale/ru.po b/locale/ru.po
+index 6e980b9..9c45692 100644
+--- a/locale/ru.po
++++ b/locale/ru.po
+@@ -5958,10 +5958,12 @@ msgid ""
+ "Documentation file\n"
+ "%s\n"
+ "not found.\n"
++"Please install the dvdisaster-doc package.\n"
+ msgstr ""
+ "Файл документации\n"
+ "%s\n"
+ "не найден.\n"
++"Пожалуйста, установите пакет dvdisaster-doc.\n"
+ 
+ #: show-manual.c:308
+ msgid "Please hang on until the viewer comes up!"
+diff --git a/locale/sv.po b/locale/sv.po
+index 3011969..9cee323 100644
+--- a/locale/sv.po
++++ b/locale/sv.po
+@@ -5648,10 +5648,12 @@ msgid ""
+ "Documentation file\n"
+ "%s\n"
+ "not found.\n"
++"Please install the dvdisaster-doc package.\n"
+ msgstr ""
+ "Dokumentationsfilen\n"
+ "%s\n"
+ "hittades inte.\n"
++"Installera dvdisaster-doc-paketet.\n"
+ 
+ #: show-manual.c:308
+ msgid "Please hang on until the viewer comes up!"
+diff --git a/show-manual.c b/show-manual.c
+index 4abbe97..5ac8e97 100644
+--- a/show-manual.c
++++ b/show-manual.c
+@@ -296,7 +296,8 @@ void ShowPDF(char *target)
+ 
+    if(!LargeStat(bi->path, &ignore))
+    {  
+-      CreateMessage(_("Documentation file\n%s\nnot found.\n"), GTK_MESSAGE_ERROR, bi->path);
++      CreateMessage(_("Documentation file\n%s\nnot found.\n"
++	       "Please install the dvdisaster-doc package.\n"), GTK_MESSAGE_ERROR, bi->path);
+       g_free(bi->path);
+       g_free(bi);
+       return;

debian/patches/series

@@ -1,27 +1,9 @@
-02-encryption.patch
-03-dvdrom.patch
-05-help-dialog.patch
-08-fix-gnu-make-detection.patch
-10-use-non-size-specific-icon-and-add-keywords-to-desktop-file.patch
 11-no-cruft.patch
-12-fix-spelling-of-up-to.patch
-13-fix-missing-language-field-in-po-files.patch
-14-make-builds-reproducible.patch
 15-show-new-pkg-tracker.patch
 16-remove-auto-build-of-doco-from-install-rule.patch
-17-fix-all-but-deprecated-api-warnings.patch
-18-update-copyright-in-about-dialog.patch
-19-show-text-files-with-abs-path.patch
 20-display-changelog-credits-and-todo.patch
-22-fix-hurd-i386-ftbfs.patch
-23-add-bdrom-support.patch
 24-show-gpl3-license.patch
-25-fix-man-pages.patch
 26-fix-display-of-manual.pdf.patch
-27-allow-opening-in-browser-again.patch
-28-pdftex-reproducibility.patch
-29-fix-more-typos.patch
-30-hurd-kfreebsd-ftbfs.patch
-31-improve-hurd-and-kfreebsd-support.patch
 32-display-compilation-commands.patch
-33-honour-LDFLAGS.patch
+34-gcc8-format-security.patch
+37-suggest-dvdisaster-doc.patch

debian/rules

@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+export DH_VERBOSE = 1
+
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
@@ -13,6 +15,7 @@ export FORCE_SOURCE_DATE = 1
 MUTABLE_FILES := build.h $(wildcard locale/*.po) \
 	documentation/config/version.tex \
 	documentation/user-manual/manual.pdf
+BACKUP_TAR_FILE := debian/backup.tar
 
 BUILDROOT := $(CURDIR)/debian/tmp
 ICONS := $(wildcard contrib/dvdisaster*.png)
@@ -21,29 +24,32 @@ ICON_SIZES := $(patsubst contrib/dvdisaster%.png,%,$(ICONS))
 %:
 	dh $@
 
+override_dh_update_autotools_config:
+	dh_update_autotools_config
+	test -f $(BACKUP_TAR_FILE) || \
+		tar cpf $(BACKUP_TAR_FILE) $(MUTABLE_FILES)
+
+override_dh_clean:
+	dh_clean
+	test ! -f $(BACKUP_TAR_FILE) || \
+		tar xpf $(BACKUP_TAR_FILE) && rm -f $(BACKUP_TAR_FILE)
+
 override_dh_auto_configure:
-	for f in $(MUTABLE_FILES); do \
-		cp -an $$f $$f.orig; \
-	done
 	./configure \
 		--prefix=/usr \
 		--mandir=share/man \
 		--localedir=share/locale \
 		--docdir=share/doc \
-		--docsubdir=dvdisaster-doc \
+		--docsubdir=dvdisaster \
 		--with-embedded-src-path=no
 
-override_dh_clean:
-	dh_clean -X.orig
-	for f in $(MUTABLE_FILES); do \
-		test ! -f $$f.orig || mv -f $$f.orig $$f; \
-	done
-
 override_dh_auto_build-arch:
-	make all
+	dh_auto_build -a -- all
 
 override_dh_auto_build-indep:
-	make manual
+	dh_auto_build -i \
+		$(if $(findstring nodoc,$(DEB_BUILD_OPTIONS)),--no-act) \
+		-- manual
 
 override_dh_auto_install-arch:
 	dh_auto_install -a -- BUILDROOT=$(BUILDROOT)
@@ -62,4 +68,8 @@ override_dh_auto_install-indep:
 # automatically decompress text files.
 override_dh_compress-arch:
 	dh_compress -p dvdisaster \
-		-XCHANGELOG -XCREDITS -XREADME.MODIFYING -XTODO
+		-Xchangelog -XCREDITS -XREADME.MODIFYING -XTODO
+	gzip -9n debian/dvdisaster/usr/share/doc/dvdisaster/changelog.Debian
+
+override_dh_installchangelogs-arch:
+	dh_installchangelogs -p dvdisaster -k

debian/upstream/metadata

@@ -1,6 +1,4 @@
-%YAML 1.1
----
 # https://wiki.debian.org/UpstreamMetadata
-Contact: Carsten Gnörlich <carsten@dvdisaster.org>
-Name: dvdisaster
-Homepage: http://dvdisaster.net/
+Documentation: https://web.archive.org/web/20180428070843/http://dvdisaster.net/en/misc.html#manual
+Homepage: https://web.archive.org/web/20180428070843/http://dvdisaster.net/
+Security-Contact: Carsten Gnörlich <carsten@dvdisaster.org>

debian/watch

@@ -1,4 +1,4 @@
 version=3
 opts="pgpsigurlmangle=s/$/.gpg/" \
-http://dvdisaster.net/en/index.html \
+https://web.archive.org/web/20180428070843/https://dvdisaster.net/en/index.html \
      (?:.*?/)?dvdisaster-(.*)\.tar\.bz2 debian uupdate

documentation/codec-specs/rs01.tex

@@ -44,7 +44,7 @@ correction files must be protected with an image level
 error correction layer (by using RS01,RS02 or RS03 on the medium), 
 since only image level error correction avoids meta 
 data sectors to become a single point of failure. See the
-discussion at \url{http://dvdisaster.net/en/qa32.html} for
+discussion at \url{https://web.archive.org/web/20180428070843/http://dvdisaster.net/en/qa32.html} for
 more information on the advantages of image level data protection
 over file level approaches.
 
@@ -172,7 +172,7 @@ The $d_{i,j}$ denote the $i-th$ byte in the $j-th$ layer.
 In order to create the first ecc block, bytes $d_{1,1}$ to  $d_{1,n}$ are taken from the
 $n$ layers. Then the RS(255,k) code is calculated (see appendix \ref{rs} for its parameters)
 and the 
-resulting $k$ parity bytes $e_{1,1}$ upto $e_{k,1}$ are stored
+resulting $k$ parity bytes $e_{1,1}$ up to $e_{k,1}$ are stored
 in the ecc file. The resulting ecc block is marked grey in the
 figure. The next ecc blocks are calculated and stored accordingly.
 In total, the ecc section contains $k*ls$ bytes of parity information,

documentation/codec-specs/rs02.tex

@@ -74,7 +74,7 @@ the parity data portion of the image might not be written to the medium.
 Most current writing programs do however measure the .iso image by examining
 its file size, and will transfer the parity data correctly. To be sure you
 should follow the steps described under ``Testing image compatibility''
-at the dvdisaster site (\url{http://dvdisaster.net/en/howtos92.html}) once
+at the dvdisaster site (\url{https://web.archive.org/web/20180428070843/http://dvdisaster.net/en/howtos92.html}) once
 before using each version of your optical media authoring software.
 
 Like the other dvdisaster codecs, RS02 is based on a  RS(255,k) Reed-Solomon code
@@ -133,7 +133,7 @@ Its format is described in appendix \ref{eh}. For RS02, only the data fields
 marked with ``all'' or ``RS02'' are relevant; all other fields should be set to zero.
 
 Data layer $n$ does also contain the CRC32 checksums of each data sector
-upto the ecc header. If the .iso image contains $s$ sectors, 
+up to the ecc header. If the .iso image contains $s$ sectors,
 then the CRC field contains $4s$ bytes, rounded up
 to the nearest multiple of 2048. 
 CRC32 checksums are calculated over a whole CD sector comprising 2048 bytes.

documentation/config/version.tex

@@ -1 +0,0 @@
-\newcommand{\projectversion}{0.79.6}

documentation/dvdisaster.en.1

@@ -1,4 +1,4 @@
-.TH DVDISASTER 1 "2010-02-06" "0.80" "protection for optical media"
+.TH DVDISASTER 1 "2020-08-30" "0.80" "protection for optical media"
 
 .SH NAME
 DVDISASTER \- data loss/scratch/aging protection for optical media
@@ -50,6 +50,7 @@ DVDISASTER \- data loss/scratch/aging protection for optical media
 .RB [\| \-\-medium-info \|]
 .RB [\| \-\-no-progress \|]
 .RB [\| \-\-old-ds-marker \|]
+.RB [\| \-\-no-bdr-defect-management \|]
 .RB [\| \-\-prefetch-sectors
 .IR n \|]
 .RB [\| \-\-raw-mode
@@ -225,6 +226,21 @@ RS02 images:
 \-n BDXL3 augments image suitable for three layered BDXL media.
 .RE
 .RS
+\-n BDXL4 augments image suitable for quadruple layered BDXL media.
+.RE
+.RS
+\-n BDNODM\ \ \ \ augments image suitable for BD media burnt without defect management.
+.RE
+.RS
+\-n BD2NODM\ \  augments image suitable for two layered BD media burnt without defect management.
+.RE
+.RS
+\-n BDXL3NODM augments image suitable for three layered BDXL media burnt without defect management.
+.RE
+.RS
+\-n BDXL4NODM augments image suitable for quadruple layered BDXL media burnt without defect management.
+.RE
+.RS
 \-n x\ \ \ \ \ augments image using approx. x sectors in total.
 .RE
 .RS
@@ -240,9 +256,22 @@ RS03 images:
 .RS
 Setting the redundancy is not possible due to constraints in the format.
 The codec will automatically choose the size of the smallest fitting medium.
+However, see --no-bdr-defect-management below.
 .RE
 .RE
 
+.TP
+.B \-\-no-bdr-defect-management
+Enable bigger augmented images for BD-R (around +3%).
+If you know you will use a BD-R medium and want to maximize the free space
+for parity data, you can skip the defect management formatting before burning,
+at the expense of potential coasters. Specify this option to tell dvdisaster
+to produce bigger images that will only fit on BD-R media burnt without defect
+management. Some burning softwares call it "formatting" the BD-R before burning.
+Note that should you need to repair such an augmented image, you'll then need to
+specify this option on the command-line too.
+.RE
+
 .TP
 .B \-m, \-\-method n
 lists/selects error correction methods (default: RS01).
@@ -279,7 +308,7 @@ Selects between the sg (SG_IO) driver (default setting) and the
 older cdrom (CDROM_SEND_PACKET) driver for accessing the optical drives.
 Both drivers should work equally well; however the cdrom driver is known
 to cause system failures on some ancient SCSI controllers. 
-The older cdrom driver was the default upto and including dvdisaster 0.72.x;
+The older cdrom driver was the default up to and including dvdisaster 0.72.x;
 if the now pre-selected sg driver changes something to the worse for you
 please switch back to the older driver using \-\-driver=cdrom.
 .TP
@@ -384,7 +413,7 @@ the uncorrected sector instead.
 .RE
 .TP
 .B \-\-read-attempts n-m
-attempts n upto m reads of a defective sector.
+attempts n up to m reads of a defective sector.
 .TP
 .B \-\-read-medium n
 read the whole medium up to n times.

documentation/upstream-site/de/impressum.html

@@ -63,7 +63,7 @@ Carsten Gnörlich (Anschrift wie oben).
 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="http://dvdisaster.net">dvdisaster.net</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 -->

documentation/upstream-site/en/imprint.html

@@ -63,7 +63,7 @@ Carsten Gnörlich (see above for address).
 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="http://dvdisaster.net">dvdisaster.net</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 -->

documentation/user-manual/background.tex

@@ -272,7 +272,7 @@ media with augmented images may not play correctly on all units \\
 \end{tabular}
 
 \paragraph{Further reading.} The specification for the dvdisaster codecs 
-has been specified in a separate document called \href{http://dvdisaster.net/downloads/codecs.pdf}{codecs.pdf}. 
+has been specified in a separate document called \href{https://web.archive.org/web/20180428070843/http://dvdisaster.net/downloads/codecs.pdf}{codecs.pdf}. 
 Good knowledge in coding theory and programming is required.
 
 \subsection{The linear reading strategy}

documentation/user-manual/download.tex

@@ -15,7 +15,7 @@ the \href{http://www.gnu.org/licenses/gpl-3.0.txt}{GNU General Public License v3
 
 \bigskip
 
-The dvdisaster developer site (\url{http://dvdisaster.net}) contains
+The dvdisaster developer site (\url{https://web.archive.org/web/20180428070843/http://dvdisaster.net}) contains
 the latest source code releases for the FreeBSD, GNU/Linux and NetBSD
 operating systems. These are mostly aimed at maintainers of binary packages for
 the beforementioned platforms. As an end user you might find it more convenient
@@ -133,6 +133,6 @@ We cannot accept them for various reasons.
 \smallskip
 
 dvdisaster releases are always published with cryptographic signatures
-and md5 checksums. See the \href{http://dvdisaster.net}{download site} for examples.
+and md5 checksums. See the \href{https://web.archive.org/web/20180428070843/http://dvdisaster.net}{download site} for examples.
 Be very cautious if signatures and checksums are missing, invalid or not
 matching those published at the sites mentioned above.

documentation/user-manual/howtos.tex

@@ -1822,7 +1822,7 @@ process of creating error correction files using these options. The
 first option marked green lets dvdisaster create the error correction
 file immediately after the medium has been (completely) read.
 The second option marked green deletes the image when the error correction
-file has been sucessfully created.
+file has been successfully created.
 
 \bigskip
 

documentation/user-manual/manual.tex

@@ -65,6 +65,8 @@
 \fancyfoot{}
 \fancyfoot[LE,RO]{page \thepage\ of \pageref{LastPage}}
 
+\pdftrailerid{dvdisaster}
+\pdfsuppressptexinfo=-1
 \begin{document}
 
 \definecolor{lightorange}{RGB}{255,224,150}

documentation/user-manual/qa.tex

@@ -465,6 +465,6 @@ drive for reading images in these cases.}
 
 \qa{``Ecc file has been created with version 0.40.7.''}
       {Some developer versions of dvdisaster mark their ecc files with a special bit.
-        This causes dvdisaster versions upto 0.65 to falsely display the above error
+        This causes dvdisaster versions up to 0.65 to falsely display the above error
         message. Please use the developer versions only together with dvdisaster
         0.66 or newer versions. }

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"
@@ -30,15 +30,19 @@ locale: \$(LOCALEFILES)
 
 # Create the locale files. 
 
+messages.pot: \$(CFILES)
+	@cd ..; xgettext --no-wrap -cTRANSLATORS: -o locale/messages.pot -k_ -k_utf \$(CFILES_NP)
+
+clean:
+	@rm -f messages.pot
+
 EOF
 
 for i in $prefixes; do
 cat >> Makefile <<EOF
-$i.po: \$(CFILES)
+$i.po: messages.pot
 	@echo "Updating $i.po"
-	@cd ..; xgettext --no-wrap -cTRANSLATORS: -o locale/messages.pot -k_ -k_utf \$(CFILES_NP)
 	@msgmerge -q -U --no-wrap --no-fuzzy-matching $i.po messages.pot
-	@rm -f messages.pot
 
 $i/LC_MESSAGES/dvdisaster.mo: $i.po
 	@echo "Updating $i.mo"

regtest/common.bash

@@ -1,15 +1,17 @@
 CONFIGFILE="./config.txt"
+CONFIGFILE_WIN="./config-win.txt"
 NEWVER=../dvdisaster
 SETVERSION="0.80"
 
 DATABASE=./database
 RNDSEQ="./fixed-random-sequence"
 
+NON_EXISTENT_DEVICE=/dev/sdz
 ISODIR=/var/tmp/regtest
 if ! test -d $ISODIR; then
     echo "$ISODIR does not exist."
     echo "Please create it manually, or edit common.bash"
-    exit 0
+    exit 1
 fi
 
 LOGDIR="/dev/shm"
@@ -26,20 +28,31 @@ if ! $MD5SUM $RNDSEQ >/dev/null 2>&1; then
     MD5SUM=../simple-md5sum
 fi
 
+nbfailed=0
+
 # Assemble sed expressions for removal of variable output contents
 
-SED_REMOVE_ISO_DIR=$(echo "${ISODIR}/" | sed -e "s/\//\\\\\//g")
-SED_REMOVE_DEV_SHM=$(echo "/dev/shm/"  | sed -e "s/\//\\\\\//g")
+SED_REMOVE_ISO_DIR="([a-zA-Z]:/[a-zA-Z0-9/]+)?${ISODIR}/"
+
+# 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>]"
-    exit 0;
+    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=($*)
@@ -49,6 +62,7 @@ case "${param[0]}" in
 	gui_mode="true"
 	param[0]="${param[1]}"
 	param[1]="${param[2]}"
+	param[2]="${param[3]}"
 	;;
 esac
 	
@@ -57,9 +71,11 @@ case "${param[0]}" in
 	doall="yes"
 	;;
     cont)
-	doall="yes"
 	cont_at="${param[1]}"
 	;;
+    only)
+	only_this_one="${param[1]}"
+	;;
 esac
 
 # Sanity check
@@ -69,7 +85,7 @@ if test -x $NEWVER; then
     echo "OK"
 else
     echo "missing."
-    exit 0
+    exit 1
 fi
 
 ### Helper functions
@@ -94,6 +110,9 @@ function file_exists()
 
 function try()
 {  local doit=$(grep "${CODEC_PREFIX}_$2 " $CONFIGFILE)
+   if echo "$OS" | grep -q Windows && test -e "$CONFIGFILE_WIN" && grep -q "${CODEC_PREFIX}_$2 " "$CONFIGFILE_WIN"; then
+       doit=$(grep "${CODEC_PREFIX}_$2 " "$CONFIGFILE_WIN")
+   fi
 
    if test -z "$doit"; then
        echo "Config for ${CODEC_PREFIX}_$2 missing"
@@ -106,9 +125,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
@@ -120,10 +149,20 @@ function try()
 	   rm -f $SIMISO
        fi
        
-       echo -n "Test case: $1 - "
+       if test -z "$REGTEST_SECTION"; then
+	   REGTEST_SECTION="Test"
+       fi
+
+       if [ "$REGTEST_NO_UTF8" != 1 ]; then
+           echo -n "[ ] "
+       fi
+       echo -n "${CODEC_PREFIX} - ${REGTEST_SECTION} - $1 - "
        return 0
    else
-#       echo "Skipping: $1 ($doit, ${CODEC_PREFIX}_$2)"
+       if [ "$REGTEST_NO_UTF8" != 1 ]; then
+           echo -n "[-] "
+       fi
+       echo "${CODEC_PREFIX} - ${REGTEST_SECTION} - $1 - SKIPPED ($doit, ${CODEC_PREFIX}_$2)"
        return 1
    fi
 }
@@ -153,6 +192,7 @@ function run_regtest()
    local testparms="$2"
    local testiso="$3"
    local testecc="$4"
+   local options="$5"
    local testeccopt=""
    local image_md5=""
    local ecc_md5=""
@@ -187,31 +227,49 @@ function run_regtest()
      # ignore the memory tracker line when no memory leaks
      # have been found
      
-     grep -v "dvdisaster: No memory leaks found." $NEWLOG >$TMPLOG
+     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
-	 egrep -v "$IGNORE_LOG_LINE" $NEWLOG >$TMPLOG
+	 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) <(sed -e "s/${SED_REMOVE_ISO_DIR}//g" $NEWLOG) >${DIFFLOG}; then
-	 echo "BAD; diffs found (<expected; >created):"
+     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}
 
 	 if test "$interactive_diff" == "yes"; then
-	   echo
-	   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
+	   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 -e "s=${SED_REMOVE_ISO_DIR}==g" $NEWLOG >>$REFLOG
+	         pass="skip"
+	      elif test "$answer" == "v"; then
+	         vimdiff $REFLOG $NEWLOG
+	         continue
+	      else
+	         pass="false"
+	      fi
+	      break
+	   done
 	 else
 	   pass="false"
 	 fi
@@ -228,7 +286,7 @@ function run_regtest()
 	   xterm_pid=$!
        fi
 
-       LANG=en_EN.UTF-8 $NEWVER --regtest $extra_args --resource-file $LOGDIR/.dvdisaster-regtest >>$NEWLOG 2>&1
+       LANG=en_EN.UTF-8 timeout 15 $NEWVER --regtest $extra_args --resource-file $LOGDIR/.dvdisaster-regtest >>$NEWLOG 2>&1
        rm -f $LOGDIR/.dvdisaster-regtest
    fi
 
@@ -240,7 +298,11 @@ function run_regtest()
    if test ${image_md5} != "ignore"; then
        md5=$($MD5SUM ${testiso} | cut -d\  -f 1)
        if test "$image_md5" != "$md5"; then
-	   echo "BAD; md5 sum mismatch in image file:"
+	   if [ "$REGTEST_NO_UTF8" = 1 ]; then
+	      echo "BAD; md5 sum mismatch in image file:"
+	   else
+	      printf "%b\r%b\n" "BAD; md5 sum mismatch in image file:" "[\e[31m✘\e[0m]"
+	   fi
 	   echo "... expected  image: $image_md5"
 	   echo "... generated image: $md5"
 	   pass="false"
@@ -250,7 +312,11 @@ function run_regtest()
    if test ${ecc_md5} != "ignore"; then
        md5=$($MD5SUM ${testecc} | cut -d\  -f 1)
        if test "$ecc_md5" != "$md5"; then
-	   echo "BAD; md5 sum mismatch in ecc file:"
+	   if [ "$pass" = false ] || [ "$REGTEST_NO_UTF8" = 1 ]; then
+	      echo "BAD; md5 sum mismatch in ecc file:"
+	   else
+	      printf "%b\r%b\n" "BAD; md5 sum mismatch in ecc file:" "[\e[31m✘\e[0m]"
+	   fi
 	   echo "... expected  ecc: $ecc_md5"
 	   echo "... generated ecc: $md5"
 	   pass="false"
@@ -259,13 +325,19 @@ function run_regtest()
 
    case "${pass}" in
      true)
-      echo "GOOD"
+      if [ "$REGTEST_NO_UTF8" = 1 ]; then
+        echo GOOD
+      else
+        printf "%b\r%b\n" "GOOD" "[\e[32m✓\e[0m]"
+      fi
       ;;
      
      skip)
       ;;
      
      *)
+      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)

regtest/config-win.txt

@@ -0,0 +1,26 @@
+RS01_ecc_no_read_perm no
+RS01_ecc_no_write_perm no
+RS01_fix_no_read_perm no
+RS01_fix_no_read_perm_ecc no
+RS01_fix_no_write_perm no
+RS01_scan_with_no_permission_for_ecc no
+RS01_read_with_no_permission_for_ecc no
+RS01_adaptive_with_no_permission_for_ecc no
+RS02_ecc_no_read_perm no
+RS02_ecc_no_write_perm no
+RS02_fix_no_read_perm no
+RS02_fix_no_write_perm no
+RS03i_ecc_no_read_perm no
+RS03i_ecc_no_write_perm no
+RS03i_fix_no_read_perm no
+RS03i_fix_no_write_perm no
+RS03f_ecc_no_read_perm no
+RS03f_ecc_no_write_perm no
+RS03f_fix_no_read_perm no
+RS03f_fix_no_read_perm_ecc no
+RS03f_fix_no_write_perm no
+RS03f_fix_no_write_perm_ecc no
+
+RS01_scan_no_device_access no
+RS01_read_no_device_access no
+RS01_adaptive_no_device_access no

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

@@ -86,7 +86,7 @@ try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
 RS02Recognize: skipping exhaustive RS02 search
 ...trying RS03
-RS03Recognize: medium sim-cd
+RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
 RS03RecognizeImage: skipping exhaustive RS03 search
 ...no augmented image detected.

regtest/database/RS01_adaptive_defective_no_ecc

@@ -86,7 +86,7 @@ try_sector: trying sector 20850
 try_sector: no cookie, skipping current modulo
 RS02Recognize: skipping exhaustive RS02 search
 ...trying RS03
-RS03Recognize: medium sim-cd
+RS03RecognizeImage: medium sim-cd
 FindRS03HeaderInImage: medium sim-cd
 RS03RecognizeImage: skipping exhaustive RS03 search
 ...no augmented image detected.

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/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_ecc_create

@@ -8,7 +8,7 @@ See the file "COPYING" for further information.
 Opening rs02-tmp.iso: 30000 medium sectors.
 Augmenting image with Method RS02:
  58 MiB data, 9 MiB ecc (35 roots; 15.9% redundancy).
-* Warning: Using redundancies below 20%% may not give
+* Warning: Using redundancies below 20% may not give
 *          the expected data loss protection.
 Image has been augmented with error correction data.
 New image size is 68 MiB (34932 sectors).

regtest/database/RS02_ecc_create_after_partial_read

@@ -16,7 +16,7 @@ Completing image rs02-tmp.iso. Only missing sectors will be read.
 Opening rs02-tmp.iso: 30000 medium sectors.
 Augmenting image with Method RS02:
  58 MiB data, 9 MiB ecc (35 roots; 15.9% redundancy).
-* Warning: Using redundancies below 20%% may not give
+* Warning: Using redundancies below 20% may not give
 *          the expected data loss protection.
 Image has been augmented with error correction data.
 New image size is 68 MiB (34932 sectors).

regtest/database/RS02_ecc_create_after_read

@@ -16,7 +16,7 @@ All sectors successfully read.
 Opening rs02-tmp.iso: 30000 medium sectors.
 Augmenting image with Method RS02:
  58 MiB data, 9 MiB ecc (35 roots; 15.9% redundancy).
-* Warning: Using redundancies below 20%% may not give
+* Warning: Using redundancies below 20% may not give
 *          the expected data loss protection.
 Image has been augmented with error correction data.
 New image size is 68 MiB (34932 sectors).

regtest/database/RS02_ecc_from_larger_rs02

@@ -11,7 +11,7 @@ Opening rs02-tmp.iso: 39809 medium sectors.
 Image size is now: 30000 medium sectors.
 Augmenting image with Method RS02:
  58 MiB data, 9 MiB ecc (35 roots; 15.9% redundancy).
-* Warning: Using redundancies below 20%% may not give
+* Warning: Using redundancies below 20% may not give
 *          the expected data loss protection.
 Image has been augmented with error correction data.
 New image size is 68 MiB (34932 sectors).

regtest/database/RS02_ecc_from_larger_rs02_non_blocksize

@@ -11,7 +11,7 @@ Opening rs02-tmp.iso: 39810 medium sectors.
 Image size is now: 30000 medium sectors and 56 bytes.
 Augmenting image with Method RS02:
  58 MiB data, 9 MiB ecc (35 roots; 15.9% redundancy).
-* Warning: Using redundancies below 20%% may not give
+* Warning: Using redundancies below 20% may not give
 *          the expected data loss protection.
 Image has been augmented with error correction data.
 New image size is 68 MiB (34933 sectors).

regtest/database/RS02_ecc_from_rs02

@@ -11,7 +11,7 @@ Opening rs02-tmp.iso: 34932 medium sectors.
 Image size is now: 30000 medium sectors.
 Augmenting image with Method RS02:
  58 MiB data, 9 MiB ecc (35 roots; 15.9% redundancy).
-* Warning: Using redundancies below 20%% may not give
+* Warning: Using redundancies below 20% may not give
 *          the expected data loss protection.
 Image has been augmented with error correction data.
 New image size is 68 MiB (34932 sectors).

regtest/database/RS02_ecc_from_rs02_non_blocksize

@@ -11,7 +11,7 @@ Opening rs02-tmp.iso: 34933 medium sectors.
 Image size is now: 30000 medium sectors and 56 bytes.
 Augmenting image with Method RS02:
  58 MiB data, 9 MiB ecc (35 roots; 15.9% redundancy).
-* Warning: Using redundancies below 20%% may not give
+* Warning: Using redundancies below 20% may not give
 *          the expected data loss protection.
 Image has been augmented with error correction data.
 New image size is 68 MiB (34933 sectors).