Skip to content

Don't throw on Delete for missing file #89

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

Open
dfev77 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Don't throw on Delete for missing file #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 14 additions & 8 deletions Pri.LongPath/File.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,17 +220,23 @@ public static FileStream Create(string path, int bufferSize, FileOptions options
/// </exception>
public static void Delete(string path)
{
if (Common.IsRunningOnMono() && Common.IsPlatformUnix())
{
SysFile.Delete(path);
return;
}
const int fileNotFoundWindowsErrorCode = 2;

string normalizedPath = Path.NormalizeLongPath(path);
if (!NativeMethods.DeleteFile(normalizedPath))
if (Common.IsRunningOnMono() && Common.IsPlatformUnix())
{
throw Common.GetExceptionFromLastWin32Error();
SysFile.Delete(path);
return;
}

string normalizedPath = Path.NormalizeLongPath(path);

if (NativeMethods.DeleteFile(normalizedPath))
return;

if (fileNotFoundWindowsErrorCode == Marshal.GetLastWin32Error())
return;

throw Common.GetExceptionFromLastWin32Error();
}

public static void Decrypt(string path)
Expand Down
6 changes: 6 additions & 0 deletions Tests/FileTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1343,6 +1343,12 @@ public void TestGetLastWriteTimeOnMissingFileHasNoException()
var dt = File.GetLastWriteTime("gibberish");
}

[Test]
public void TestDeleteOnMissingFileDoesNotThrow()
{
File.Delete("missing.file");
}

[TearDown]
public void TearDown()
{
Expand Down