fix: --strip in console without X server would segfault & fix tests
This commit is contained in:
@@ -30,16 +30,11 @@ fi
|
|||||||
|
|
||||||
nbfailed=0
|
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
|
# For MSYS2
|
||||||
|
|
||||||
if [ -n "$ORIGINAL_TEMP" ]; then
|
if [ -n "$ORIGINAL_TEMP" ]; then
|
||||||
ISODIR="$ORIGINAL_TEMP"
|
ISODIR="$ORIGINAL_TEMP"
|
||||||
# /c/ => C:/
|
# /c/ => C:/
|
||||||
SED_REMOVE_ISO_DIR="$(echo "$ISODIR" | cut -c2 | tr a-z A-Z):$(echo "$ISODIR" | cut -c3-)/"
|
|
||||||
NON_EXISTENT_DEVICE=V:
|
NON_EXISTENT_DEVICE=V:
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -214,67 +209,71 @@ function run_regtest()
|
|||||||
REFLOG=${DATABASE}/${CODEC_PREFIX}_${testsymbol}
|
REFLOG=${DATABASE}/${CODEC_PREFIX}_${testsymbol}
|
||||||
|
|
||||||
if test "$gui_mode" == "false"; then
|
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
|
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
|
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
|
if ! test -r $REFLOG; then
|
||||||
echo -e "FAIL\n$REFLOG missing in log file database"
|
pass="false"
|
||||||
return
|
if [ "$REGTEST_NO_UTF8" = 1 ]; then
|
||||||
fi
|
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
|
grep -va "dvdisaster: No memory leaks found." $NEWLOG >$TMPLOG
|
||||||
# have been found
|
mv $TMPLOG $NEWLOG
|
||||||
|
|
||||||
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
|
|
||||||
|
|
||||||
filter=cat
|
# ignore log lines specified by user
|
||||||
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 (<expected; >created):"
|
|
||||||
else
|
|
||||||
printf "%b\r%b\n" "BAD; diffs found (<expected; >created):" "[\e[31m✘\e[0m]"
|
|
||||||
fi
|
|
||||||
cat ${DIFFLOG}
|
|
||||||
|
|
||||||
if test "$interactive_diff" == "yes"; then
|
if test -n "$IGNORE_LOG_LINE"; then
|
||||||
while true; do
|
grep -Eva "$IGNORE_LOG_LINE" $NEWLOG >$TMPLOG
|
||||||
read -n 1 -p ">> Press 'a' to accept this diff; 'v' to vimdiff; any other key to fail this test:" -e answer
|
mv $TMPLOG $NEWLOG
|
||||||
if test "$answer" == "a"; then
|
fi
|
||||||
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
|
|
||||||
|
|
||||||
continue
|
filter=cat
|
||||||
else
|
echo "$options" | grep -qw SORTED && filter=sort
|
||||||
pass="false"
|
if [ "${CODEC_PREFIX}_${testsymbol}" = RS01_scan_no_device ] || \
|
||||||
fi
|
[ "${CODEC_PREFIX}_${testsymbol}" = RS01_read_no_device ] || \
|
||||||
break
|
[ "${CODEC_PREFIX}_${testsymbol}" = RS01_adaptive_no_device ]; then
|
||||||
done
|
# for Windows
|
||||||
else
|
sed -i -re "s=device $NON_EXISTENT_DEVICE\.=/dev/sdz: No such file or directory=" $NEWLOG
|
||||||
pass="false"
|
fi
|
||||||
fi
|
|
||||||
fi
|
if ! diff <(tail -n +3 $REFLOG | $filter) <(sed -re "s=[a-zA-Z:/]+/([a-z0-9_-]+\.(ecc|iso))=\1=g;s=$ISODIR/==g" $NEWLOG | $filter) >${DIFFLOG}; then
|
||||||
|
if [ "$REGTEST_NO_UTF8" = 1 ]; then
|
||||||
|
echo "BAD; diffs found (<expected; >created):"
|
||||||
|
else
|
||||||
|
printf "%b\r%b\n" "BAD; diffs found (<expected; >created):" "[\e[31m✘\e[0m]"
|
||||||
|
fi
|
||||||
|
cat ${DIFFLOG}
|
||||||
|
|
||||||
|
if test "$interactive_diff" == "yes"; then
|
||||||
|
while true; do
|
||||||
|
read -n 1 -p ">> Press 'a' to accept this diff; 'v' to vimdiff; any other key to fail this test:" -e answer
|
||||||
|
if test "$answer" == "a"; then
|
||||||
|
cp $REFLOG $LOGDIR
|
||||||
|
head -n 2 $LOGDIR/${CODEC_PREFIX}_${testsymbol} >$REFLOG
|
||||||
|
sed -re "s=[a-zA-Z:/]+/([a-z0-9_-]+\.(ecc|iso))=\1=g;s=$ISODIR/==g" $NEWLOG >>$REFLOG
|
||||||
|
pass="skip"
|
||||||
|
elif test "$answer" == "v"; then
|
||||||
|
vimdiff $REFLOG $NEWLOG
|
||||||
|
|
||||||
|
continue
|
||||||
|
else
|
||||||
|
pass="false"
|
||||||
|
fi
|
||||||
|
break
|
||||||
|
done
|
||||||
|
else
|
||||||
|
pass="false"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
else # gui mode
|
else # gui mode
|
||||||
replace_config last-image "$testiso"
|
replace_config last-image "$testiso"
|
||||||
if test -n "${testecc}"; then
|
if test -n "${testecc}"; then
|
||||||
@@ -293,8 +292,13 @@ function run_regtest()
|
|||||||
|
|
||||||
unset extra_args
|
unset extra_args
|
||||||
|
|
||||||
image_md5=$(head -n 1 $REFLOG)
|
if test -r "$REFLOG"; then
|
||||||
ecc_md5=$(head -n 2 $REFLOG | tail -n 1)
|
image_md5=$(head -n 1 $REFLOG)
|
||||||
|
ecc_md5=$(head -n 2 $REFLOG | tail -n 1)
|
||||||
|
else
|
||||||
|
image_md5=ignore
|
||||||
|
ecc_md5=ignore
|
||||||
|
fi
|
||||||
|
|
||||||
if test "${image_md5}" != "ignore"; then
|
if test "${image_md5}" != "ignore"; then
|
||||||
md5=$($MD5SUM ${testiso} | cut -d\ -f 1)
|
md5=$($MD5SUM ${testiso} | cut -d\ -f 1)
|
||||||
|
|||||||
75
regtest/database/RS02_strip_ecc
Normal file
75
regtest/database/RS02_strip_ecc
Normal file
@@ -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.
|
||||||
143
regtest/database/RS02_strip_ecc_not
Normal file
143
regtest/database/RS02_strip_ecc_not
Normal file
@@ -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).
|
||||||
|
|
||||||
134
regtest/database/RS03i_strip_ecc
Normal file
134
regtest/database/RS03i_strip_ecc
Normal file
@@ -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.
|
||||||
140
regtest/database/RS03i_strip_ecc_not
Normal file
140
regtest/database/RS03i_strip_ecc_not
Normal file
@@ -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).
|
||||||
|
|
||||||
@@ -1427,7 +1427,9 @@ void StripECCFromImageFile()
|
|||||||
PrintLog(_("Image successfully truncated back to its original size.\n"));
|
PrintLog(_("Image successfully truncated back to its original size.\n"));
|
||||||
|
|
||||||
#ifndef WITH_CLI_ONLY_YES
|
#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
|
#endif
|
||||||
|
|
||||||
/*** Clean up */
|
/*** Clean up */
|
||||||
|
|||||||
Reference in New Issue
Block a user