diff --git a/src/vfs/extfs/helpers/iso9660.in b/src/vfs/extfs/helpers/iso9660.in
index a4519dc3c..2e2a3390d 100644
|
a
|
b
|
awk_xorriso_unesc=$(cat <<'EOF' |
| 80 | 80 | EOF |
| 81 | 81 | ) |
| 82 | 82 | |
| 83 | | xorriso_list() { |
| | 83 | xorriso_list() ( |
| 84 | 84 | if test -z "$XORRISO"; then |
| 85 | 85 | return 1 |
| 86 | 86 | fi |
| 87 | 87 | |
| 88 | | local temp_ls |
| 89 | 88 | temp_ls=$(mktemp "${MC_TMPDIR:-/tmp}"/mc-iso9660.XXXXXX) || return 1 |
| 90 | 89 | |
| 91 | 90 | # $XORRISO must be unquoted here to hook into the testing framework |
| 92 | 91 | $XORRISO -abort_on FATAL -dev stdio:"$1" -find / -exec lsdl 2>/dev/null >"$temp_ls" |
| 93 | | local r=$? |
| | 92 | r=$? |
| 94 | 93 | |
| 95 | 94 | if [ "$r" != 0 ]; then |
| 96 | 95 | rm -f "$temp_ls" |
| … |
… |
xorriso_list() { |
| 105 | 104 | @AWK@ "$awk_xorriso_unesc" |
| 106 | 105 | |
| 107 | 106 | rm -f "$temp_ls" |
| 108 | | } |
| | 107 | ) |
| 109 | 108 | |
| 110 | 109 | xorriso_copyout() { |
| 111 | 110 | if test -z "$XORRISO"; then |
| … |
… |
test_iso () { |
| 175 | 174 | fi |
| 176 | 175 | } |
| 177 | 176 | |
| 178 | | mcisofs_list () { |
| 179 | | local lsl r |
| 180 | | |
| | 177 | mcisofs_list () ( |
| 181 | 178 | # left as a reminder to implement compressed image support =) |
| 182 | 179 | case "$1" in |
| 183 | 180 | *.lz) MYCAT="lzip -dc";; |
| … |
… |
BEGIN { |
| 227 | 224 | if (name == "..") next; |
| 228 | 225 | printf "%s%s%s\n", attr, dir, name |
| 229 | 226 | }' |
| 230 | | } |
| | 227 | ) |
| 231 | 228 | |
| 232 | 229 | mcisofs_copyout () { |
| 233 | 230 | if [ "x$SEMICOLON" = "xYES" ]; then |
diff --git a/tests/src/vfs/extfs/helpers-list/test_all b/tests/src/vfs/extfs/helpers-list/test_all
index f5f9be616..b7b604fa8 100755
|
a
|
b
|
opt_run_mcdiff_on_error=no # "yes" if '--mcdiff' provided. |
| 94 | 94 | |
| 95 | 95 | ############################ Utility functions ############################# |
| 96 | 96 | |
| | 97 | # Support ksh93+ |
| | 98 | if type typeset > /dev/null 2>&1; then |
| | 99 | alias local="typeset" |
| | 100 | fi |
| | 101 | |
| 97 | 102 | # |
| 98 | 103 | # Does $1 contain $2? |
| 99 | 104 | # |
