Skip to content

Directory.CreateDirectory: create missing parents using default UnixFileMode. #74002

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jozkee merged 7 commits into from
Aug 19, 2022
Merged

Directory.CreateDirectory: create missing parents using default UnixFileMode. #74002

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b0acc3c
Directory.CreateDirectory: create missing parents using default UnixF…
tmds Aug 16, 2022
253e68a
Simplify TarHelpers.CreateDirectory.
tmds Aug 17, 2022
daed79e
PR feedback.
tmds Aug 18, 2022
03858aa
AssertFileModeEquals: don't skip on Android.
tmds Aug 19, 2022
7f3d1bd
Always overwite directory metadata.
tmds Aug 19, 2022
5271907
TarHelpers.Windows: remove CreateDirectory overwriteMetadata.
tmds Aug 19, 2022
e1cf9d4
Fix Assert indentation.
tmds Aug 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
PR feedback.
  • Loading branch information
@tmds
tmds committed Aug 18, 2022
commit daed79e774ddcf5d1ce02ab03087fda45a01f7a7
3 changes: 1 addition & 2 deletions src/libraries/System.Formats.Tar/src/System/Formats/Tar/TarHelpers.Unix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ internal static void CreateDirectory(string fullPath, UnixFileMode? mode, bool o
return;
}

// Missing parents are created using default permissions.
// If there are missing parents, Directory.CreateDirectory will create them using default permissions.
if (mode.HasValue)
{
// Ensure we have sufficient permissions to extract in the directory.
Expand All @@ -95,7 +95,6 @@ internal static void CreateDirectory(string fullPath, UnixFileMode? mode, bool o
}
else
{
// Create directory using default permissions.
Directory.CreateDirectory(fullPath);
}
}
Expand Down
5 changes: 3 additions & 2 deletions src/libraries/System.Formats.Tar/tests/TarTestsBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public enum TestTarFormat

protected TarTestsBase()
{
CreateDirectoryDefaultMode = PlatformDetection.IsWindows ? UnixFileMode.None : Directory.CreateDirectory(GetRandomDirPath()).UnixFileMode;
CreateDirectoryDefaultMode = Directory.CreateDirectory(GetRandomDirPath()).UnixFileMode; // '0777 & ~umask'
}

protected static string GetTestCaseUnarchivedFolderPath(string testCaseName) =>
Expand Down Expand Up @@ -416,7 +416,8 @@ protected static void AssertEntryModeFromFileSystemEquals(TarEntry entry, UnixFi

protected static void AssertFileModeEquals(string path, UnixFileMode mode)
{
if (!PlatformDetection.IsWindows)
if (!PlatformDetection.IsWindows &&
!PlatformDetection.IsAndroid) // Android may change the requested permissions.
{
Assert.Equal(mode, File.GetUnixFileMode(path));
}
Expand Down