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

fix compilation errors for fs and fs.Dir (#21643)

Browse Source 
* fix compilation errors for fs and fs.Dir

* mem.span instead of mem.sliceTo

* Updating symLinkAbsoluteW function parameters

* Update with expected rename semantics
This commit is contained in:
Justin Braben 2024-10-16 17:08:58 -06:00 committed by GitHub
parent 6201031e05
commit 4a2a0f50ca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/std/fs.zig
View File

@ -160,7 +160,7 @@ pub fn makeDirAbsoluteZ(absolute_path_z: [*:0]const u8) !void {
/// Same as `makeDirAbsolute` except the parameter is a null-terminated WTF-16 LE-encoded string. /// Same as `makeDirAbsolute` except the parameter is a null-terminated WTF-16 LE-encoded string.
pub fn makeDirAbsoluteW(absolute_path_w: [*:0]const u16) !void { pub fn makeDirAbsoluteW(absolute_path_w: [*:0]const u16) !void {
assert(path.isAbsoluteWindowsW(absolute_path_w)); assert(path.isAbsoluteWindowsW(absolute_path_w));
return posix.mkdirW(absolute_path_w, Dir.default_mode); return posix.mkdirW(mem.span(absolute_path_w), Dir.default_mode);
} }
/// Same as `Dir.deleteDir` except the path is absolute. /// Same as `Dir.deleteDir` except the path is absolute.
@ -181,7 +181,7 @@ pub fn deleteDirAbsoluteZ(dir_path: [*:0]const u8) !void {
/// Same as `deleteDirAbsolute` except the path parameter is WTF-16 and target OS is assumed Windows. /// Same as `deleteDirAbsolute` except the path parameter is WTF-16 and target OS is assumed Windows.
pub fn deleteDirAbsoluteW(dir_path: [*:0]const u16) !void { pub fn deleteDirAbsoluteW(dir_path: [*:0]const u16) !void {
assert(path.isAbsoluteWindowsW(dir_path)); assert(path.isAbsoluteWindowsW(dir_path));
return posix.rmdirW(dir_path); return posix.rmdirW(mem.span(dir_path));
} }
/// Same as `Dir.rename` except the paths are absolute. /// Same as `Dir.rename` except the paths are absolute.
@ -221,7 +221,7 @@ pub fn renameZ(old_dir: Dir, old_sub_path_z: [*:0]const u8, new_dir: Dir, new_su
/// Same as `rename` except the parameters are WTF16LE, NT prefixed. /// Same as `rename` except the parameters are WTF16LE, NT prefixed.
/// This function is Windows-only. /// This function is Windows-only.
pub fn renameW(old_dir: Dir, old_sub_path_w: []const u16, new_dir: Dir, new_sub_path_w: []const u16) !void { pub fn renameW(old_dir: Dir, old_sub_path_w: []const u16, new_dir: Dir, new_sub_path_w: []const u16) !void {
return posix.renameatW(old_dir.fd, old_sub_path_w, new_dir.fd, new_sub_path_w); return posix.renameatW(old_dir.fd, old_sub_path_w, new_dir.fd, new_sub_path_w, windows.TRUE);
} }
/// Returns a handle to the current working directory. It is not opened with iteration capability. /// Returns a handle to the current working directory. It is not opened with iteration capability.
@ -338,7 +338,7 @@ pub fn createFileAbsoluteZ(absolute_path_c: [*:0]const u8, flags: File.CreateFla
/// Same as `createFileAbsolute` but the path parameter is WTF-16 encoded. /// Same as `createFileAbsolute` but the path parameter is WTF-16 encoded.
pub fn createFileAbsoluteW(absolute_path_w: [*:0]const u16, flags: File.CreateFlags) File.OpenError!File { pub fn createFileAbsoluteW(absolute_path_w: [*:0]const u16, flags: File.CreateFlags) File.OpenError!File {
assert(path.isAbsoluteWindowsW(absolute_path_w)); assert(path.isAbsoluteWindowsW(absolute_path_w));
return cwd().createFileW(absolute_path_w, flags); return cwd().createFileW(mem.span(absolute_path_w), flags);
} }
/// Delete a file name and possibly the file it refers to, based on an absolute path. /// Delete a file name and possibly the file it refers to, based on an absolute path.
@ -362,7 +362,7 @@ pub fn deleteFileAbsoluteZ(absolute_path_c: [*:0]const u8) Dir.DeleteFileError!v
/// Same as `deleteFileAbsolute` except the parameter is WTF-16 encoded. /// Same as `deleteFileAbsolute` except the parameter is WTF-16 encoded.
pub fn deleteFileAbsoluteW(absolute_path_w: [*:0]const u16) Dir.DeleteFileError!void { pub fn deleteFileAbsoluteW(absolute_path_w: [*:0]const u16) Dir.DeleteFileError!void {
assert(path.isAbsoluteWindowsW(absolute_path_w)); assert(path.isAbsoluteWindowsW(absolute_path_w));
return cwd().deleteFileW(absolute_path_w); return cwd().deleteFileW(mem.span(absolute_path_w));
} }
/// Removes a symlink, file, or directory. /// Removes a symlink, file, or directory.
@ -400,7 +400,7 @@ pub fn readLinkAbsolute(pathname: []const u8, buffer: *[max_path_bytes]u8) ![]u8
/// encoded. /// encoded.
pub fn readlinkAbsoluteW(pathname_w: [*:0]const u16, buffer: *[max_path_bytes]u8) ![]u8 { pub fn readlinkAbsoluteW(pathname_w: [*:0]const u16, buffer: *[max_path_bytes]u8) ![]u8 {
assert(path.isAbsoluteWindowsW(pathname_w)); assert(path.isAbsoluteWindowsW(pathname_w));
return posix.readlinkW(pathname_w, buffer); return posix.readlinkW(mem.span(pathname_w), buffer);
} }
/// Same as `readLink`, except the path parameter is null-terminated. /// Same as `readLink`, except the path parameter is null-terminated.
@ -437,13 +437,13 @@ pub fn symLinkAbsolute(
/// like to create a symbolic link to a directory, specify this with `SymLinkFlags{ .is_directory = true }`. /// like to create a symbolic link to a directory, specify this with `SymLinkFlags{ .is_directory = true }`.
/// See also `symLinkAbsolute`, `symLinkAbsoluteZ`. /// See also `symLinkAbsolute`, `symLinkAbsoluteZ`.
pub fn symLinkAbsoluteW( pub fn symLinkAbsoluteW(
target_path_w: []const u16, target_path_w: [*:0]const u16,
sym_link_path_w: []const u16, sym_link_path_w: [*:0]const u16,
flags: Dir.SymLinkFlags, flags: Dir.SymLinkFlags,
) !void { ) !void {
assert(path.isAbsoluteWindowsWTF16(target_path_w)); assert(path.isAbsoluteWindowsW(target_path_w));
assert(path.isAbsoluteWindowsWTF16(sym_link_path_w)); assert(path.isAbsoluteWindowsW(sym_link_path_w));
return windows.CreateSymbolicLink(null, sym_link_path_w, target_path_w, flags.is_directory); return windows.CreateSymbolicLink(null, mem.span(sym_link_path_w), mem.span(target_path_w), flags.is_directory);
} }
/// Same as `symLinkAbsolute` except the parameters are null-terminated pointers. /// Same as `symLinkAbsolute` except the parameters are null-terminated pointers.

4
lib/std/fs/Dir.zig
View File

@ -1134,7 +1134,7 @@ pub fn makeDirZ(self: Dir, sub_path: [*:0]const u8) MakeError!void {
/// To create multiple directories to make an entire path, see `makePath`. /// To create multiple directories to make an entire path, see `makePath`.
/// To operate on only absolute paths, see `makeDirAbsoluteW`. /// To operate on only absolute paths, see `makeDirAbsoluteW`.
pub fn makeDirW(self: Dir, sub_path: [*:0]const u16) MakeError!void { pub fn makeDirW(self: Dir, sub_path: [*:0]const u16) MakeError!void {
try posix.mkdiratW(self.fd, sub_path, default_mode); try posix.mkdiratW(self.fd, mem.span(sub_path), default_mode);
} }
/// Calls makeDir iteratively to make an entire path /// Calls makeDir iteratively to make an entire path
@ -1763,7 +1763,7 @@ pub fn renameZ(self: Dir, old_sub_path_z: [*:0]const u8, new_sub_path_z: [*:0]co
/// Same as `rename` except the parameters are WTF16LE, NT prefixed. /// Same as `rename` except the parameters are WTF16LE, NT prefixed.
/// This function is Windows-only. /// This function is Windows-only.
pub fn renameW(self: Dir, old_sub_path_w: []const u16, new_sub_path_w: []const u16) RenameError!void { pub fn renameW(self: Dir, old_sub_path_w: []const u16, new_sub_path_w: []const u16) RenameError!void {
return posix.renameatW(self.fd, old_sub_path_w, self.fd, new_sub_path_w); return posix.renameatW(self.fd, old_sub_path_w, self.fd, new_sub_path_w, windows.TRUE);
} }
/// Use with `Dir.symLink`, `Dir.atomicSymLink`, and `symLinkAbsolute` to /// Use with `Dir.symLink`, `Dir.atomicSymLink`, and `symLinkAbsolute` to