mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-16 03:03:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

windows: use NtSetInformationFile in DeleteFile.

Browse Source 
Using `FILE_DELETE_ON_CLOSE` can silently succeed without reporting any error
on non-empty directory. This commit adds usage of NtSetInformationFile
which will report `DIRECTORY_NOT_EMPTY`.
This commit is contained in:
xEgoist 2023-04-16 00:38:25 -05:00
parent 7fad555e5e
commit 911f74e93b
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/std/os/windows.zig
View File

@ -870,6 +870,7 @@ pub const DeleteFileError = error{
Unexpected, Unexpected,
NotDir, NotDir,
IsDir, IsDir,
DirNotEmpty,
}; };
pub const DeleteFileOptions = struct { pub const DeleteFileOptions = struct {
@ -879,9 +880,9 @@ pub const DeleteFileOptions = struct {
pub fn DeleteFile(sub_path_w: []const u16, options: DeleteFileOptions) DeleteFileError!void { pub fn DeleteFile(sub_path_w: []const u16, options: DeleteFileOptions) DeleteFileError!void {
const create_options_flags: ULONG = if (options.remove_dir) const create_options_flags: ULONG = if (options.remove_dir)
FILE_DELETE_ON_CLOSE | FILE_DIRECTORY_FILE | FILE_OPEN_REPARSE_POINT FILE_DIRECTORY_FILE | FILE_OPEN_REPARSE_POINT
else else
FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE | FILE_OPEN_REPARSE_POINT; // would we ever want to delete the target instead? FILE_NON_DIRECTORY_FILE | FILE_OPEN_REPARSE_POINT; // would we ever want to delete the target instead?
const path_len_bytes = @intCast(u16, sub_path_w.len * 2); const path_len_bytes = @intCast(u16, sub_path_w.len * 2);
var nt_name = UNICODE_STRING{ var nt_name = UNICODE_STRING{
@ -924,7 +925,7 @@ pub fn DeleteFile(sub_path_w: []const u16, options: DeleteFileOptions) DeleteFil
0, 0,
); );
switch (rc) { switch (rc) {
.SUCCESS => return CloseHandle(tmp_handle), .SUCCESS => {},
.OBJECT_NAME_INVALID => unreachable, .OBJECT_NAME_INVALID => unreachable,
.OBJECT_NAME_NOT_FOUND => return error.FileNotFound, .OBJECT_NAME_NOT_FOUND => return error.FileNotFound,
.OBJECT_PATH_NOT_FOUND => return error.FileNotFound, .OBJECT_PATH_NOT_FOUND => return error.FileNotFound,
@ -935,6 +936,22 @@ pub fn DeleteFile(sub_path_w: []const u16, options: DeleteFileOptions) DeleteFil
.CANNOT_DELETE => return error.AccessDenied, .CANNOT_DELETE => return error.AccessDenied,
else => return unexpectedStatus(rc), else => return unexpectedStatus(rc),
} }
var file_dispo = FILE_DISPOSITION_INFORMATION{
.DeleteFile = TRUE,
};
rc = ntdll.NtSetInformationFile(
tmp_handle,
&io,
&file_dispo,
@sizeOf(FILE_DISPOSITION_INFORMATION),
.FileDispositionInformation,
);
CloseHandle(tmp_handle);
switch (rc) {
.SUCCESS => return,
.DIRECTORY_NOT_EMPTY => return error.DirNotEmpty,
else => return unexpectedStatus(rc),
}
} }
pub const MoveFileError = error{ FileNotFound, AccessDenied, Unexpected }; pub const MoveFileError = error{ FileNotFound, AccessDenied, Unexpected };
@ -2470,6 +2487,10 @@ pub const FILE_INFORMATION_CLASS = enum(c_int) {
FileMaximumInformation, FileMaximumInformation,
}; };
pub const FILE_DISPOSITION_INFORMATION = extern struct {
DeleteFile: BOOLEAN,
};
pub const FILE_FS_DEVICE_INFORMATION = extern struct { pub const FILE_FS_DEVICE_INFORMATION = extern struct {
DeviceType: DEVICE_TYPE, DeviceType: DEVICE_TYPE,
Characteristics: ULONG, Characteristics: ULONG,