From ba6b42802fb493b98050b2000618763dc8e1b312 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sat, 13 Feb 2021 14:12:18 +0300 Subject: [PATCH] Ticket #4154: support unrar v6. Signed-off-by: Andrew Borodin --- src/vfs/extfs/helpers/urar.in | 2 +- tests/src/vfs/extfs/helpers-list/Makefile.am | 6 +++--- tests/src/vfs/extfs/helpers-list/data/urar.README | 6 +++--- .../data/{urar.v5.env_vars => urar.v6,v5.env_vars} | 0 .../helpers-list/data/{urar.v5.input => urar.v6,v5.input} | 0 .../helpers-list/data/{urar.v5.output => urar.v6,v5.output} | 0 6 files changed, 7 insertions(+), 7 deletions(-) rename tests/src/vfs/extfs/helpers-list/data/{urar.v5.env_vars => urar.v6,v5.env_vars} (100%) rename tests/src/vfs/extfs/helpers-list/data/{urar.v5.input => urar.v6,v5.input} (100%) rename tests/src/vfs/extfs/helpers-list/data/{urar.v5.output => urar.v6,v5.output} (100%) diff --git a/src/vfs/extfs/helpers/urar.in b/src/vfs/extfs/helpers/urar.in index 5453d3195..684234cf1 100644 --- a/src/vfs/extfs/helpers/urar.in +++ b/src/vfs/extfs/helpers/urar.in @@ -113,7 +113,7 @@ mcrar5fs_list () mcrarfs_list () { - [ x$UNRAR_VERSION = x5 ] && mcrar5fs_list "$@" || mcrar4fs_list "$@" + [ x$UNRAR_VERSION = x6 -o x$UNRAR_VERSION = x5 ] && mcrar5fs_list "$@" || mcrar4fs_list "$@" } mcrarfs_copyin () diff --git a/tests/src/vfs/extfs/helpers-list/Makefile.am b/tests/src/vfs/extfs/helpers-list/Makefile.am index 94ddcf903..991a11faa 100644 --- a/tests/src/vfs/extfs/helpers-list/Makefile.am +++ b/tests/src/vfs/extfs/helpers-list/Makefile.am @@ -72,9 +72,9 @@ data_files_to_distribute = \ data/urar.v4,v3.env_vars \ data/urar.v4,v3.input \ data/urar.v4,v3.output \ - data/urar.v5.env_vars \ - data/urar.v5.input \ - data/urar.v5.output \ + data/urar.v6,v5.env_vars \ + data/urar.v6,v5.input \ + data/urar.v6,v5.output \ data/uzip.README \ data/uzip.with-zipinfo.env_vars \ data/uzip.with-zipinfo.input \ diff --git a/tests/src/vfs/extfs/helpers-list/data/urar.README b/tests/src/vfs/extfs/helpers-list/data/urar.README index 75f12970c..8ff5b1de4 100644 --- a/tests/src/vfs/extfs/helpers-list/data/urar.README +++ b/tests/src/vfs/extfs/helpers-list/data/urar.README @@ -4,10 +4,10 @@ The archive was created thus: echo hello > 'filename with spaces.txt' rar a archive.rar 'filename with spaces.txt' ... -Our 'urar' supports two listing formats: that of version 5, and that of -version 4. +Our 'urar' supports two listing formats: that of versions 6 and 5, and that of +versions 4 and 3. -'urar.v5.input' was created with "unrar vt -c- -cfg- archive.rar" using +'urar.v6,v5.input' was created with "unrar vt -c- -cfg- archive.rar" using unrar 5.30. 'urar.v4,v3.input' was created with "unrar v -c- -cfg- archive.rar" using diff --git a/tests/src/vfs/extfs/helpers-list/data/urar.v5.env_vars b/tests/src/vfs/extfs/helpers-list/data/urar.v6,v5.env_vars similarity index 100% rename from tests/src/vfs/extfs/helpers-list/data/urar.v5.env_vars rename to tests/src/vfs/extfs/helpers-list/data/urar.v6,v5.env_vars diff --git a/tests/src/vfs/extfs/helpers-list/data/urar.v5.input b/tests/src/vfs/extfs/helpers-list/data/urar.v6,v5.input similarity index 100% rename from tests/src/vfs/extfs/helpers-list/data/urar.v5.input rename to tests/src/vfs/extfs/helpers-list/data/urar.v6,v5.input diff --git a/tests/src/vfs/extfs/helpers-list/data/urar.v5.output b/tests/src/vfs/extfs/helpers-list/data/urar.v6,v5.output similarity index 100% rename from tests/src/vfs/extfs/helpers-list/data/urar.v5.output rename to tests/src/vfs/extfs/helpers-list/data/urar.v6,v5.output