bump to pl6

src/crcbuf.c:142:24: warning: shifting a negative signed value is undefined [-Wshift-negative-value]
      cb->md5State &= ~MD5_BUILDING;
                      ~^~~~~~~~~~~~
src/dvdisaster.h:561:23: note: expanded from macro 'MD5_BUILDING'
 #define MD5_BUILDING 1<<0
                      ^
1 warning generated.

.github/workflows/make-dist.sh

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

.github/workflows/release.yml

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

.github/workflows/tests.yml

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

CHANGELOG

@@ -1,5 +1,48 @@
 # dvdisaster changelog -*-text-*-
 
+0.79.6.patchlevel-6 17-01-2021 *UNOFFICIAL*
+- fix: allow blank media in Preferences>Error correction>RS02>query medium (#19)
+- fix: tested compilation under clang, detected a reversed order or arguments in a call to memset(), fixed
+- fix: printf: added --with-debug-print-format configure option to permit compile-time detection of printf format errors:
+  - fixed some potentially severe ones
+  - replaced %ldd/%ld by PRId64 to remove warnings on all archs
+- fix: appimage: adjust docdir for help menu
+- chore: ensure configure works properly even if user adds -Werror to CFLAGS
+- chore: added --with-werror to configure
+- chore: replaced CLI_ONLY=1 by --with-cli-only in configure
+- chore: update locales
+- chore: debug printf format in GitHub actions tests
+
+0.79.6.patchlevel-5 12-01-2021 *UNOFFICIAL*
+- fix: don't error on blank media in medium-info (#19), bug present upstream since 0.79.5
+- fix: gui: fix the 'SetLabelText() failed' error caption on the medium-info window (#19), bug present upstream since 0.72.3
+- fix: add CHANGELOG, TODO, CREDITS to dist for the Help menu
+- chore: appimage: add missing gtk engines and adjust docdir for help menu
+- chore: enhance packaging, update locales, changelog et al.
+
+0.79.6.patchlevel-4 04-09-2020 *UNOFFICIAL*
+- feat: allow adaptive reading again*
+- feat: add --permissive-medium-type option
+- fix: lift the limitation on the number of cmdline args
+- fix: lift segfault when aborting adaptive read
+- fix: ensure variables are initialized before dereferencing
+- chore: re-enable adaptive read regtests
+- chore: move *.c *.h to src/, and build in build/
+- chore: build: finally really fix make parallelism
+- chore: use gcc -pipe to speed up the build
+- chore: rename CLI version to NOGUI in the version tag
+- chore: add missing target dependency in Makefile
+- chore: update readme
+- chore: locales update
+
+*:The original author disabled adaptive reading
+  specifically in 0.79.6 (see changelog below), as it
+  doesn't handle RS03 correctly yet. In this patchlevel
+  we enable it again for media without (detected) ECC data,
+  and for media protected with RS01 or RS02. If we detect RS03,
+  we tell the user the behaviour is unpredictable/undefined,
+  and recommend using linear reading instead.
+
 0.79.6.patchlevel-3 01-09-2020 *UNOFFICIAL*
 - fix: windows: flavor in build version was always 'UNKNOWN'
 - fix: windows: the config & log files were not written properly

GNUmakefile.template

@@ -63,33 +63,43 @@ LIBS = $(INTL_LIBS) $(CAM_LIBS) $(GTK_LIBS) $(EFENCE_LIBS) $(MUDFLAP_LIBS) -lm
 CFILES = $(CFG_CFILES)
 OFILES = $(CFG_OFILES)
 
+# special case for DESTDIR, if BUILDROOT is undef and DESTDIR is,
+# set BUILDROOT to DESTDIR
+ifeq "" "$(BUILDROOT)"
+BUILDROOT = $(DESTDIR)
+endif
+
 ######################################################################
 # Compilation related
 ######################################################################
 
-.PHONY : all help show locale build.h
+.PHONY : all help show locale
-
-${BUILDTMP}/%.o : %.c
-	@echo "Compiling:" $?
-	@$(CC) $(COPTS) -c $? -o $@
 
 all: dvdisaster
 
-${BUILDTMP}/build.o : build.c build.h
+src/build.h:
-	@echo "Compiling:" build.o
+	@echo "Updating:" src/build.h
-	@$(CC) $(COPTS) -c build.c -o $@
+	@$(SRCDIR)/scripts/time-stamper.bash $(SRCDIR)/src/build.h
+
+${BUILDTMP}/%.o : src/%.c
+	@echo "Compiling:" $?
+	@$(CC) $(COPTS) -c $? -o $@
+
+${BUILDTMP}/build.o : src/build.c src/build.h
+	@echo "Compiling:" src/build.o
+	@$(CC) $(COPTS) -c src/build.c -o $@
+
+${BUILDTMP}/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
 
-build.h:
+dvdisaster: $(ICONS) $(OFILES)
-	@echo "Updating:" build.h
-	@$(SRCDIR)/scripts/time-stamper.bash $(SRCDIR)/build.h
-
-dvdisaster: $(ICONS) $(OFILES) build.h
 	@echo "Linking  : dvdisaster"
 	@if test $(CFG_SYS_OPTIONS) == -DSYS_MINGW; \
-	then windres -v winres.rc -O coff -o winres.o >/dev/null ; \
+	then windres -v src/winres.rc -O coff -o ${BUILDTMP}/winres.o >/dev/null ; \
-	     $(CC) $(LOPTS) $(OFILES) $(LIBS) winres.o -o dvdisaster ; \
+	     $(CC) $(LOPTS) $(OFILES) $(LIBS) ${BUILDTMP}/winres.o -o dvdisaster ; \
 	else $(CC) $(LOPTS) $(OFILES) $(LIBS) -o dvdisaster ; \
 	fi
 	@if test -e locale/de/LC_MESSAGES/dvdisaster.mo \
@@ -98,47 +108,43 @@ dvdisaster: $(ICONS) $(OFILES) build.h
 	else $(MAKE) --no-print-directory -C locale; \
 	fi
 
-inlined-icons.h: icons/read.png icons/create.png icons/scan.png icons/fix.png icons/verify.png
+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      >inlined-icons.h
+	@gdk-pixbuf-csource --raw --name=dvdisaster_read     icons/read.png      >src/inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_create   icons/create.png   >>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     >>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      >>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   >>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 >>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 >>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 >>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 >>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 >>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 >>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 >>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 >>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; \
+	then if test -e src/help-dialogs.h; then rm src/help-dialogs.h; fi; \
-	     mv inlined-icons.h inlined-icons.saved; \
+	     ./simple-md5sum -b src/*.h src/*.c | grep -vF -e inlined-icons.h -e build.h | sort -k2 >tmp.md5; \
-	     mv build.h build.saved; \
-	     ./simple-md5sum -b *.h *.c | 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; \
+	     then echo "#define MODIFIED_SOURCE 1" >> src/help-dialogs.h; \
-	     else echo "#define UNMODIFIED_SOURCE 1" >> 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
+	@echo "Compiling:" src/help-dialogs.c
-	@$(CC) $(COPTS) -c help-dialogs.c -o $(BUILDTMP)/help-dialogs.o
+	@$(CC) $(COPTS) -c src/help-dialogs.c -o $(BUILDTMP)/help-dialogs.o
 
-$(BUILDTMP)/rs-encoder-sse2.o: rs-encoder-sse2.c
+$(BUILDTMP)/rs-encoder-sse2.o: src/rs-encoder-sse2.c
-	@echo "Compiling:" rs-encoder-sse2.c
+	@echo "Compiling:" src/rs-encoder-sse2.c
-	@$(CC) $(SSE2_OPTIONS) $(COPTS) -c rs-encoder-sse2.c -o $(BUILDTMP)/rs-encoder-sse2.o
+	@$(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
+$(BUILDTMP)/rs-encoder-altivec.o: src/rs-encoder-altivec.c
-	@echo "Compiling:" rs-encoder-altivec.c
+	@echo "Compiling:" src/rs-encoder-altivec.c
-	@$(CC) $(ALTIVEC_OPTIONS) $(COPTS) -c rs-encoder-altivec.c -o $(BUILDTMP)/rs-encoder-altivec.o
+	@$(CC) $(ALTIVEC_OPTIONS) $(COPTS) -c src/rs-encoder-altivec.c -o $(BUILDTMP)/rs-encoder-altivec.o
 
 locale:
 	@$(MAKE) --no-print-directory -C locale
@@ -146,8 +152,8 @@ locale:
 untranslated:
 	@$(MAKE) --no-print-directory -C locale check-untranslated
 
-simple-md5sum: md5.c
+simple-md5sum: src/md5.c
-	@$(CC) $(COPTS) $(MUDFLAP_CFLAGS) -DSIMPLE_MD5SUM md5.c $(LDFLAGS) $(MUDFLAP_LFLAGS) $(MUDFLAP_LIBS) -o simple-md5sum
+	@$(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
@@ -294,7 +300,7 @@ archclean: distclean
 
 distclean: clean
 	@echo "Removing configuration files"
-	@rm -f configure.log Makefile.config GNUmakefile locale/Makefile
+	@rm -f configure.log Makefile.config src/build.h GNUmakefile locale/Makefile
 	@for i in locale/?? locale/??_??; do rm -rf $$i; done
 
 # There might be a not executable simple-md5sum from a compiler run
@@ -304,7 +310,7 @@ distclean: clean
 clean:
 	@echo "Removing rebuildable files"
 	@rm -rf *.o $(BUILDTMP)/*.o medium.* abbild.* dvdisaster .dvdisaster core core.* *.core
-	@rm -f inlined-icons.h help-dialogs.h
+	@rm -f src/inlined-icons.h src/help-dialogs.h
 	@find . -name \*\~ -print | xargs rm -f;
 	@find . -name \*.mo -print | xargs rm -f;
 	@find . -name \#\*\# -print | xargs rm -f;
@@ -317,7 +323,7 @@ clean:
 	    $(MAKE) --no-print-directory simple-md5sum; \
 	    echo "[simple-md5sum (re-)built]"; \
 	  fi; \
-	  ./simple-md5sum -b *.h *.c >fingerprints.md5 ;\
+	  ./simple-md5sum -b src/*.h src/*.c >fingerprints.md5 ;\
 	  mv build.saved build.h; \
 	fi
 	@rm -f simple-md5sum
@@ -325,7 +331,7 @@ clean:
 	@$(MAKE) --no-print-directory -C $(SRCDIR)/documentation/user-manual clean;
 	@$(MAKE) --no-print-directory -C $(SRCDIR)/locale clean;
 
-BUILD=`grep BUILD $(SRCDIR)/build.h | cut -d ' ' -f 3`
+BUILD=`grep BUILD $(SRCDIR)/src/build.h | cut -d ' ' -f 3`
 arch:	archclean build.h
 	@cd .. ; tar -c -z -f $(TAR_PREFIX)/$(PKGNAME)-$(BUILD).tgz $(PKGNAME)
 

INSTALL

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

Makefile

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

README.md

@@ -1,54 +1,44 @@
-# dvdisaster provides additional ECC protection for optical media
+# What is dvdisaster?
 
-It can loosely be compared to *par2* files, but the protection works at the *iso* level instead of working at the file level. This way, even if metadata from the optical media filesystem is damaged, dvdisaster can still work flawlessly.
+**dvdisaster** provides additional [ECC](https://en.m.wikipedia.org/wiki/Error_correction_code) protection for optical media. If a medium gets damaged, dvdisaster can recover it as long as the amount of damage is smaller than the amount of ECC data you added to protect it.
 
-This version of dvdisaster supports the following platforms:
+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.
-Linux, FreeBSD, NetBSD on x86, PowerPC, Sparc, and Windows.
 
-Three protection codecs are supported, they're quickly detailed below. Please see the documentation/manual.pdf for more information about these, and everything else.
+Please refer to the [PDF manual](documentation/user-manual/manual.pdf) for more information.
-
-# The codecs
-
-## RS01
-
-RS01 creates error correction files which are stored separately from the image they
-belong to. The artefact is an **ecc** file, which must be stored on another media than the one we're protecting.
-
-## RS02
-
-RS02 creates error correction data which is added to the medium to protect, we call this *augmenting* the image we're protecting. Damaged sectors in the error correction information reduce the data recovering capacity, but do not make recovery impossible - a second medium for keeping or protecting the error correction
-information is not required.
-
-## RS03
-
-RS03 is a further development of RS01 and RS02. It can create both error correction files and
-augmented images, with the following added features:
-
-- RS03 can distribute work over multiple processor cores and is therefore much faster than
-RS01/RS02 on modern hardware.
-- RS03 error correction files are - contrary to RS01 - robust against damage. This should
-not delude you into careless handling of your error correction files though - the disadvantages
-of reading at the filesystem level are still valid.
-- RS03 augmented images do not require so-called master blocks holding important in-
-formation. This makes RS03 a bit more robust, but also more restrictive: The augmented
-image must completely fill the medium now while the size of augmented images can be
-freely chosen in RS02.
-The changes for parallel computation and higher robustness make RS03 a bit less space efficient,
-e.g. RS03 error correction data has slighly less error correction capacity than its RS01/RS02
-counterparts on images with equal size.
 
 # Unofficial version
 
 The last upstream version by Carsten Gnörlich is dated 2017, and could be found on the [official](https://web.archive.org/web/20180428070843/http://dvdisaster.net/en/index.html) [website](https://web.archive.org/web/20180509154525/http://dvdisaster.org/en/index.html) which is [now](http://www.dvdisaster.net) [down](http://www.dvdisaster.org). The original source code [repository](https://sourceforge.net/projects/dvdisaster/files/dvdisaster) doesn't have it, but [Debian sources](https://sources.debian.org/src/dvdisaster/) does, thanks to the maintainer there.
-The original README has been left untouched in this repository.
+The original [README](README) has been left untouched in this repository.
 This version is built on top of the latest upstream version, with the following notable enhancements:
 
 - Most Debian patches have been applied, those specific to Debian have been omitted
 - Windows build supported again, it was dropped upstream a few versions back
-- A CLI-only version is now supported, without depending on gtk (`CLI_ONLY=1 ./configure && make clean && make -j4`)
+- A CLI-only version, not depending on gtk (`./configure --with-cli-only && 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).
+
+This version will never break compatibility with upstream versions, the goal is to ensure an optical media protected by upstream dvdisaster will still be able to be repaired with this version 10+ years from now. Regression tests are here to ensure this is the case.
+
+## 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).
@@ -57,7 +47,7 @@ This is also why precompiled Windows binaries and a precompiled static CLI-only
 
 # Compiling
 
-See the INSTALL file
+See the [INSTALL](INSTALL) file. The [workflow file](.github/workflows/release.yml) that is used to automatically build binaries for each release can also help.
 
 # Screenshots
 

configure

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

contrib/AppRun.sh

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

documentation/codecs.pdf

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

documentation/upstream-site/css/dvdisaster.css

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

documentation/upstream-site/de/datenschutz.html

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

documentation/upstream-site/de/impressum.html

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

documentation/upstream-site/de/index.html

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

documentation/upstream-site/de/verschiedenes.html

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

documentation/upstream-site/downloads/pubkey1.asc

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

documentation/upstream-site/downloads/pubkey2.asc

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

documentation/upstream-site/en/imprint.html

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

documentation/upstream-site/en/index.html

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

documentation/upstream-site/en/misc.html

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

documentation/upstream-site/en/privacy.html

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

fingerprints.md5

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

locale/create-makefile

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

regtest/common.bash

@@ -28,6 +28,8 @@ 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="([a-zA-Z]:/[a-zA-Z0-9/]+)?${ISODIR}/"
@@ -44,12 +46,13 @@ fi
 # Usage
 
 if test "$1" == "--help" || test "$1" == "-h"; then
-    echo "Usage: $0 [gui] [all|cont <test case>]"
+    echo "Usage: $0 [gui] [all|[cont|only] <test case>]"
     exit 1;
 fi
 
 doall="no"
 cont_at="false"
+only_this_one="false"
 gui_mode="false"
 
 param=($*)
@@ -59,6 +62,7 @@ case "${param[0]}" in
 	gui_mode="true"
 	param[0]="${param[1]}"
 	param[1]="${param[2]}"
+	param[2]="${param[3]}"
 	;;
 esac
 	
@@ -69,6 +73,9 @@ case "${param[0]}" in
     cont)
 	cont_at="${param[1]}"
 	;;
+    only)
+	only_this_one="${param[1]}"
+	;;
 esac
 
 # Sanity check
@@ -118,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
@@ -222,7 +239,9 @@ function run_regtest()
 
      filter=cat
      echo "$options" | grep -qw SORTED && filter=sort
-     if [ "${CODEC_PREFIX}_${testsymbol}" = RS01_scan_no_device ] || [ "${CODEC_PREFIX}_${testsymbol}" = RS01_read_no_device ]; then
+     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
@@ -236,17 +255,21 @@ function run_regtest()
 	 cat ${DIFFLOG}
 
 	 if test "$interactive_diff" == "yes"; then
-	   echo
+	   while true; do
-	   echo ">> The diff can also be seen with: vimdiff $REFLOG $NEWLOG"
+	      read -n 1 -p ">> Press 'a' to accept this diff; 'v' to vimdiff; any other key to fail this test:" -e answer
-	   read -n 1 -p ">> Press 'a' to accept this diff; any other key to fail this test:" -e answer
+	      if test "$answer" == "a"; then
-	   if test "$answer" == "a"; then
+	         cp $REFLOG $LOGDIR
-	       cp $REFLOG $LOGDIR
+	         head -n 2 $LOGDIR/${CODEC_PREFIX}_${testsymbol} >$REFLOG 
-	       head -n 2 $LOGDIR/${CODEC_PREFIX}_${testsymbol} >$REFLOG 
+	         sed -e "s=${SED_REMOVE_ISO_DIR}==g" $NEWLOG >>$REFLOG
-	       sed -e "s=${SED_REMOVE_ISO_DIR}==g" $NEWLOG >>$REFLOG
+	         pass="skip"
-	       pass="skip"
+	      elif test "$answer" == "v"; then
-	   else
+	         vimdiff $REFLOG $NEWLOG
-	       pass="false"
+	         continue
-	   fi
+	      else
+	         pass="false"
+	      fi
+	      break
+	   done
 	 else
 	   pass="false"
 	 fi
@@ -313,6 +336,8 @@ function run_regtest()
       ;;
      
      *)
+      nbfailed=$((nbfailed + 1))
+      [ $nbfailed -ge 256 ] && nbfailed=255
       echo "test symbol for config: $testsymbol"
       if test "$fail_on_bad" == "yes"; then
 	next=$(grep -A 1  ${CODEC_PREFIX}_$testsymbol config.txt | tail -n 1 | cut -d\  -f 1)

regtest/config.txt

@@ -1,6 +1,6 @@
 # Global toggles
 
-FAIL_ON_BAD yes
+FAIL_ON_BAD no
 SPAWN_LOG_WINDOW no
 INTERACTIVE_DIFF yes
 

regtest/database/RS01_adapive_wrong_fp_with_ecc

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

regtest/database/RS01_adaptive_crc_errors_with_ecc

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

regtest/database/RS01_adaptive_defective_large_skip

@@ -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/rs01.bash

@@ -441,7 +441,7 @@ fi
 # Tests whether CRC and ECC information is taken from the read process,
 # not the wrong ecc file.
 
-if false && try "read image with wrong ecc (RS01) and create new ecc" ecc_recreate_after_read_wrong_rs01; then
+if try "read image with wrong ecc (RS01) and create new ecc" ecc_recreate_after_read_wrong_rs01; then
   cp $MASTERISO $SIMISO
 
   $NEWVER --debug -i$TMPISO --random-image $((ISOSIZE-777)) --random-seed 1337 >>$LOGFILE 2>&1
@@ -1478,9 +1478,6 @@ fi
 
 REGTEST_SECTION="Reading tests (adaptive)"
 
-echo "Currently not enabled!"
-exit $nbfailed
-
 # Read good image with error correction data available
 
 if try "reading good image" adaptive_good; then

regtest/rs02.bash

@@ -730,7 +730,7 @@ fi
 
 # Fix image containing 137 extra bytes
 
-if false && try "trying to fix image with 137 extra bytes" fix_image_plus137; then
+if try "trying to fix image with 137 extra bytes" fix_image_plus137; then
   # Test possibly broken on upstream 0.79.6, forcefully ignoring
 
   cp $ISO_PLUS137 $TMPISO
@@ -743,7 +743,7 @@ fi
 # error in the zero-padded area following the 137 bytes.
 # Both shall be corrected.
 
-if false && try "trying to fix image with error in 137 extra bytes" fix_image_error_in_plus137; then
+if try "trying to fix image with error in 137 extra bytes" fix_image_error_in_plus137; then
   # Test possibly broken on upstream 0.79.6, forcefully ignoring
 
   cp $ISO_PLUS137 $TMPISO
@@ -1775,9 +1775,6 @@ fi
 
 REGTEST_SECTION="Reading tests (adaptive)"
 
-echo "Currently not enabled!"
-exit $nbfailed
-
 # Read complete / optimal image
 
 if try "reading good image" adaptive_good; then

regtest/runtests.sh

@@ -2,8 +2,9 @@
 cd "$(dirname "$0")"
 allfailed=0
 for i in rs*.bash; do
-   ( DVDISASTER_SCSI_SIMULATED_NODELAY=1 REGTEST_NO_UTF8=1 ./$i ); ret=$?
+   ( DVDISASTER_SCSI_SIMULATED_NODELAY=1 ./$i ); ret=$?
    allfailed=$((allfailed + ret))
 done
 echo Failed $allfailed tests
+[ $allfailed -ge 256 ] && allfailed=255
 exit $allfailed

scripts/bash-based-configure

@@ -470,7 +470,7 @@ function PACKAGE()
    echo "CFG_VERSION = $VERSION" >> Makefile.config
 }
 
-# Add -D$1=$2 to CFG_OTHER_OPTIONS
+# Add -D$1="$2" to CFG_OTHER_OPTIONS
 
 function DEFINE_STRING()
 {  
@@ -483,6 +483,19 @@ function DEFINE_STRING()
    CFG_OTHER_OPTIONS="$CFG_OTHER_OPTIONS -D$1=\\\"$2\\\""
 }
 
+# Add -D$1=$2 to CFG_OTHER_OPTIONS
+
+function DEFINE_INT()
+{
+   if test -z "$1" || test -z "$2"; then
+     echo "DEFINE_INT $1 $2:"
+     echo "  needs two arguments"
+     exit 1;
+   fi
+
+   CFG_OTHER_OPTIONS="$CFG_OTHER_OPTIONS -D$1=$2"
+}
+
 # Add CFG_$1 = $2 to makefile
 
 function DEFINE_VAR()
@@ -602,7 +615,7 @@ function GET_BINDIR()
 function GET_DOCDIR() 
 {  local default="$1"
 
-   path_from_default "doc" "$default" $cfg_docdir
+   path_from_default "share/doc" "$default" $cfg_docdir
    DOCDIR=$ret_path
 
    if test -n "$cfg_help_mode"; then
@@ -620,7 +633,7 @@ function GET_DOCDIR()
 function GET_LOCALEDIR() 
 {  local default="$1"
 
-   path_from_default "locale" "$default" $cfg_localedir
+   path_from_default "share/locale" "$default" $cfg_localedir
    LOCALEDIR=$ret_path
 
    if test -n "$cfg_help_mode"; then
@@ -638,7 +651,7 @@ function GET_LOCALEDIR()
 function GET_MANDIR() 
 {  local default="$1"
 
-   path_from_default "man" "$default" $cfg_mandir
+   path_from_default "share/man" "$default" $cfg_mandir
    MANDIR=$ret_path
 
    if test -n "$cfg_help_mode"; then
@@ -729,15 +742,15 @@ function GET_DIR()
 # Try to compile conftest.c
 
 function try_compile()
-{ echo "$CC $CFG_CFLAGS conftest.c $CFG_LDFLAGS $CFG_LIBS -lm -o conftest" >>$LOGFILE
+{ echo "$CC $CFG_CFLAGS -Wno-error conftest.c $CFG_LDFLAGS $CFG_LIBS -lm -o conftest" >>$LOGFILE
   cat conftest.c >>$LOGFILE
-  { (eval "$CC $CFG_CFLAGS conftest.c $CFG_LDFLAGS $CFG_LIBS -lm -o conftest") 2>>$LOGFILE; } && test -s conftest
+  { (eval "$CC $CFG_CFLAGS -Wno-error conftest.c $CFG_LDFLAGS $CFG_LIBS -lm -o conftest") 2>>$LOGFILE; } && test -s conftest
 }
 
 function try_preprocess()
-{ echo "$CC $CFG_CFLAGS -E conftest.c -o conftest.out" >>$LOGFILE
+{ echo "$CC $CFG_CFLAGS -Wno-error -E conftest.c -o conftest.out" >>$LOGFILE
   cat conftest.c >>$LOGFILE
-  { (eval "$CC $CFG_CFLAGS -E conftest.c -o conftest.out") 2>>$LOGFILE; } && test -s conftest.out
+  { (eval "$CC $CFG_CFLAGS -Wno-error -E conftest.c -o conftest.out") 2>>$LOGFILE; } && test -s conftest.out
 }
 
 # Try to compile a main() with a given function

scripts/time-stamper.bash

@@ -2,8 +2,8 @@
 build=$(grep BUILDNUM $1 2>/dev/null | cut -d\  -f3)
 build=$((build+1))
 cat >$1 <<EOF
-#ifdef CLI
+#ifdef WITH_CLI_ONLY_YES
-#define FLAVOR CLI
+#define FLAVOR NOGUI
 #else
 #define FLAVOR GUI
 #endif

src/closure.c

@@ -91,6 +91,12 @@ static void get_base_dirs()
    Verbose("Using path from get_exe_path() = %s\n", Closure->binDir);
 #endif
 
+   /* for AppImage, get docdir from env if there */
+   if (g_getenv("DVDISASTER_DOCDIR"))
+   {  if (Closure->docDir)
+         g_free(Closure->docDir);
+      Closure->docDir = g_strdup(g_getenv("DVDISASTER_DOCDIR"));
+   }
 
    /*** The location of the dotfile depends on the operating system. 
 	Under Unix the users home directory is used. */
@@ -131,7 +137,7 @@ find_dotfile:
  * Update color string for the <span color="#f00baa">...</span> string
  */
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
 void UpdateMarkup(char **string, GdkColor *color)
 {  int hexval;
  
@@ -333,7 +339,7 @@ void ReadDotfile()
       if(!strcmp(symbol, "verbose"))         { Closure->verbose = atoi(value); continue; }
       if(!strcmp(symbol, "welcome-msg"))     { Closure->welcomeMessage = atoi(value); continue; }
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
       if(!strcmp(symbol, "positive-text"))   { get_color(Closure->greenText, value); 
 	                                       UpdateMarkup(&Closure->greenMarkup, Closure->greenText);
 	                                       continue; 
@@ -439,7 +445,7 @@ static void update_dotfile()
    g_fprintf(dotfile, "verbose:           %d\n", Closure->verbose);
    g_fprintf(dotfile, "welcome-msg:       %d\n\n", Closure->welcomeMessage);
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
    save_colors(dotfile, "positive-text",      Closure->greenText);
    save_colors(dotfile, "negative-text",      Closure->redText);
    save_colors(dotfile, "bar-color",          Closure->barColor);
@@ -466,7 +472,7 @@ GlobalClosure *Closure;
 int exitCode = EXIT_SUCCESS;
 
 void InitClosure()
-{  int v1,v2,v3,dots=0;
+{  int v1=0,v2=0,v3=0,dots=0;
    char *v,version[strlen(VERSION)+1];
 
    Closure = g_malloc0(sizeof(GlobalClosure));
@@ -560,7 +566,7 @@ void InitClosure()
    Closure->bdSize3  = Closure->savedBDSize3  = BDXL_TL_SIZE;
    Closure->bdSize4  = Closure->savedBDSize4  = BDXL_QL_SIZE;
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
    Closure->logString = g_string_sized_new(1024);
    Closure->logLock   = g_malloc0(sizeof(GMutex));
      g_mutex_init(Closure->logLock);
@@ -627,7 +633,7 @@ void cond_free_ptr_array(GPtrArray *a)
     
 void FreeClosure()
 {
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
    if(Closure->guiMode)
 #endif
 /* in CLI-only mode, always update dotfile */
@@ -658,7 +664,7 @@ void FreeClosure()
    cond_free(Closure->dDumpDir);
    cond_free(Closure->dDumpPrefix);
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
    if(Closure->prefsContext)
      FreePreferences(Closure->prefsContext);
 

src/crcbuf.c

@@ -231,7 +231,7 @@ void PrintCrcBuf(CrcBuf *cb)
      return;
 
    PrintLog("CrcBuf contents, image path %s:\n", cb->imageName ? cb->imageName : "none (medium)" );
-   PrintLog("  crcSize: %lld, dataSectors: %lld, coveredSectors: %lld, allSectors: %lld\n",
+   PrintLog("  crcSize: %" PRId64 ", dataSectors: %" PRId64 ", coveredSectors: %" PRId64 ", allSectors: %" PRId64 "\n",
 	    cb->crcSize, cb->dataSectors, cb->coveredSectors, cb->allSectors);
 
    PrintLog("  md5State:");
@@ -258,5 +258,5 @@ void PrintCrcBuf(CrcBuf *cb)
      if(!GetBit(cb->valid, i))
      {   missing++;
      }
-   PrintLog("  missing crcs: %lld\n", missing);
+   PrintLog("  missing crcs: %" PRId64 "\n", missing);
 }

src/debug.c

@@ -100,7 +100,7 @@ static void random_error1(Image *image, char *arg)
 	 
 	 if(block_sel[i] && block_idx[i]<image->sectorSize)
 	 {  if(!LargeSeek(image->file, (gint64)(2048*block_idx[i])))
-	       Stop(_("Failed seeking to sector %lld in image: %s"),block_idx[i],strerror(errno));
+	       Stop(_("Failed seeking to sector %" PRId64 " in image: %s"),block_idx[i],strerror(errno));
 
 	    CreateMissingSector(missing, block_idx[i], image->imageFP, FINGERPRINT_SECTOR, NULL); 
 
@@ -108,7 +108,7 @@ static void random_error1(Image *image, char *arg)
 	      write_size = image->inLast;
 
 	    if(LargeWrite(image->file, missing, write_size) != write_size)
-	       Stop(_("Failed writing to sector %lld in image: %s"),block_idx[i],strerror(errno));
+	       Stop(_("Failed writing to sector %" PRId64 " in image: %s"),block_idx[i],strerror(errno));
 	 }
 	 
 	 block_idx[i]++;
@@ -188,12 +188,12 @@ static void random_error2(Image *image, char *arg)
       {  unsigned char missing[2048];
       
 	 if(!LargeSeek(image->file, (gint64)(2048*s)))
-	    Stop(_("Failed seeking to sector %lld in image: %s"), s, strerror(errno));
+	    Stop(_("Failed seeking to sector %" PRId64 " in image: %s"), s, strerror(errno));
 
 	 CreateMissingSector(missing, s, image->imageFP, image->fpSector, NULL); 
 
          if(LargeWrite(image->file, missing, 2048) != 2048)
-	    Stop(_("Failed writing to sector %lld in image: %s"), s, strerror(errno));
+	    Stop(_("Failed writing to sector %" PRId64 " in image: %s"), s, strerror(errno));
       }
    }
 
@@ -236,11 +236,11 @@ static void random_error2(Image *image, char *arg)
 	    else  s = RS02EccSectorIndex(lay, i-eh->dataBytes, si);
 
             if(!LargeSeek(image->file, (gint64)(2048*s)))
-	       Stop(_("Failed seeking to sector %lld in image: %s"), s, strerror(errno));
+	       Stop(_("Failed seeking to sector %" PRId64 " in image: %s"), s, strerror(errno));
 
 	    CreateMissingSector(missing, s, image->imageFP, image->fpSector, NULL); 
 	    if(LargeWrite(image->file, missing, 2048) != 2048)
-	       Stop(_("Failed writing to sector %lld in image: %s"), s, strerror(errno));
+	       Stop(_("Failed writing to sector %" PRId64 " in image: %s"), s, strerror(errno));
 	  }
       }
       
@@ -360,12 +360,12 @@ static void random_error3(Image *image, char *arg)
 	    }
 	      
             if(!LargeSeek(file, (gint64)(2048*file_s)))  // FIXME: wrong for ecc files
-	       Stop(_("Failed seeking to sector %lld in image: %s"), s, strerror(errno));
+	       Stop(_("Failed seeking to sector %" PRId64 " in image: %s"), s, strerror(errno));
 
 	    CreateMissingSector(missing, s, image->imageFP, image->fpSector, NULL); 
 
 	    if(LargeWrite(file, missing, 2048) != 2048)
-	       Stop(_("Failed writing to sector %lld in image: %s"), s, strerror(errno));
+	       Stop(_("Failed writing to sector %" PRId64 " in image: %s"), s, strerror(errno));
 	  }
       }
 
@@ -459,7 +459,7 @@ void Byteset(char *arg)
    byte = atoi(cpos+1);
 
    if(s<0 || s>=image->sectorSize)
-     Stop(_("Sector must be in range [0..%lld]\n"),image->sectorSize-1);
+     Stop(_("Sector must be in range [0..%" PRId64 "]\n"),image->sectorSize-1);
 
    if(i<0 || i>=2048)
      Stop(_("Byte position must be in range [0..2047]"));
@@ -467,7 +467,7 @@ void Byteset(char *arg)
    if(byte<0 || byte>=256)
      Stop(_("Byte value must be in range [0..255]"));
 
-   PrintLog(_("Setting byte %d in sector %lld to value %d.\n"), i, s, byte); 
+   PrintLog(_("Setting byte %d in sector %" PRId64 " to value %d.\n"), i, s, byte); 
 
    /*** Set the byte */
    
@@ -521,9 +521,9 @@ void Erase(char *arg)
    else start = end = atoi(arg);
 
    if(start>end || start < 0 || end >= image->sectorSize)
-     Stop(_("Sectors must be in range [0..%lld].\n"),image->sectorSize-1);
+     Stop(_("Sectors must be in range [0..%" PRId64 "].\n"),image->sectorSize-1);
 
-   PrintLog(_("Erasing sectors [%lld,%lld]\n"),start,end);
+   PrintLog(_("Erasing sectors [%" PRId64 ",%" PRId64 "]\n"),start,end);
 
    /*** Erase them. */
 
@@ -542,7 +542,7 @@ void Erase(char *arg)
       n = LargeWrite(image->file, missing, m);
 
       if(n != m)
-	Stop(_("Failed writing to sector %lld in image: %s"),s,strerror(errno));
+	Stop(_("Failed writing to sector %" PRId64 " in image: %s"),s,strerror(errno));
    }
 
    /*** Clean up */
@@ -569,9 +569,9 @@ void TruncateImageFile(char *arg)
    end = atoi(arg);
 
    if(end >= image->sectorSize)
-     Stop(_("New length must be in range [0..%lld].\n"),image->sectorSize-1);
+     Stop(_("New length must be in range [0..%" PRId64 "].\n"),image->sectorSize-1);
 
-   PrintLog(_("Truncating image to %lld sectors.\n"),end);
+   PrintLog(_("Truncating image to %" PRId64 " sectors.\n"),end);
 
    /*** Truncate it. */
 
@@ -607,10 +607,10 @@ void RandomImage(char *image_name, char *n_sectors, int mark)
 
    /*** Print banner */
 
-   PrintLog(_("\nCreating random image with %lld sectors.\n\n"
+   PrintLog(_("\nCreating random image with %" PRId64 " sectors.\n\n"
 	      "There is no need for permanently storing this image;\n" 
               "you can always reproduce it by calling\n"
-	      "dvdisaster --debug %s %lld --random-seed %d\n\n"),
+	      "dvdisaster --debug %s %" PRId64 " --random-seed %d\n\n"),
 	      sectors, 
 	      mark ? "--marked-image" : "--random-image",
 	      sectors, Closure->randomSeed);
@@ -659,7 +659,7 @@ void RandomImage(char *image_name, char *n_sectors, int mark)
       s++;
 
       if(n != 2048)
-	Stop(_("Failed writing to sector %lld in image: %s"),s,strerror(errno));
+	Stop(_("Failed writing to sector %" PRId64 " in image: %s"),s,strerror(errno));
 
       percent = (100*s)/sectors;
       if(last_percent != percent) 
@@ -697,20 +697,20 @@ void ZeroUnreadable(void)
    {  int n = LargeRead(image->file, buf, 2048);
 
       if(n != 2048)
-	Stop(_("Could not read image sector %lld:\n%s\n"),s,strerror(errno));
+	Stop(_("Could not read image sector %" PRId64 ":\n%s\n"),s,strerror(errno));
 
       /* Replace the dead sector marker */
 
       if(CheckForMissingSector(buf, s, image->imageFP, FINGERPRINT_SECTOR) != SECTOR_PRESENT)
       {
 	if(!LargeSeek(image->file, (gint64)(2048*s)))
-	  Stop(_("Failed seeking to sector %lld in image: %s"),s,strerror(errno));
+	  Stop(_("Failed seeking to sector %" PRId64 " in image: %s"),s,strerror(errno));
 
       	n = LargeWrite(image->file, zeros, 2048);
 	n=2048;
 	
 	if(n != 2048)
-	  Stop(_("Failed writing to sector %lld in image: %s"),s,strerror(errno));
+	  Stop(_("Failed writing to sector %" PRId64 " in image: %s"),s,strerror(errno));
 
 	cnt++;
       }
@@ -722,7 +722,7 @@ void ZeroUnreadable(void)
       }
    }
 
-   PrintProgress(_("%lld \"unreadable sector\" markers replaced.\n"), cnt);
+   PrintProgress(_("%" PRId64 " \"unreadable sector\" markers replaced.\n"), cnt);
 
    CloseImage(image);
 }
@@ -799,16 +799,16 @@ void ShowHeader(char *arg)
    sector =  atoi(arg);
 
    if(sector < 0 || sector >= image->sectorSize)
-     Stop(_("Sector must be in range [0..%lld]\n"),image->sectorSize-1);
+     Stop(_("Sector must be in range [0..%" PRId64 "]\n"),image->sectorSize-1);
 
    /*** Load it. */
 
    if(!LargeSeek(image->file, (gint64)(2048*sector)))
-     Stop(_("Failed seeking to sector %lld in image: %s"),sector,strerror(errno));
+     Stop(_("Failed seeking to sector %" PRId64 " in image: %s"),sector,strerror(errno));
 
    n = LargeRead(image->file, eh, 2048);
    if(n != 2048)
-     Stop(_("Failed reading sector %lld in image: %s"),sector,strerror(errno));
+     Stop(_("Failed reading sector %" PRId64 " in image: %s"),sector,strerror(errno));
 
    /*** Clean up */
 
@@ -840,18 +840,18 @@ void ShowSector(char *arg)
    sector =  atoi(arg);
 
    if(sector < 0 || sector >= image->sectorSize)
-     Stop(_("Sector must be in range [0..%lld]\n"),image->sectorSize-1);
+     Stop(_("Sector must be in range [0..%" PRId64 "]\n"),image->sectorSize-1);
 
-   PrintLog(_("Contents of sector %lld:\n\n"),sector);
+   PrintLog(_("Contents of sector %" PRId64 ":\n\n"),sector);
 
    /*** Show it. */
 
    if(!LargeSeek(image->file, (gint64)(2048*sector)))
-     Stop(_("Failed seeking to sector %lld in image: %s"),sector,strerror(errno));
+     Stop(_("Failed seeking to sector %" PRId64 " in image: %s"),sector,strerror(errno));
 
    n = LargeRead(image->file, buf, 2048);
    if(n != 2048)
-     Stop(_("Failed reading sector %lld in image: %s"),sector,strerror(errno));
+     Stop(_("Failed reading sector %" PRId64 " in image: %s"),sector,strerror(errno));
 
    if(Closure->debugCDump)
         CDump(buf, sector, 2048, 16);
@@ -877,7 +877,7 @@ void ReadSector(char *arg)
 
    /*** Open the device */
 
-   image = OpenImageFromDevice(Closure->device);
+   image = OpenImageFromDevice(Closure->device, 0);
    if(!image)
      Stop(_("Can't open %s:\n%s"), Closure->imageName, strerror(errno));
 
@@ -888,10 +888,10 @@ void ReadSector(char *arg)
    if(sector < 0 || sector >= image->dh->sectors)
    {  CloseImage(image);
       FreeAlignedBuffer(ab);
-      Stop(_("Sector must be in range [0..%lld]\n"),image->dh->sectors-1);
+      Stop(_("Sector must be in range [0..%" PRId64 "]\n"),image->dh->sectors-1);
    }
 
-   PrintLog(_("Contents of sector %lld:\n\n"),sector);
+   PrintLog(_("Contents of sector %" PRId64 ":\n\n"),sector);
 
    /*** Read it. */
 
@@ -902,7 +902,7 @@ void ReadSector(char *arg)
    if(status)
    {  CloseImage(image);
       FreeAlignedBuffer(ab);
-      Stop(_("Failed reading sector %lld: %s"),sector,strerror(errno));
+      Stop(_("Failed reading sector %" PRId64 ": %s"),sector,strerror(errno));
    }
 
    if(Closure->debugCDump)
@@ -931,7 +931,7 @@ void RawSector(char *arg)
 
    /*** Open the device */
 
-   image = OpenImageFromDevice(Closure->device);
+   image = OpenImageFromDevice(Closure->device, 0);
    if(!image)
      Stop(_("Can't open %s:\n%s"), Closure->imageName, strerror(errno));
    sense = &image->dh->sense;
@@ -951,10 +951,10 @@ void RawSector(char *arg)
    if(lba < 0 || lba >= image->dh->sectors)
    {  CloseImage(image);
       FreeAlignedBuffer(ab);
-      Stop(_("Sector must be in range [0..%lld]\n"),image->dh->sectors-1);
+      Stop(_("Sector must be in range [0..%" PRId64 "]\n"),image->dh->sectors-1);
    }
 
-   PrintLog(_("Contents of sector %lld:\n\n"),lba);
+   PrintLog(_("Contents of sector %" PRId64 ":\n\n"),lba);
 
    /*** Try the raw read */
 
@@ -1162,7 +1162,7 @@ void CopySector(char *arg)
 
    LargeStat(from_path, &sectors); sectors /= 2048;
    if(from_sector<0 || from_sector>sectors-1)
-     Stop(_("Source sector must be in range [0..%lld]\n"), sectors-1);
+     Stop(_("Source sector must be in range [0..%" PRId64 "]\n"), sectors-1);
 
 
    if(!(to = LargeOpen(to_path, O_WRONLY, IMG_PERMS)))
@@ -1170,27 +1170,27 @@ void CopySector(char *arg)
 
    LargeStat(to_path, &sectors); sectors /= 2048;
    if(to_sector<0 || to_sector>sectors-1)
-     Stop(_("Destination sector must be in range [0..%lld]\n"), sectors-1);
+     Stop(_("Destination sector must be in range [0..%" PRId64 "]\n"), sectors-1);
 
    /*** Copy the sector */
 
-   PrintLog(_("Copying sector %lld from %s to sector %lld in %s.\n"), 
+   PrintLog(_("Copying sector %" PRId64 " from %s to sector %" PRId64 " in %s.\n"), 
 	    from_sector, from_path, to_sector, to_path); 
 
    if(!LargeSeek(from, (gint64)(2048*from_sector)))
-      Stop(_("Failed seeking to sector %lld in image: %s"),
+      Stop(_("Failed seeking to sector %" PRId64 " in image: %s"),
 	   from_sector, strerror(errno));
 
    if(LargeRead(from, buf, 2048) != 2048)
-      Stop(_("Failed reading sector %lld in image: %s"),
+      Stop(_("Failed reading sector %" PRId64 " in image: %s"),
 	   from_sector, strerror(errno));
 
    if(!LargeSeek(to, (gint64)(2048*to_sector)))
-      Stop(_("Failed seeking to sector %lld in image: %s"),
+      Stop(_("Failed seeking to sector %" PRId64 " in image: %s"),
 	   to_sector, strerror(errno));
 
    if(LargeWrite(to, buf, 2048) != 2048)
-      Stop(_("Failed writing to sector %lld in image: %s"),
+      Stop(_("Failed writing to sector %" PRId64 " in image: %s"),
 	   to_sector, strerror(errno));
 
    /*** Clean up */
@@ -1233,9 +1233,9 @@ void MergeImages(char *arg, int mode)
 
    /*** Compare/merge the images */
 
-   if(!mode) PrintLog("Comparing %s (%lld sectors) with %s (%lld sectors).\n", 
+   if(!mode) PrintLog("Comparing %s (%" PRId64 " sectors) with %s (%" PRId64 " sectors).\n", 
 		      left_path, left_sectors, right_path, right_sectors);
-   else      PrintLog("Merging %s (%lld sectors) with %s (%lld sectors).\n",
+   else      PrintLog("Merging %s (%" PRId64 " sectors) with %s (%" PRId64 " sectors).\n",
 		      left_path, left_sectors, right_path, right_sectors);
 
    /*** Compare them */
@@ -1249,33 +1249,33 @@ void MergeImages(char *arg, int mode)
    {  unsigned char left_buf[2048], right_buf[2048];
 
       if(LargeRead(left, left_buf, 2048) != 2048)
-	 Stop(_("Failed reading sector %lld in image: %s"),
+	 Stop(_("Failed reading sector %" PRId64 " in image: %s"),
 	      s, strerror(errno));
 
       if(LargeRead(right, right_buf, 2048) != 2048)
-	 Stop(_("Failed reading sector %lld in image: %s"),
+	 Stop(_("Failed reading sector %" PRId64 " in image: %s"),
 	      s, strerror(errno));
 
       if(memcmp(left_buf, right_buf, 2048))
       {
 	 if(CheckForMissingSector(left_buf, s, NULL, 0) != SECTOR_PRESENT)
-	 {  if(!mode) PrintLog("< Sector %lld missing\n", s);
+	 {  if(!mode) PrintLog("< Sector %" PRId64 " missing\n", s);
 	    else
-	    {  PrintLog("< Sector %lld missing; copied from %s.\n", s, right_path);
+	    {  PrintLog("< Sector %" PRId64 " missing; copied from %s.\n", s, right_path);
 	       if(!LargeSeek(left, (2048*s)))
-		  Stop(_("Failed seeking to sector %lld in image: %s"),
+		  Stop(_("Failed seeking to sector %" PRId64 " in image: %s"),
 		       s, strerror(errno));
 
 	       if(LargeWrite(left, right_buf, 2048) != 2048)
-		  Stop(_("Failed writing to sector %lld in image: %s"),
+		  Stop(_("Failed writing to sector %" PRId64 " in image: %s"),
 		       s, strerror(errno));
 	    }
 	 }
 	 else if(CheckForMissingSector(right_buf, s, NULL, 0) != SECTOR_PRESENT)
-	 {  PrintLog("> Sector %lld missing\n", s);
+	 {  PrintLog("> Sector %" PRId64 " missing\n", s);
 	 }
 	 else
-	 {  PrintLog("! Sector %lld differs in images\n", s);
+	 {  PrintLog("! Sector %" PRId64 " differs in images\n", s);
 	 }
       }
 
@@ -1287,27 +1287,27 @@ void MergeImages(char *arg, int mode)
    }
 
    if(left_sectors > right_sectors)
-   {  PrintLog("%lld sectors missing at the end of %s\n", 
+   {  PrintLog("%" PRId64 " sectors missing at the end of %s\n", 
 		  left_sectors-right_sectors, right_path);
    }
 
    if(left_sectors < right_sectors)
    {  if(!mode)
-	 PrintLog("%lld sectors missing at the end of %s\n", 
+	 PrintLog("%" PRId64 " sectors missing at the end of %s\n", 
 		  right_sectors-left_sectors, left_path);
       else
       {  unsigned char buf[2048];
 
-	 PrintLog("Transferring %lld sectors from the end of %s to %s.\n", 
+	 PrintLog("Transferring %" PRId64 " sectors from the end of %s to %s.\n", 
 		  right_sectors-left_sectors, right_path, left_path);
 	 
 	 for(s=left_sectors; s<right_sectors; s++)
 	 {  if(LargeRead(right, buf, 2048) != 2048)
-	       Stop(_("Failed reading sector %lld in image: %s"),
+	       Stop(_("Failed reading sector %" PRId64 " in image: %s"),
 		    s, strerror(errno));
 
 	    if(LargeWrite(left, buf, 2048) != 2048)
-	       Stop(_("Failed writing to sector %lld in image: %s"),
+	       Stop(_("Failed writing to sector %" PRId64 " in image: %s"),
 		    s, strerror(errno));
 	 }
       }

src/ds-marker.c

@@ -260,7 +260,7 @@ int CheckForMissingSectors(unsigned char *buf, guint64 sector,
  *** Dialogue for indicating problem with the missing sector
  ***/
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
 static void insert_buttons(GtkDialog *dialog)
 {  
    gtk_dialog_add_buttons(dialog, 
@@ -271,7 +271,7 @@ static void insert_buttons(GtkDialog *dialog)
 
 void ExplainMissingSector(unsigned char *buf, guint64 sector, int error, int source_type, int *number)
 {
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
    int answer;
 #endif
    guint64 recorded_number;
@@ -293,7 +293,7 @@ void ExplainMissingSector(unsigned char *buf, guint64 sector, int error, int sou
    
    /* In CLI mode, only report the first unrecoverable sector unless verbose is given. */
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
    if(!Closure->guiMode && !Closure->verbose && *number > 0)
 #else
    if(!Closure->verbose && *number > 0)
@@ -313,7 +313,7 @@ void ExplainMissingSector(unsigned char *buf, guint64 sector, int error, int sou
    vol_label = get_volume_label(buf);
    if(vol_label)
    {
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
        if(Closure->guiMode)
 	    label_msg = g_strdup_printf(_("\n\nThe label of the original (defective) medium was:\n%s\n\n"), vol_label);
        else
@@ -339,11 +339,11 @@ void ExplainMissingSector(unsigned char *buf, guint64 sector, int error, int sou
 			  "repaired by dvdisaster. Also it will not be possible to create\n"
 			  "error correction data for it. Sorry for the bad news.\n");
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
 	    if(!Closure->guiMode)
 #endif
 	        PrintLogWithAsterisks(msg,sector, recorded_number, label_msg);
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
 	    else
 	    {  answer = ModalDialog(GTK_MESSAGE_ERROR, GTK_BUTTONS_NONE, insert_buttons, msg,
 				    sector, recorded_number, label_msg);
@@ -366,11 +366,11 @@ void ExplainMissingSector(unsigned char *buf, guint64 sector, int error, int sou
 			  "repaired by dvdisaster. Also it will not be possible to create\n"
 			  "error correction data for it. Sorry for the bad news.\n");
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
 	    if(!Closure->guiMode)
 #endif
 	         PrintLogWithAsterisks(msg,sector, label_msg);
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
 	    else
 	    {  answer = ModalDialog(GTK_MESSAGE_ERROR, GTK_BUTTONS_NONE, insert_buttons, msg,
 				    sector, label_msg);
@@ -395,11 +395,11 @@ void ExplainMissingSector(unsigned char *buf, guint64 sector, int error, int sou
 		    "repaired by dvdisaster. Also it will not be possible to create\n"
 		    "error correction data for it. Sorry for the bad news.\n");
 			   
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
      if(!Closure->guiMode)
 #endif
           PrintLogWithAsterisks(msg, sector);
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
      else
      {  answer = ModalDialog(GTK_MESSAGE_ERROR, GTK_BUTTONS_NONE, insert_buttons, msg,
 			     sector);
@@ -419,11 +419,11 @@ void ExplainMissingSector(unsigned char *buf, guint64 sector, int error, int sou
 		    "in the ecc file are missing and its error correction\n"
 		    "capacity will be reduced.\n");
 			   
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
      if(!Closure->guiMode)
 #endif
           PrintLogWithAsterisks(msg, sector);
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
      else
      {  answer = ModalDialog(GTK_MESSAGE_ERROR, GTK_BUTTONS_NONE, insert_buttons, msg,
 			     sector);

src/dvdisaster.c

@@ -68,7 +68,9 @@ typedef enum
    MODE_TRUNCATE,
    MODE_ZERO_UNREADABLE,
 
-   MODIFIER_ADAPTIVE_READ, 
+   /* don't use the ascii range 32-127 so that we
+      avoid collision with the single-char options */
+   MODIFIER_ADAPTIVE_READ = 128,
    MODIFIER_AUTO_SUFFIX,
    MODIFIER_CACHE_SIZE, 
    MODIFIER_CLV_SPEED,    /* unused */ 
@@ -90,6 +92,7 @@ typedef enum
    MODIFIER_NO_BDR_DEFECT_MANAGEMENT,
    MODIFIER_NO_PROGRESS,
    MODIFIER_OLD_DS_MARKER,
+   MODIFIER_PERMISSIVE_MEDIUM_TYPE,
    MODIFIER_PREFETCH_SECTORS,
    MODIFIER_RANDOM_SEED,
    MODIFIER_RAW_MODE,
@@ -111,7 +114,7 @@ typedef enum
 int main(int argc, char *argv[])
 {  int mode = MODE_NONE; 
    int sequence = MODE_NONE;
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
    int devices_queried = FALSE;
 #endif
    char *debug_arg = NULL;
@@ -193,12 +196,7 @@ int main(int argc, char *argv[])
 	wrong packing. */
 
    if(sizeof(EccHeader) != 4096)
-     Stop("sizeof(EccHeader) is %d, but must be 4096.\n", sizeof(EccHeader));
+     Stop("sizeof(EccHeader) is %zu, but must be 4096.\n", sizeof(EccHeader));
-
-   /*** If we have too much command line options fail here */
-
-   if(MODIFIER_VERSION >= 'a')
-     Stop("Too many command line options\n");
 
    /*** CPU type detection. Must be done before parsing the options
         as some may be CPU-related. */
@@ -252,6 +250,7 @@ int main(int argc, char *argv[])
 	{"no-bdr-defect-management", 0, 0, MODIFIER_NO_BDR_DEFECT_MANAGEMENT },
 	{"no-progress", 0, 0, MODIFIER_NO_PROGRESS },
 	{"old-ds-marker", 0, 0, MODIFIER_OLD_DS_MARKER },
+	{"permissive-medium-type", 0, 0, MODIFIER_PERMISSIVE_MEDIUM_TYPE },
 	{"prefetch-sectors", 1, 0, MODIFIER_PREFETCH_SECTORS },
         {"prefix", 1, 0, 'p'},
 	{"random-errors", 1, 0, MODE_RANDOM_ERR },
@@ -527,11 +526,15 @@ int main(int argc, char *argv[])
 	 case MODIFIER_OLD_DS_MARKER:
 	    Closure->dsmVersion = 0;
 	    break;
+	 case MODIFIER_PERMISSIVE_MEDIUM_TYPE:
+	    Closure->permissiveMediumType = TRUE;
+	    debug_mode_required = TRUE;
+	    break;
          case MODIFIER_PREFETCH_SECTORS:
  	    Closure->prefetchSectors = atoi(optarg);
 	    if(   Closure->prefetchSectors < 32
 	       || Closure->prefetchSectors > MAX_PREFETCH_CACHE_SIZE)
-	      Stop(_("--prefetch-sectors must be in range 32...%s"),
+	      Stop(_("--prefetch-sectors must be in range 32...%d"),
 		    MAX_PREFETCH_CACHE_SIZE);
 	    break;
          case MODIFIER_RANDOM_SEED:
@@ -760,7 +763,7 @@ int main(int argc, char *argv[])
    if(!Closure->device && mode == MODE_SEQUENCE 
       && (sequence & (1<<MODE_READ | 1<<MODE_SCAN))) 
    {  Closure->device = DefaultDevice();
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
       devices_queried = TRUE;
 #endif
    }
@@ -803,8 +806,8 @@ int main(int argc, char *argv[])
 	   }
 	   else 
 	   {  if(image->inLast == 2048)
-	           PrintLog(_(": %lld medium sectors.\n"), image->sectorSize);
+	           PrintLog(_(": %" PRId64 " medium sectors.\n"), image->sectorSize);
-	      else PrintLog(_(": %lld medium sectors and %d bytes.\n"), 
+	      else PrintLog(_(": %" PRId64 " medium sectors and %d bytes.\n"), 
 		   image->sectorSize-1, image->inLast);
 	   }
 	   image = OpenEccFileForImage(image, Closure->eccName, O_RDWR, IMG_PERMS);
@@ -917,7 +920,7 @@ int main(int argc, char *argv[])
 
    /*** If no mode was selected, print the help screen. */
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
    if(mode == MODE_HELP)
 #else
    if(mode == MODE_HELP || mode == MODE_NONE)
@@ -985,6 +988,7 @@ int main(int argc, char *argv[])
       { PrintCLI("\n");
 	PrintCLI(_("Debugging options (purposefully undocumented and possibly harmful)\n"));
 	PrintCLI(_("  --debug           - enables the following options\n"));
+	PrintCLI(_("  --permissive-medium-type - allow more media types, even theoretically unsupported ones\n"));
 	PrintCLI(_("  --byteset s,i,b   - set byte i in sector s to b\n"));
 	PrintCLI(_("  --cdump           - creates C #include file dumps instead of hexdumps\n")); 
 	PrintCLI(_("  --compare-images a,b  - compare sectors in images a and b\n"));
@@ -1015,7 +1019,7 @@ int main(int argc, char *argv[])
       exit(EXIT_FAILURE);
    }
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
    /* If no mode was selected at the command line, 
       start the graphical user interface. */
 

src/dvdisaster.h

@@ -38,9 +38,22 @@
 
 #define _GNU_SOURCE
 
+/* under MinGW, __attribute__ format printf doesn't work and outputs warnings for %lld,
+ * even if it's supported and doesn't output any warning under -Wformat when directly
+ * used with the real printf() func. However 'gnu_printf' works, see
+ * https://github.com/ocornut/imgui/issues/3592
+ */
+#ifdef __MINGW32__ /* defined under 32 and 64 bits mingw */
+# define PRINTF_FLAVOR gnu_printf
+#else
+# define PRINTF_FLAVOR printf
+#endif
+#define PRINTF_FORMAT2(ARG1,ARG2) __attribute__((format(PRINTF_FLAVOR, ARG1, ARG2)))
+#define PRINTF_FORMAT(ARG) PRINTF_FORMAT2(ARG,ARG+1)
+
 #include <glib.h>
 #include <glib/gprintf.h>
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
 #include <gtk/gtk.h>
 #endif
 
@@ -48,6 +61,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
+#include <inttypes.h> /* PRId64 et. al */
 #ifdef WITH_NLS_YES
  #include <libintl.h>
  #include <locale.h>
@@ -72,8 +86,15 @@
    Note that these functions are even required when
    WITH_NLS_NO is set! */
 
-#define _(string) sgettext(string)
+#ifndef WITH_DEBUG_PRINTF_FORMAT_YES
-#define _utf(string) sgettext_utf8(string)
+ #define _(string) sgettext(string)
+ #define _utf(string) sgettext_utf8(string)
+#else
+/* disable sgettext() calls so that the compiler
+   can analyze printf format strings */
+ #define _(string) string
+ #define _utf(string) string
+#endif
 
 /* File permissions for images */
 
@@ -89,7 +110,7 @@
  #define round(x) rint(x)
 #endif
 
-#ifdef CLI
+#ifdef WITH_CLI_ONLY_YES
 #define STATUS_LABEL_OR_NULL NULL
 #else
 #define STATUS_LABEL_OR_NULL Closure->status
@@ -265,6 +286,7 @@ typedef struct _GlobalClosure
    int fixedSpeedValues;/* output fixed speed reading to make comparing debugging output easier */  
    int noBdrDefectManagement;/* if true, enable use of the BD*_NODM sizes, default: false */
    int ignoreRS03header; /* if true, ignore the RS03 header when repairing, forcing a full search (debug only) */
+   int permissiveMediumType; /* if true, don't bail out on some UNSUPPORTED medium types (debug only) */
    char *homeDir;       /* path to users home dir */
    char *dotFile;       /* path to .dvdisaster file */
    char *logFile;       /* path to logfile */
@@ -289,7 +311,7 @@ typedef struct _GlobalClosure
 
    struct _CrcBuf *crcBuf;      /* crcBuf of last image read */
    
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
    /*** GUI-related things */
 
    int guiMode;              /* TRUE if GUI is active */
@@ -297,7 +319,7 @@ typedef struct _GlobalClosure
 #endif
    int noMissingWarnings;    /* suppress warnings about inconsistent missing sectors */
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
    GtkWidget *logWidget;     /* Dialog for the log display */
    GtkScrolledWindow *logScroll; /* and its scrolled window */
    GtkTextBuffer *logBuffer; /* Text buffer for the log output */
@@ -380,7 +402,7 @@ typedef struct _GlobalClosure
    GtkWidget *readLinearFootlineBox;
 #endif
    gint64 crcErrors, readErrors;  /* these are passed between threads and must therefore be global */
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
 
    /*** Widgets for the adaptive reading action */
 
@@ -528,7 +550,7 @@ int ProbeCacheLineSize();
 
 void InitClosure(void);
 void LocalizedFileDefaults(void);
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
 void UpdateMarkup(char**, GdkColor*);
 void DefaultColors(void);
 #endif
@@ -551,9 +573,9 @@ guint32 EDCCrc32(unsigned char*, int);
 /* Flags for CrcBuf->md5State */
 
 #define MD5_INVALID 0
-#define MD5_BUILDING 1<<0
+#define MD5_BUILDING (1<<0)
-#define MD5_DATA_COMPLETE 1<<1
+#define MD5_DATA_COMPLETE (1<<1)
-#define MD5_IMAGE_COMPLETE 1<<2
+#define MD5_IMAGE_COMPLETE (1<<2)
 #define MD5_COMPLETE (MD5_DATA_COMPLETE | MD5_IMAGE_COMPLETE)
 
 typedef struct _CrcBuf
@@ -603,7 +625,7 @@ int CrcBufValid(CrcBuf*, struct _Image*, EccHeader*);
 
 void PrintCrcBuf(CrcBuf*);
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
 /***
  *** curve.c
  ***/
@@ -655,7 +677,7 @@ void RedrawCurve(Curve*, int);
 
 void HexDump(unsigned char*, int, int);
 void LaTeXify(gint32*, int, int);
-void AppendToTextFile(char*,char*, ...);
+void AppendToTextFile(char*,char*, ...) PRINTF_FORMAT(2);
 void CopySector(char*);
 void Byteset(char*);
 void Erase(char*);
@@ -714,7 +736,7 @@ void    PrintEccHeader(EccHeader*);
  *** fix-window.c
  ***/
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
 void CreateFixWindow(GtkWidget*);
 #endif
 
@@ -774,7 +796,7 @@ void FreeGaloisTables(GaloisTables*);
 ReedSolomonTables *CreateReedSolomonTables(GaloisTables*, gint32, gint32, int);
 void FreeReedSolomonTables(ReedSolomonTables*);
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
 /***
  *** help-dialogs.c
  ***/
@@ -800,8 +822,8 @@ LabelWithOnlineHelp* CreateLabelWithOnlineHelp(char*, char*);
 LabelWithOnlineHelp* CloneLabelWithOnlineHelp(LabelWithOnlineHelp*, char*);
 void FreeLabelWithOnlineHelp(LabelWithOnlineHelp*);
 void SetOnlineHelpLinkText(LabelWithOnlineHelp*, char*);
-void AddHelpListItem(LabelWithOnlineHelp*, char*, ...);
+void AddHelpListItem(LabelWithOnlineHelp*, char*, ...) PRINTF_FORMAT(2);
-void AddHelpParagraph(LabelWithOnlineHelp*, char*, ...);
+void AddHelpParagraph(LabelWithOnlineHelp*, char*, ...) PRINTF_FORMAT(2);
 void AddHelpWidget(LabelWithOnlineHelp*, GtkWidget*);
 
 /* Specific online help dialogs */
@@ -812,7 +834,7 @@ void ShowLog();
 void UpdateLog();
 void AboutDialog();
 
-void AboutText(GtkWidget*, char*, ...);
+void AboutText(GtkWidget*, char*, ...) PRINTF_FORMAT(2);
 void AboutLink(GtkWidget*, char*, char*);
 void AboutTextWithLink(GtkWidget*, char*, char*);
 #endif
@@ -893,7 +915,7 @@ typedef struct _Image
 } Image;
 
 Image* OpenImageFromFile(char*, int, mode_t);
-Image* OpenImageFromDevice(char*);   /* really in scsi-layer.h */
+Image* OpenImageFromDevice(char*, int);   /* really in scsi-layer.h */
 Image* OpenEccFileForImage(Image*, char*, int, mode_t);
 int ReportImageEccInconsistencies(Image*);
 int GetImageFingerprint(Image*, guint8*, guint64);
@@ -963,7 +985,7 @@ int CountC2Errors(unsigned char*);
 
 void DefaultLogFile();
 void VPrintLogFile(char*, va_list);
-void PrintLogFile(char*, ...);
+void PrintLogFile(char*, ...) PRINTF_FORMAT(1);
 
 /***
  *** maintenance.c
@@ -1042,7 +1064,7 @@ void*	malloc_ext(int,char*,int);
 void*	realloc_ext(void*, int, char*, int);
 void*	try_malloc_ext(int,char*,int);
 char*	strdup_ext(const char*,char*,int);
-char*	strdup_printf_ext(char*, char*, int, ...);
+char*	strdup_printf_ext(char*, char*, int, ...) PRINTF_FORMAT2(2,4);
 char*	strdup_vprintf_ext(char*, va_list, char*, int);
 gchar*  g_locale_to_utf8_ext(const gchar*, gssize, gsize*, gsize*, GError**, char*, int);
 void	free_ext(void*,char*,int);
@@ -1052,7 +1074,7 @@ int     forget(void*);
 
 void    check_memleaks(void);
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
 /***
  *** menubar.c
  ***/
@@ -1088,7 +1110,7 @@ typedef struct _Method
    void (*updateCksums)(Image*, gint64, unsigned char*);/* checksum while reading an image */
    int  (*finalizeCksums)(Image*);
    void *ckSumClosure;                                   /* working closure for above */
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
    void (*createVerifyWindow)(struct _Method*, GtkWidget*);
    void (*createCreateWindow)(struct _Method*, GtkWidget*);
    void (*createFixWindow)(struct _Method*, GtkWidget*);
@@ -1100,7 +1122,7 @@ typedef struct _Method
    void (*readPreferences)(struct _Method*);
 #endif
    void (*destroy)(struct _Method*);
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
    int  tabWindowIndex;              /* our position in the (invisible) notebook */
    void *widgetList;                 /* linkage to window system */
 #endif
@@ -1127,59 +1149,59 @@ void gint64_to_uchar(unsigned char*, gint64);
 
 void CalcSectors(guint64, guint64*, int*);
 
-void PrintCLI(char*, ...);
+void PrintCLI(char*, ...) PRINTF_FORMAT(1);
-void PrintLog(char*, ...);
+void PrintLog(char*, ...) PRINTF_FORMAT(1);
-void PrintLogWithAsterisks(char*, ...);
+void PrintLogWithAsterisks(char*, ...) PRINTF_FORMAT(1);
-void Verbose(char*, ...);
+void Verbose(char*, ...) PRINTF_FORMAT(1);
-void PrintTimeToLog(GTimer*, char*, ...);
+void PrintTimeToLog(GTimer*, char*, ...) PRINTF_FORMAT(2);
-void PrintProgress(char*, ...);
+void PrintProgress(char*, ...) PRINTF_FORMAT(1);
 void ClearProgress(void);
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
-void PrintCLIorLabel(GtkLabel*, char*, ...);
+void PrintCLIorLabel(GtkLabel*, char*, ...) PRINTF_FORMAT(2);
 #else
-void PrintCLIorLabel(void*, char*, ...);
+void PrintCLIorLabel(void*, char*, ...) PRINTF_FORMAT(2);
 #endif
 int GetLongestTranslation(char*, ...);
 
-void LogWarning(char*, ...);
+void LogWarning(char*, ...) PRINTF_FORMAT(1);
-void Stop(char*, ...);
+void Stop(char*, ...) PRINTF_FORMAT(1);
 void RegisterCleanup(char*, void (*)(gpointer), gpointer);
 void UnregisterCleanup(void);
 
 GThread* CreateGThread(GThreadFunc, gpointer);
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
 void ShowWidget(GtkWidget*);
 void AllowActions(gboolean);
 
 void ShowMessage(GtkWindow*, char*, GtkMessageType);
-GtkWidget* CreateMessage(char*, GtkMessageType, ...);
+GtkWidget* CreateMessage(char*, GtkMessageType, ...) PRINTF_FORMAT2(1,3);
-void SetLabelText(GtkLabel*, char*, ...);
+void SetLabelText(GtkLabel*, char*, ...) PRINTF_FORMAT(2);
 void SetProgress(GtkWidget*, int, int);
 
-int ModalDialog(GtkMessageType, GtkButtonsType, void (*)(GtkDialog*), char*, ...);
+int ModalDialog(GtkMessageType, GtkButtonsType, void (*)(GtkDialog*), char*, ...) PRINTF_FORMAT(4);
-int ModalWarning(GtkMessageType, GtkButtonsType, void (*)(GtkDialog*), char*, ...);
+int ModalWarning(GtkMessageType, GtkButtonsType, void (*)(GtkDialog*), char*, ...) PRINTF_FORMAT(4);
 #define ModalWarningOrCLI(a,b,c,d,...) ModalWarning(a,b,c,d,__VA_ARGS__)
 #else
-int ModalWarning(char*, ...);
+int ModalWarning(char*, ...) PRINTF_FORMAT(1);
 #define ModalWarningOrCLI(a,b,c,d,...) ModalWarning(d,__VA_ARGS__)
 #endif
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
 void SetText(PangoLayout*, char*, int*, int*);
-void SwitchAndSetFootline(GtkWidget*, int, GtkWidget*, char*, ...);
+void SwitchAndSetFootline(GtkWidget*, int, GtkWidget*, char*, ...) PRINTF_FORMAT(4);
 
 void ReverseCancelOK(GtkDialog*);
 void TimedInsensitive(GtkWidget*, int);
 
-int GetLabelWidth(GtkLabel*, char*, ...);
+int GetLabelWidth(GtkLabel*, char*, ...) PRINTF_FORMAT(2);
-void LockLabelSize(GtkLabel*, char*, ...);
+void LockLabelSize(GtkLabel*, char*, ...) PRINTF_FORMAT(2);
 #endif
 
 int ConfirmImageDeletion(char *);
 int ConfirmEccDeletion(char *);
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
 /***
  *** preferences.c
  ***/
@@ -1249,7 +1271,7 @@ void ReadDefectiveSectorFile(DefectiveSectorHeader *, struct _RawBuffer*, char*)
 
 void ReadMediumLinear(gpointer);
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
 /***
  *** read-linear-window.c
  ***/
@@ -1271,7 +1293,7 @@ void GetReadingRange(gint64, gint64*, gint64*);
 
 void ReadMediumAdaptive(gpointer);
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
 /***
  *** read-adaptive-window.c
  ***/
@@ -1452,7 +1474,7 @@ void *PrepareIterativeSmartLEC(RawBuffer*);
 void SmartLECIteration(void*, char*);
 void EndIterativeSmartLEC(void*);
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
 /***
  *** spiral.c
  ***/

src/ecc-rs01.c

@@ -53,7 +53,7 @@ void register_rs01(void)
    method->finalizeCksums    = RS01FinalizeCksums;
    method->expectedImageSize = RS01ExpectedImageSize;
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
    /*** Linkage to rs01-window.c */
 
    method->createCreateWindow = CreateRS01EWindow;
@@ -80,13 +80,13 @@ void register_rs01(void)
 
 static void destroy(Method *method)
 {
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
    RS01Widgets *wl = (RS01Widgets*)method->widgetList;
 #endif
 
    g_free(method->ckSumClosure);
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
    if(wl)
    {  if(wl->fixCurve) FreeCurve(wl->fixCurve);
 

src/ecc-rs02.c

@@ -54,7 +54,7 @@ void register_rs02(void)
    method->finalizeCksums    = RS02FinalizeCksums;
    method->expectedImageSize = RS02ExpectedImageSize;
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
    /*** Linkage to rs02-window.c */
 
    method->createCreateWindow = CreateRS02EncWindow;
@@ -82,7 +82,7 @@ void register_rs02(void)
 
 static void destroy(Method *method)
 {
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
    RS02Widgets *wl = (RS02Widgets*)method->widgetList;
 #endif
    RS02CksumClosure *csc = (RS02CksumClosure*)method->ckSumClosure;
@@ -91,7 +91,7 @@ static void destroy(Method *method)
       g_free(csc->lay);
    g_free(method->ckSumClosure);
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
    if(wl)
    {  if(wl->fixCurve) FreeCurve(wl->fixCurve);
 

src/ecc-rs03.c

@@ -55,7 +55,7 @@ void register_rs03(void)
    method->recognizeEccFile  = RS03RecognizeFile;
    method->recognizeEccImage = RS03RecognizeImage;
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
    /*** Linkage to rs03-window.c */
 
    method->createCreateWindow = CreateRS03EncWindow;
@@ -83,7 +83,7 @@ void register_rs03(void)
 
 static void destroy(Method *method)
 {
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
    RS03Widgets *wl = (RS03Widgets*)method->widgetList;
 #endif
    RS03CksumClosure *csc = (RS03CksumClosure*)method->ckSumClosure;
@@ -92,7 +92,7 @@ static void destroy(Method *method)
       g_free(csc->lay);
    g_free(method->ckSumClosure);
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
    if(wl)
    {  if(wl->fixCurve) FreeCurve(wl->fixCurve);
 

src/endian.c

@@ -62,7 +62,7 @@ guint64 SwapBytes64(guint64 in)
  */
 
 void print_hex(char *label, guint8 *values, int n)
-{  PrintCLI(label);
+{  PrintCLI("%s", label);
 
    while(n--)
      PrintCLI("%02x ",*values++);
@@ -84,7 +84,7 @@ void PrintEccHeader(EccHeader *eh)
    print_hex("mediumSum        ", eh->mediumSum, 16);
    print_hex("eccSum           ", eh->eccSum, 16);
    print_hex("sectors          ", eh->sectors, 8);
-   PrintCLI("sectors (native)  %lld\n", uchar_to_gint64(eh->sectors));
+   PrintCLI("sectors (native)  %" PRId64 "\n", uchar_to_gint64(eh->sectors));
    PrintCLI("dataBytes         %8x\n", eh->dataBytes);
    PrintCLI("eccBytes          %8x\n", eh->eccBytes);
    PrintCLI("creatorVersion    %8x\n", eh->creatorVersion);
@@ -93,8 +93,8 @@ void PrintEccHeader(EccHeader *eh)
    PrintCLI("selfCRC           %8x\n", eh->selfCRC);
    print_hex("crcSum            ", eh->crcSum, 16);
    PrintCLI("inLast            %8x\n", eh->inLast);
-   PrintCLI("sectorsPerLayer   %lld\n", eh->sectorsPerLayer);
+   PrintCLI("sectorsPerLayer   %" PRId64 "\n", eh->sectorsPerLayer);
-   PrintCLI("sectorsAddedByEcc %lld\n", eh->sectorsAddedByEcc);
+   PrintCLI("sectorsAddedByEcc %" PRId64 "\n", eh->sectorsAddedByEcc);
 
    PrintCLI("\n");
 }
@@ -114,11 +114,11 @@ void print_crc_block(CrcBlock *cb)
    PrintCLI("fpSector         %8x\n", cb->fpSector);
    print_hex("mediumFP         ", cb->mediumFP, 16);
    print_hex("mediumSum        ", cb->mediumSum, 16);
-   PrintCLI("dataSectors     %ll16x\n ",cb->dataSectors);
+   PrintCLI("dataSectors      %16" PRIx64 "\n",cb->dataSectors);
    PrintCLI("inLast           %8x\n", cb->inLast);
    PrintCLI("dataBytes        %8x\n", cb->dataBytes);
    PrintCLI("eccBytes         %8x\n", cb->eccBytes);
-   PrintCLI("sectorsPerLayer  %lld\n", cb->sectorsPerLayer);
+   PrintCLI("sectorsPerLayer  %" PRId64 "\n", cb->sectorsPerLayer);
    PrintCLI("selfCRC          %8x\n", cb->selfCRC);
 
    PrintCLI("\n");

src/help-dialogs.c

@@ -707,7 +707,7 @@ void AboutTextWithLink(GtkWidget *parent, char *text, char *action)
 	    g_free(utf);
 	 }
       }
-      else AboutText(parent, head);
+      else AboutText(parent, "%s", head);
 
       if(end_of_line) head = end_of_line+1;
       else break;
@@ -739,13 +739,13 @@ void AboutDialog()
    text = g_strdup_printf("<span weight=\"bold\" size=\"xx-large\">dvdisaster</span><i> "
 			  "Version %s</i>",
 			  Closure->cookedVersion);
-   AboutText(vbox, text);
+   AboutText(vbox, "%s", text);
    g_free(text);
 
 #ifdef MODIFIED_SOURCE
    AboutTextWithLink(vbox,
 		     _("[Modified version]\n"
-		       "Copyright 2019-2020 Stephane Lesimple\n"
+		       "Copyright 2019-2021 Stephane Lesimple\n"
 		       "Copyright 2005-2017 Debian Optical Media Tools Team\n"
 		       "Copyright 2004-2017 Carsten Gnoerlich"),
 		     "MODIFYING");

src/image.c

@@ -148,7 +148,7 @@ int ReportImageEccInconsistencies(Image *image)
 
   if(!image || image->type == IMAGE_NONE)
   {  if(image) CloseImage(image);
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
      if(Closure->guiMode)
      {     CreateMessage(_("Image file %s not present or permission denied.\n"), GTK_MESSAGE_ERROR, Closure->imageName);
 	   return TRUE;
@@ -163,7 +163,7 @@ int ReportImageEccInconsistencies(Image *image)
 
   if(image->eccFile && !image->eccFileMethod)
   {  CloseImage(image);
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
      if(Closure->guiMode)
      {   CreateMessage(_("\nError correction file type unknown.\n"), GTK_MESSAGE_ERROR);
 	 return TRUE;
@@ -178,7 +178,7 @@ int ReportImageEccInconsistencies(Image *image)
 
   if(!image->eccFile && image->eccFileState == ECCFILE_NOPERM)
   {  CloseImage(image);
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
      if(Closure->guiMode)
        {    CreateMessage(_("\nPermission denied on ecc file (perhaps not writeable?).\n"),
 			  GTK_MESSAGE_ERROR);
@@ -195,7 +195,7 @@ int ReportImageEccInconsistencies(Image *image)
 
   if(!image->eccFile && !image->eccMethod)
   {  CloseImage(image);
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
      if(Closure->guiMode)
      {    CreateMessage(_("\nNo error correction file present.\n"
 			  "No error correction data recognized in image.\n"), GTK_MESSAGE_ERROR);
@@ -266,12 +266,12 @@ int GetImageFingerprint(Image *image, guint8 *fp_out, guint64 sector)
 	 case 1:    /* unreadable */
 	    if(fp_out) 
 	      memset(fp_out, 0, 16);
-	    Verbose("GetImageFingerprint(%lld): cached unreadable\n", sector);
+	    Verbose("GetImageFingerprint(%" PRId64 "): cached unreadable\n", sector);
 	    return FALSE;
 	 case 2:    /* already cached */
 	    if(fp_out)
 	      memcpy(fp_out, image->imageFP, 16);
-	    Verbose("GetImageFingerprint(%lld): cached\n", sector);
+	    Verbose("GetImageFingerprint(%" PRId64 "): cached\n", sector);
 	    return TRUE;
       }
 
@@ -281,7 +281,7 @@ int GetImageFingerprint(Image *image, guint8 *fp_out, guint64 sector)
      image->fpSector = sector;
      if(status != 1)  /* read error */
      {  image->fpState = 1;
-        Verbose("GetImageFingerprint(%lld): not readable\n", sector);
+        Verbose("GetImageFingerprint(%" PRId64 "): not readable\n", sector);
      }
      else
      {  struct MD5Context md5ctxt;
@@ -293,7 +293,7 @@ int GetImageFingerprint(Image *image, guint8 *fp_out, guint64 sector)
 	MD5Final(image->imageFP, &md5ctxt);
 	if(fp_out)
 	  memcpy(fp_out, image->imageFP, 16);
-	Verbose("GetImageFingerprint(%lld): read & cached\n", sector);
+	Verbose("GetImageFingerprint(%" PRId64 "): read & cached\n", sector);
      }
 
      FreeAlignedBuffer(ab);

src/large-io.c

@@ -211,7 +211,7 @@ ssize_t LargeRead(LargeFile *lf, void *buf, size_t count)
  * Writing large files
  */
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
 static void insert_buttons(GtkDialog *dialog)
 {  
   gtk_dialog_add_buttons(dialog, 
@@ -226,7 +226,7 @@ static ssize_t xwrite(int fdes, void *buf_base, size_t count)
 
    /* Simply fail when going out of space in command line mode */
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
    if(!Closure->guiMode)
 #endif
    {  while(count)
@@ -243,7 +243,7 @@ static ssize_t xwrite(int fdes, void *buf_base, size_t count)
       return total;
    }
 
-#ifndef CLI
+#ifndef WITH_CLI_ONLY_YES
    /* Give the user a chance to free more space in GUI mode.
       When running out of space, the last write() may complete
       with n<count but no error condition, so we try writing
@@ -260,7 +260,7 @@ static ssize_t xwrite(int fdes, void *buf_base, size_t count)
 	 answer = ModalDialog(GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, insert_buttons,
 			      _("Error while writing the file:\n\n%s\n\n"
 				"You can redo this operation after freeing some space."),
-			      strerror(errno),n);
+			      strerror(errno));
 
 	 if(!answer) return total; 
       }