* fix #7182
Signed-off-by: zwwhdls <zwwhdls@hotmail.com>
* fix typo
Signed-off-by: zwwhdls <zwwhdls@hotmail.com>
* add testcase
Signed-off-by: zwwhdls <zwwhdls@hotmail.com>
* fix conflict subdirectory when untardir is the clashing directory
Signed-off-by: zwwhdls <zwwhdls@hotmail.com>
(cherry picked from commit 63e1c9bc7f)