Merge branch '4559_extfs_u7z_mkdir'

aborodin · aborodin · commit 9b2faec578cc · 2024-07-28T14:54:17.000+03:00
* 4559_extfs_u7z_mkdir:
  Ticket #4559: extfs: u7z: bug with nested dirs in mkdir action.
diff --git a/src/vfs/extfs/helpers/u7z b/src/vfs/extfs/helpers/u7z
@@ -86,7 +86,7 @@ mcu7zip_mkdir ()
 {
         dir=`mktemp -d "${MC_TMPDIR:-/tmp}/mctmpdir-u7z.XXXXXX"` || exit 1
         mkdir -p "$dir"/"$2"
-        $P7ZIP a -w"$dir" "$1" "$dir"/"$2" >/dev/null 2>&1
+        $P7ZIP a "$1" "$dir/${2%%/*}" >/dev/null 2>&1
         rm -rf "$dir"
 }
 

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ mcu7zip_mkdir ()`
`86`	`86`	`{`
`87`	`87`	dir=`mktemp -d "${MC_TMPDIR:-/tmp}/mctmpdir-u7z.XXXXXX"` \|\| exit 1
`88`	`88`	`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`
`90`	`90`	`rm -rf "$dir"`
`91`	`91`	`}`
`92`	`92`