From bd9777a5315c0aae8ca8aff68e29f5a515bf9158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lesimple?= Date: Sat, 26 Jun 2021 13:15:25 +0200 Subject: [PATCH] fix: --strip in console without X server would segfault & fix tests --- regtest/common.bash | 128 ++++++++++++------------ regtest/database/RS02_strip_ecc | 75 ++++++++++++++ regtest/database/RS02_strip_ecc_not | 143 +++++++++++++++++++++++++++ regtest/database/RS03i_strip_ecc | 134 +++++++++++++++++++++++++ regtest/database/RS03i_strip_ecc_not | 140 ++++++++++++++++++++++++++ src/misc.c | 4 +- 6 files changed, 561 insertions(+), 63 deletions(-) create mode 100644 regtest/database/RS02_strip_ecc create mode 100644 regtest/database/RS02_strip_ecc_not create mode 100644 regtest/database/RS03i_strip_ecc create mode 100644 regtest/database/RS03i_strip_ecc_not diff --git a/regtest/common.bash b/regtest/common.bash index 867c7a4..e1afaf3 100644 --- a/regtest/common.bash +++ b/regtest/common.bash @@ -30,16 +30,11 @@ fi nbfailed=0 -# Assemble sed expressions for removal of variable output contents - -SED_REMOVE_ISO_DIR="([a-zA-Z]:/[a-zA-Z0-9/]+)?${ISODIR}/" - # For MSYS2 if [ -n "$ORIGINAL_TEMP" ]; then ISODIR="$ORIGINAL_TEMP" # /c/ => C:/ - SED_REMOVE_ISO_DIR="$(echo "$ISODIR" | cut -c2 | tr a-z A-Z):$(echo "$ISODIR" | cut -c3-)/" NON_EXISTENT_DEVICE=V: fi @@ -214,67 +209,71 @@ function run_regtest() REFLOG=${DATABASE}/${CODEC_PREFIX}_${testsymbol} if test "$gui_mode" == "false"; then - rm -f $NEWLOG + rm -f $NEWLOG - echo "LANG=en_EN.UTF-8 $NEWVER --regtest --no-progress -i${testiso} ${testeccopt} ${extra_args} ${testparms}" >>$LOGFILE - LANG=en_EN.UTF-8 $NEWVER --regtest --no-progress -i${testiso} ${testeccopt} ${extra_args} ${testparms} 2>&1 | tail -n +3 >>$NEWLOG + echo "LANG=en_EN.UTF-8 $NEWVER --regtest --no-progress -i${testiso} ${testeccopt} ${extra_args} ${testparms}" >>$LOGFILE + LANG=en_EN.UTF-8 $NEWVER --regtest --no-progress -i${testiso} ${testeccopt} ${extra_args} ${testparms} 2>&1 | tail -n +3 >>$NEWLOG - if ! test -r $REFLOG; then - echo -e "FAIL\n$REFLOG missing in log file database" - return - fi + if ! test -r $REFLOG; then + pass="false" + if [ "$REGTEST_NO_UTF8" = 1 ]; then + echo "BAD; '$REFLOG' is missing in log file database" + else + printf "%b\r%b\n" "BAD; '$REFLOG' is missing in log file database" "[\e[31m✘\e[0m]" + fi + else + # ignore the memory tracker line when no memory leaks + # have been found - # ignore the memory tracker line when no memory leaks - # have been found - - grep -va "dvdisaster: No memory leaks found." $NEWLOG >$TMPLOG - mv $TMPLOG $NEWLOG - - # ignore log lines specified by user - - if test -n "$IGNORE_LOG_LINE"; then - grep -Eva "$IGNORE_LOG_LINE" $NEWLOG >$TMPLOG - mv $TMPLOG $NEWLOG - fi + grep -va "dvdisaster: No memory leaks found." $NEWLOG >$TMPLOG + mv $TMPLOG $NEWLOG - filter=cat - echo "$options" | grep -qw SORTED && filter=sort - if [ "${CODEC_PREFIX}_${testsymbol}" = RS01_scan_no_device ] || \ - [ "${CODEC_PREFIX}_${testsymbol}" = RS01_read_no_device ] || \ - [ "${CODEC_PREFIX}_${testsymbol}" = RS01_adaptive_no_device ]; then - # for Windows - sed -i -re "s=device $NON_EXISTENT_DEVICE\.=/dev/sdz: No such file or directory=" $NEWLOG - fi - - if ! diff <(tail -n +3 $REFLOG | $filter) <(sed -re "s=${SED_REMOVE_ISO_DIR}==g" $NEWLOG | $filter) >${DIFFLOG}; then - if [ "$REGTEST_NO_UTF8" = 1 ]; then - echo "BAD; diffs found (created):" - else - printf "%b\r%b\n" "BAD; diffs found (created):" "[\e[31m✘\e[0m]" - fi - cat ${DIFFLOG} + # ignore log lines specified by user - if test "$interactive_diff" == "yes"; then - while true; do - read -n 1 -p ">> Press 'a' to accept this diff; 'v' to vimdiff; any other key to fail this test:" -e answer - if test "$answer" == "a"; then - cp $REFLOG $LOGDIR - head -n 2 $LOGDIR/${CODEC_PREFIX}_${testsymbol} >$REFLOG - sed -re "s=${SED_REMOVE_ISO_DIR}==g" $NEWLOG >>$REFLOG - pass="skip" - elif test "$answer" == "v"; then - vimdiff $REFLOG $NEWLOG + if test -n "$IGNORE_LOG_LINE"; then + grep -Eva "$IGNORE_LOG_LINE" $NEWLOG >$TMPLOG + mv $TMPLOG $NEWLOG + fi - continue - else - pass="false" - fi - break - done - else - pass="false" - fi - fi + filter=cat + echo "$options" | grep -qw SORTED && filter=sort + if [ "${CODEC_PREFIX}_${testsymbol}" = RS01_scan_no_device ] || \ + [ "${CODEC_PREFIX}_${testsymbol}" = RS01_read_no_device ] || \ + [ "${CODEC_PREFIX}_${testsymbol}" = RS01_adaptive_no_device ]; then + # for Windows + sed -i -re "s=device $NON_EXISTENT_DEVICE\.=/dev/sdz: No such file or directory=" $NEWLOG + fi + + if ! diff <(tail -n +3 $REFLOG | $filter) <(sed -re "s=[a-zA-Z:/]+/([a-z0-9_-]+\.(ecc|iso))=\1=g;s=$ISODIR/==g" $NEWLOG | $filter) >${DIFFLOG}; then + if [ "$REGTEST_NO_UTF8" = 1 ]; then + echo "BAD; diffs found (created):" + else + printf "%b\r%b\n" "BAD; diffs found (created):" "[\e[31m✘\e[0m]" + fi + cat ${DIFFLOG} + + if test "$interactive_diff" == "yes"; then + while true; do + read -n 1 -p ">> Press 'a' to accept this diff; 'v' to vimdiff; any other key to fail this test:" -e answer + if test "$answer" == "a"; then + cp $REFLOG $LOGDIR + head -n 2 $LOGDIR/${CODEC_PREFIX}_${testsymbol} >$REFLOG + sed -re "s=[a-zA-Z:/]+/([a-z0-9_-]+\.(ecc|iso))=\1=g;s=$ISODIR/==g" $NEWLOG >>$REFLOG + pass="skip" + elif test "$answer" == "v"; then + vimdiff $REFLOG $NEWLOG + + continue + else + pass="false" + fi + break + done + else + pass="false" + fi + fi + fi else # gui mode replace_config last-image "$testiso" if test -n "${testecc}"; then @@ -293,8 +292,13 @@ function run_regtest() unset extra_args - image_md5=$(head -n 1 $REFLOG) - ecc_md5=$(head -n 2 $REFLOG | tail -n 1) + if test -r "$REFLOG"; then + image_md5=$(head -n 1 $REFLOG) + ecc_md5=$(head -n 2 $REFLOG | tail -n 1) + else + image_md5=ignore + ecc_md5=ignore + fi if test "${image_md5}" != "ignore"; then md5=$($MD5SUM ${testiso} | cut -d\ -f 1) diff --git a/regtest/database/RS02_strip_ecc b/regtest/database/RS02_strip_ecc new file mode 100644 index 0000000..7b0ce68 --- /dev/null +++ b/regtest/database/RS02_strip_ecc @@ -0,0 +1,75 @@ +cbadac3ca7b6e9bccfc889b7eaded254 +ignore +This software comes with ABSOLUTELY NO WARRANTY. This +is free software and you are welcome to redistribute it +under the conditions of the GNU GENERAL PUBLIC LICENSE. +See the file "COPYING" for further information. + +ExamineUDF(File: rs02-tmp.iso) + Examining the ISO file system... + Sector 16: + Volume descriptor type = 1 + Volume descriptor version = 1 + Standard identifier = CD001 + -> primary volume descriptor: + System identifier : | | + Volume identifier : |RANDOM IMAGE | + Volume space size : 30000 sectors + Volume set size : 1 + Volume sequence size : 1 + Logical block size : 2048 + Path table size : 10 bytes + L-Path table location : 19 + Opt L-Path table location : 0 + M-Path table location : 20 + Opt M-Path table location : 0 + Volume creation date/time : 16-07-2006 10:35:46.23 + Volume modification d/t : 16-07-2006 10:35:46.23 + Volume expiration d/t : 16-07-2106 10:35:46.23 + Volume effective d/t : 16-07-2006 10:35:46.23 + File structure version : 1 + Sector 17: + Volume descriptor type = 2 + Volume descriptor version = 1 + Standard identifier = CD001 + -> supplementary volume descriptor: *skipped* + Sector 18: + Volume descriptor type = 255 + Volume descriptor version = 1 + Standard identifier = CD001 + -> volume descriptor set terminator; + end of ISO file system parsing. + Examining the UDF file system... + not yet implemented. + +ExamineECC() started +...trying RS01 +...trying RS02 +RS02Recognize: file rs02-tmp.iso +try_sector: trying sector 30000 +try_sector: header at 30000: magic cookie found +try_sector: CRC okay +GetImageFingerprint(16): read & cached +try_sector: fingerprint okay, header good +Root sector search at +0 successful +...augmented image found +Expected size calculated from ecc header: 34932 +--> confirmed layout variant 1 +Calculated layout for RS02 image: +data sectors = 30000 +crc sectors = 59 +protected sectors = 30061 (incl. 2 hdr sectors) +reed solomon secs = 4795 (35 roots, 220 data) +header repeats = 38 (using modulo 128) +added sectors = 4932 +total image size = 34932 +medium capacity = n.a. + +Interleaving layout: +137 sectors per ecc layer +first layer sector with CRC data 136 (sector# 30002) + +GetImageFingerprint(16): cached +Image is augmented (expected sectors = 34932) +Truncating image to 30000 sectors. +Image successfully truncated back to its original size. diff --git a/regtest/database/RS02_strip_ecc_not b/regtest/database/RS02_strip_ecc_not new file mode 100644 index 0000000..fb351c1 --- /dev/null +++ b/regtest/database/RS02_strip_ecc_not @@ -0,0 +1,143 @@ +cbadac3ca7b6e9bccfc889b7eaded254 +ignore +This software comes with ABSOLUTELY NO WARRANTY. This +is free software and you are welcome to redistribute it +under the conditions of the GNU GENERAL PUBLIC LICENSE. +See the file "COPYING" for further information. + +ExamineUDF(File: rs02-tmp.iso) + Examining the ISO file system... + Sector 16: + Volume descriptor type = 1 + Volume descriptor version = 1 + Standard identifier = CD001 + -> primary volume descriptor: + System identifier : | | + Volume identifier : |RANDOM IMAGE | + Volume space size : 30000 sectors + Volume set size : 1 + Volume sequence size : 1 + Logical block size : 2048 + Path table size : 10 bytes + L-Path table location : 19 + Opt L-Path table location : 0 + M-Path table location : 20 + Opt M-Path table location : 0 + Volume creation date/time : 16-07-2006 10:35:46.23 + Volume modification d/t : 16-07-2006 10:35:46.23 + Volume expiration d/t : 16-07-2106 10:35:46.23 + Volume effective d/t : 16-07-2006 10:35:46.23 + File structure version : 1 + Sector 17: + Volume descriptor type = 2 + Volume descriptor version = 1 + Standard identifier = CD001 + -> supplementary volume descriptor: *skipped* + Sector 18: + Volume descriptor type = 255 + Volume descriptor version = 1 + Standard identifier = CD001 + -> volume descriptor set terminator; + end of ISO file system parsing. + Examining the UDF file system... + not yet implemented. + +ExamineECC() started +...trying RS01 +...trying RS02 +RS02Recognize: file rs02-tmp.iso +try_sector: trying sector 30000 +try_sector: read error, trying next header +try_sector: trying sector 29850 +try_sector: no cookie, skipping current modulo +RS02Recognize: No EH, entering exhaustive search +FindHeaderInMedium: Trying modulo 4611686018427387904 +FindHeaderInMedium: Trying modulo 2305843009213693952 +FindHeaderInMedium: Trying modulo 1152921504606846976 +FindHeaderInMedium: Trying modulo 576460752303423488 +FindHeaderInMedium: Trying modulo 288230376151711744 +FindHeaderInMedium: Trying modulo 144115188075855872 +FindHeaderInMedium: Trying modulo 72057594037927936 +FindHeaderInMedium: Trying modulo 36028797018963968 +FindHeaderInMedium: Trying modulo 18014398509481984 +FindHeaderInMedium: Trying modulo 9007199254740992 +FindHeaderInMedium: Trying modulo 4503599627370496 +FindHeaderInMedium: Trying modulo 2251799813685248 +FindHeaderInMedium: Trying modulo 1125899906842624 +FindHeaderInMedium: Trying modulo 562949953421312 +FindHeaderInMedium: Trying modulo 281474976710656 +FindHeaderInMedium: Trying modulo 140737488355328 +FindHeaderInMedium: Trying modulo 70368744177664 +FindHeaderInMedium: Trying modulo 35184372088832 +FindHeaderInMedium: Trying modulo 17592186044416 +FindHeaderInMedium: Trying modulo 8796093022208 +FindHeaderInMedium: Trying modulo 4398046511104 +FindHeaderInMedium: Trying modulo 2199023255552 +FindHeaderInMedium: Trying modulo 1099511627776 +FindHeaderInMedium: Trying modulo 549755813888 +FindHeaderInMedium: Trying modulo 274877906944 +FindHeaderInMedium: Trying modulo 137438953472 +FindHeaderInMedium: Trying modulo 68719476736 +FindHeaderInMedium: Trying modulo 34359738368 +FindHeaderInMedium: Trying modulo 17179869184 +FindHeaderInMedium: Trying modulo 8589934592 +FindHeaderInMedium: Trying modulo 4294967296 +FindHeaderInMedium: Trying modulo 2147483648 +FindHeaderInMedium: Trying modulo 1073741824 +FindHeaderInMedium: Trying modulo 536870912 +FindHeaderInMedium: Trying modulo 268435456 +FindHeaderInMedium: Trying modulo 134217728 +FindHeaderInMedium: Trying modulo 67108864 +FindHeaderInMedium: Trying modulo 33554432 +FindHeaderInMedium: Trying modulo 16777216 +FindHeaderInMedium: Trying modulo 8388608 +FindHeaderInMedium: Trying modulo 4194304 +FindHeaderInMedium: Trying modulo 2097152 +FindHeaderInMedium: Trying modulo 1048576 +FindHeaderInMedium: Trying modulo 524288 +FindHeaderInMedium: Trying modulo 262144 +FindHeaderInMedium: Trying modulo 131072 +FindHeaderInMedium: Trying modulo 65536 +FindHeaderInMedium: Trying modulo 32768 +FindHeaderInMedium: Trying modulo 16384 +try_sector: trying sector 16384 +try_sector: no cookie, skipping current modulo +FindHeaderInMedium: Trying modulo 8192 +try_sector: trying sector 24576 +try_sector: no cookie, skipping current modulo +FindHeaderInMedium: Trying modulo 4096 +try_sector: trying sector 28672 +try_sector: no cookie, skipping current modulo +FindHeaderInMedium: Trying modulo 2048 +Sector 28672 cached; skipping modulo +FindHeaderInMedium: Trying modulo 1024 +try_sector: trying sector 29696 +try_sector: no cookie, skipping current modulo +FindHeaderInMedium: Trying modulo 512 +Sector 29696 cached; skipping modulo +FindHeaderInMedium: Trying modulo 256 +try_sector: trying sector 29952 +try_sector: no cookie, skipping current modulo +FindHeaderInMedium: Trying modulo 128 +Sector 29952 cached; skipping modulo +FindHeaderInMedium: Trying modulo 64 +Sector 29952 cached; skipping modulo +FindHeaderInMedium: Trying modulo 32 +try_sector: trying sector 29984 +try_sector: no cookie, skipping current modulo +...trying RS03 +RS03RecognizeImage: file rs02-tmp.iso +FindRS03HeaderInImage: file rs02-tmp.iso +RS03RecognizeImage: No EH, entering exhaustive search +.. trying layer size 1409 +Scanning layers for signatures. +- layer slice 0 +** All layers tested -> no RS03 data found +...no augmented image detected. +GetImageFingerprint(16): read & cached + +* +* dvdisaster - can not continue: +* +Image is not augmented (no dvdisaster signature found). + diff --git a/regtest/database/RS03i_strip_ecc b/regtest/database/RS03i_strip_ecc new file mode 100644 index 0000000..8e341b7 --- /dev/null +++ b/regtest/database/RS03i_strip_ecc @@ -0,0 +1,134 @@ +9503f278d4550a9507a317664481adf8 +ignore +This software comes with ABSOLUTELY NO WARRANTY. This +is free software and you are welcome to redistribute it +under the conditions of the GNU GENERAL PUBLIC LICENSE. +See the file "COPYING" for further information. + +ExamineUDF(File: rs03i-tmp.iso) + Examining the ISO file system... + Sector 16: + Volume descriptor type = 1 + Volume descriptor version = 1 + Standard identifier = CD001 + -> primary volume descriptor: + System identifier : | | + Volume identifier : |RANDOM IMAGE | + Volume space size : 21000 sectors + Volume set size : 1 + Volume sequence size : 1 + Logical block size : 2048 + Path table size : 10 bytes + L-Path table location : 19 + Opt L-Path table location : 0 + M-Path table location : 20 + Opt M-Path table location : 0 + Volume creation date/time : 16-07-2006 10:35:46.23 + Volume modification d/t : 16-07-2006 10:35:46.23 + Volume expiration d/t : 16-07-2106 10:35:46.23 + Volume effective d/t : 16-07-2006 10:35:46.23 + File structure version : 1 + Sector 17: + Volume descriptor type = 2 + Volume descriptor version = 1 + Standard identifier = CD001 + -> supplementary volume descriptor: *skipped* + Sector 18: + Volume descriptor type = 255 + Volume descriptor version = 1 + Standard identifier = CD001 + -> volume descriptor set terminator; + end of ISO file system parsing. + Examining the UDF file system... + not yet implemented. + +ExamineECC() started +...trying RS01 +...trying RS02 +RS02Recognize: file rs03i-tmp.iso +try_sector: trying sector 21000 +try_sector: no cookie, skipping current modulo +try_sector: trying sector 20850 +try_sector: no cookie, skipping current modulo +RS02Recognize: No EH, entering exhaustive search +FindHeaderInMedium: Trying modulo 4611686018427387904 +FindHeaderInMedium: Trying modulo 2305843009213693952 +FindHeaderInMedium: Trying modulo 1152921504606846976 +FindHeaderInMedium: Trying modulo 576460752303423488 +FindHeaderInMedium: Trying modulo 288230376151711744 +FindHeaderInMedium: Trying modulo 144115188075855872 +FindHeaderInMedium: Trying modulo 72057594037927936 +FindHeaderInMedium: Trying modulo 36028797018963968 +FindHeaderInMedium: Trying modulo 18014398509481984 +FindHeaderInMedium: Trying modulo 9007199254740992 +FindHeaderInMedium: Trying modulo 4503599627370496 +FindHeaderInMedium: Trying modulo 2251799813685248 +FindHeaderInMedium: Trying modulo 1125899906842624 +FindHeaderInMedium: Trying modulo 562949953421312 +FindHeaderInMedium: Trying modulo 281474976710656 +FindHeaderInMedium: Trying modulo 140737488355328 +FindHeaderInMedium: Trying modulo 70368744177664 +FindHeaderInMedium: Trying modulo 35184372088832 +FindHeaderInMedium: Trying modulo 17592186044416 +FindHeaderInMedium: Trying modulo 8796093022208 +FindHeaderInMedium: Trying modulo 4398046511104 +FindHeaderInMedium: Trying modulo 2199023255552 +FindHeaderInMedium: Trying modulo 1099511627776 +FindHeaderInMedium: Trying modulo 549755813888 +FindHeaderInMedium: Trying modulo 274877906944 +FindHeaderInMedium: Trying modulo 137438953472 +FindHeaderInMedium: Trying modulo 68719476736 +FindHeaderInMedium: Trying modulo 34359738368 +FindHeaderInMedium: Trying modulo 17179869184 +FindHeaderInMedium: Trying modulo 8589934592 +FindHeaderInMedium: Trying modulo 4294967296 +FindHeaderInMedium: Trying modulo 2147483648 +FindHeaderInMedium: Trying modulo 1073741824 +FindHeaderInMedium: Trying modulo 536870912 +FindHeaderInMedium: Trying modulo 268435456 +FindHeaderInMedium: Trying modulo 134217728 +FindHeaderInMedium: Trying modulo 67108864 +FindHeaderInMedium: Trying modulo 33554432 +FindHeaderInMedium: Trying modulo 16777216 +FindHeaderInMedium: Trying modulo 8388608 +FindHeaderInMedium: Trying modulo 4194304 +FindHeaderInMedium: Trying modulo 2097152 +FindHeaderInMedium: Trying modulo 1048576 +FindHeaderInMedium: Trying modulo 524288 +FindHeaderInMedium: Trying modulo 262144 +FindHeaderInMedium: Trying modulo 131072 +FindHeaderInMedium: Trying modulo 65536 +FindHeaderInMedium: Trying modulo 32768 +FindHeaderInMedium: Trying modulo 16384 +try_sector: trying sector 16384 +try_sector: no cookie, skipping current modulo +FindHeaderInMedium: Trying modulo 8192 +try_sector: trying sector 24576 +try_sector: no cookie, skipping current modulo +FindHeaderInMedium: Trying modulo 4096 +Sector 24576 cached; skipping modulo +FindHeaderInMedium: Trying modulo 2048 +Sector 24576 cached; skipping modulo +FindHeaderInMedium: Trying modulo 1024 +Sector 24576 cached; skipping modulo +FindHeaderInMedium: Trying modulo 512 +Sector 24576 cached; skipping modulo +FindHeaderInMedium: Trying modulo 256 +try_sector: trying sector 24832 +try_sector: no cookie, skipping current modulo +FindHeaderInMedium: Trying modulo 128 +try_sector: trying sector 24960 +try_sector: no cookie, skipping current modulo +FindHeaderInMedium: Trying modulo 64 +Sector 24960 cached; skipping modulo +FindHeaderInMedium: Trying modulo 32 +Sector 24960 cached; skipping modulo +...trying RS03 +RS03RecognizeImage: file rs03i-tmp.iso +FindRS03HeaderInImage: file rs03i-tmp.iso +FindRS03HeaderInImage(): Header found at pos +0 +...augmented image found +GetImageFingerprint(16): read & cached +Image is augmented (expected sectors = 24990) +Truncating image to 21000 sectors. +Image successfully truncated back to its original size. diff --git a/regtest/database/RS03i_strip_ecc_not b/regtest/database/RS03i_strip_ecc_not new file mode 100644 index 0000000..0f71ef4 --- /dev/null +++ b/regtest/database/RS03i_strip_ecc_not @@ -0,0 +1,140 @@ +9503f278d4550a9507a317664481adf8 +ignore +This software comes with ABSOLUTELY NO WARRANTY. This +is free software and you are welcome to redistribute it +under the conditions of the GNU GENERAL PUBLIC LICENSE. +See the file "COPYING" for further information. + +ExamineUDF(File: rs03i-tmp.iso) + Examining the ISO file system... + Sector 16: + Volume descriptor type = 1 + Volume descriptor version = 1 + Standard identifier = CD001 + -> primary volume descriptor: + System identifier : | | + Volume identifier : |RANDOM IMAGE | + Volume space size : 21000 sectors + Volume set size : 1 + Volume sequence size : 1 + Logical block size : 2048 + Path table size : 10 bytes + L-Path table location : 19 + Opt L-Path table location : 0 + M-Path table location : 20 + Opt M-Path table location : 0 + Volume creation date/time : 16-07-2006 10:35:46.23 + Volume modification d/t : 16-07-2006 10:35:46.23 + Volume expiration d/t : 16-07-2106 10:35:46.23 + Volume effective d/t : 16-07-2006 10:35:46.23 + File structure version : 1 + Sector 17: + Volume descriptor type = 2 + Volume descriptor version = 1 + Standard identifier = CD001 + -> supplementary volume descriptor: *skipped* + Sector 18: + Volume descriptor type = 255 + Volume descriptor version = 1 + Standard identifier = CD001 + -> volume descriptor set terminator; + end of ISO file system parsing. + Examining the UDF file system... + not yet implemented. + +ExamineECC() started +...trying RS01 +...trying RS02 +RS02Recognize: file rs03i-tmp.iso +try_sector: trying sector 21000 +try_sector: read error, trying next header +try_sector: trying sector 20850 +try_sector: no cookie, skipping current modulo +RS02Recognize: No EH, entering exhaustive search +FindHeaderInMedium: Trying modulo 4611686018427387904 +FindHeaderInMedium: Trying modulo 2305843009213693952 +FindHeaderInMedium: Trying modulo 1152921504606846976 +FindHeaderInMedium: Trying modulo 576460752303423488 +FindHeaderInMedium: Trying modulo 288230376151711744 +FindHeaderInMedium: Trying modulo 144115188075855872 +FindHeaderInMedium: Trying modulo 72057594037927936 +FindHeaderInMedium: Trying modulo 36028797018963968 +FindHeaderInMedium: Trying modulo 18014398509481984 +FindHeaderInMedium: Trying modulo 9007199254740992 +FindHeaderInMedium: Trying modulo 4503599627370496 +FindHeaderInMedium: Trying modulo 2251799813685248 +FindHeaderInMedium: Trying modulo 1125899906842624 +FindHeaderInMedium: Trying modulo 562949953421312 +FindHeaderInMedium: Trying modulo 281474976710656 +FindHeaderInMedium: Trying modulo 140737488355328 +FindHeaderInMedium: Trying modulo 70368744177664 +FindHeaderInMedium: Trying modulo 35184372088832 +FindHeaderInMedium: Trying modulo 17592186044416 +FindHeaderInMedium: Trying modulo 8796093022208 +FindHeaderInMedium: Trying modulo 4398046511104 +FindHeaderInMedium: Trying modulo 2199023255552 +FindHeaderInMedium: Trying modulo 1099511627776 +FindHeaderInMedium: Trying modulo 549755813888 +FindHeaderInMedium: Trying modulo 274877906944 +FindHeaderInMedium: Trying modulo 137438953472 +FindHeaderInMedium: Trying modulo 68719476736 +FindHeaderInMedium: Trying modulo 34359738368 +FindHeaderInMedium: Trying modulo 17179869184 +FindHeaderInMedium: Trying modulo 8589934592 +FindHeaderInMedium: Trying modulo 4294967296 +FindHeaderInMedium: Trying modulo 2147483648 +FindHeaderInMedium: Trying modulo 1073741824 +FindHeaderInMedium: Trying modulo 536870912 +FindHeaderInMedium: Trying modulo 268435456 +FindHeaderInMedium: Trying modulo 134217728 +FindHeaderInMedium: Trying modulo 67108864 +FindHeaderInMedium: Trying modulo 33554432 +FindHeaderInMedium: Trying modulo 16777216 +FindHeaderInMedium: Trying modulo 8388608 +FindHeaderInMedium: Trying modulo 4194304 +FindHeaderInMedium: Trying modulo 2097152 +FindHeaderInMedium: Trying modulo 1048576 +FindHeaderInMedium: Trying modulo 524288 +FindHeaderInMedium: Trying modulo 262144 +FindHeaderInMedium: Trying modulo 131072 +FindHeaderInMedium: Trying modulo 65536 +FindHeaderInMedium: Trying modulo 32768 +FindHeaderInMedium: Trying modulo 16384 +try_sector: trying sector 16384 +try_sector: no cookie, skipping current modulo +FindHeaderInMedium: Trying modulo 8192 +Sector 16384 cached; skipping modulo +FindHeaderInMedium: Trying modulo 4096 +try_sector: trying sector 20480 +try_sector: no cookie, skipping current modulo +FindHeaderInMedium: Trying modulo 2048 +Sector 20480 cached; skipping modulo +FindHeaderInMedium: Trying modulo 1024 +Sector 20480 cached; skipping modulo +FindHeaderInMedium: Trying modulo 512 +try_sector: trying sector 20992 +try_sector: no cookie, skipping current modulo +FindHeaderInMedium: Trying modulo 256 +Sector 20992 cached; skipping modulo +FindHeaderInMedium: Trying modulo 128 +Sector 20992 cached; skipping modulo +FindHeaderInMedium: Trying modulo 64 +Sector 20992 cached; skipping modulo +FindHeaderInMedium: Trying modulo 32 +Sector 20992 cached; skipping modulo +...trying RS03 +RS03RecognizeImage: file rs03i-tmp.iso +FindRS03HeaderInImage: file rs03i-tmp.iso +RS03RecognizeImage: No EH, entering exhaustive search +.. trying layer size 1409 +Scanning layers for signatures. +- layer slice 0 +** All layers tested -> no RS03 data found +...no augmented image detected. +GetImageFingerprint(16): read & cached + +* +* dvdisaster - can not continue: +* +Image is not augmented (no dvdisaster signature found). + diff --git a/src/misc.c b/src/misc.c index a4dbc55..005a06c 100644 --- a/src/misc.c +++ b/src/misc.c @@ -1427,7 +1427,9 @@ void StripECCFromImageFile() PrintLog(_("Image successfully truncated back to its original size.\n")); #ifndef WITH_CLI_ONLY_YES - ModalDialog(GTK_MESSAGE_INFO, GTK_BUTTONS_OK, NULL, _("Image successfully truncated")); + if (Closure->guiMode) + { ModalDialog(GTK_MESSAGE_INFO, GTK_BUTTONS_OK, NULL, _("Image successfully truncated")); + } #endif /*** Clean up */