Skip to content
This repository was archived by the owner on Feb 28, 2025. It is now read-only.

Commit db77fd5

Browse files
slowpeekaborodin
authored andcommitted
Ticket #4559: extfs: u7z: bug with nested dirs in mkdir action.
The -w option sets the working directory for the temporary archive 7-zip builds when modifying an existing one. The option cant be used to set the base path inside an archive when adding something into it. When adding something to a 7z archive by its absolute path, 7zip only uses the last part of the path by default. E.g. `7z a 1.7z /tmp/a/b/date.txt` would add date.txt to the root dir inside the archive. If we wanted the file to be under `a/b/` inside the archive as well, it should be `7z a 1.7z /tmp/a`. Closes MidnightCommander/mc#202. Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
1 parent 7e2cf63 commit db77fd5

File tree

1 file changed

+1
-1
lines changed
  • src/vfs/extfs/helpers

1 file changed

+1
-1
lines changed

src/vfs/extfs/helpers/u7z

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ mcu7zip_mkdir ()
8686
{
8787
dir=`mktemp -d "${MC_TMPDIR:-/tmp}/mctmpdir-u7z.XXXXXX"` || exit 1
8888
mkdir -p "$dir"/"$2"
89-
$P7ZIP a -w"$dir" "$1" "$dir"/"$2" >/dev/null 2>&1
89+
$P7ZIP a "$1" "$dir/${2%%/*}" >/dev/null 2>&1
9090
rm -rf "$dir"
9191
}
9292

0 commit comments

Comments
 (0)