authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2020-06-22 09:14:51+02:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2020-06-22 09:14:51+02:00
log64078ca92439d4f01d4a6e60a6ad33025da5a36a
tree6544468b8497dcf9a81663bb075f96e18421d341
parentd907f574e02aadf8196e616bcc2fb2813cf2c82c

Enhance std.os.symlinkat coverage

Fixes `std.os.symlinkat` compile errors, adds Windows stub (still needs to be implemented), adds WASI implementation.

3 files changed, 71 insertions(+), 5 deletions(-)

lib/std/c.zig+1
......@@ -102,6 +102,7 @@ pub extern "c" fn pipe2(fds: *[2]fd_t, flags: u32) c_int;
102102pub extern "c" fn mkdir(path: [*:0]const u8, mode: c_uint) c_int;
103103pub extern "c" fn mkdirat(dirfd: fd_t, path: [*:0]const u8, mode: u32) c_int;
104104pub extern "c" fn symlink(existing: [*:0]const u8, new: [*:0]const u8) c_int;
105pub extern "c" fn symlinkat(oldpath: [*:0]const u8, newdirfd: fd_t, newpath: [*:0]const u8) c_int;
105106pub extern "c" fn rename(old: [*:0]const u8, new: [*:0]const u8) c_int;
106107pub extern "c" fn renameat(olddirfd: fd_t, old: [*:0]const u8, newdirfd: fd_t, new: [*:0]const u8) c_int;
107108pub extern "c" fn chdir(path: [*:0]const u8) c_int;
lib/std/os.zig+57-5
......@@ -1520,15 +1520,17 @@ pub const SymLinkError = error{
15201520/// If `sym_link_path` exists, it will not be overwritten.
15211521/// See also `symlinkC` and `symlinkW`.
15221522pub fn symlink(target_path: []const u8, sym_link_path: []const u8) SymLinkError!void {
1523 if (builtin.os.tag == .wasi) {
1524 @compileError("symlink is not supported in WASI; use symlinkat instead");
1525 }
15231526 if (builtin.os.tag == .windows) {
15241527 const target_path_w = try windows.sliceToPrefixedFileW(target_path);
15251528 const sym_link_path_w = try windows.sliceToPrefixedFileW(sym_link_path);
15261529 return windows.CreateSymbolicLinkW(sym_link_path_w.span().ptr, target_path_w.span().ptr, 0);
1527 } else {
1528 const target_path_c = try toPosixPath(target_path);
1529 const sym_link_path_c = try toPosixPath(sym_link_path);
1530 return symlinkZ(&target_path_c, &sym_link_path_c);
15311530 }
1531 const target_path_c = try toPosixPath(target_path);
1532 const sym_link_path_c = try toPosixPath(sym_link_path);
1533 return symlinkZ(&target_path_c, &sym_link_path_c);
15321534}
15331535
15341536pub const symlinkC = @compileError("deprecated: renamed to symlinkZ");
......@@ -1561,15 +1563,65 @@ pub fn symlinkZ(target_path: [*:0]const u8, sym_link_path: [*:0]const u8) SymLin
15611563 }
15621564}
15631565
1566/// Similar to `symlink`, however, creates a symbolic link named `sym_link_path` which contains the string
1567/// `target_path` **relative** to `newdirfd` directory handle.
1568/// A symbolic link (also known as a soft link) may point to an existing file or to a nonexistent
1569/// one; the latter case is known as a dangling link.
1570/// If `sym_link_path` exists, it will not be overwritten.
1571/// See also `symlinkatWasi`, `symlinkatZ` and `symlinkatW`.
15641572pub fn symlinkat(target_path: []const u8, newdirfd: fd_t, sym_link_path: []const u8) SymLinkError!void {
1573 if (builtin.os.tag == .wasi) {
1574 return symlinkatWasi(target_path, newdirfd, sym_link_path);
1575 }
1576 if (builtin.os.tag == .windows) {
1577 const target_path_w = try windows.sliceToPrefixedFileW(target_path);
1578 const sym_link_path_w = try windows.sliceToPrefixedFileW(sym_link_path);
1579 return symlinkatW(target_path_w.span().ptr, newdirfd, sym_link_path_w.span().ptr);
1580 }
15651581 const target_path_c = try toPosixPath(target_path);
15661582 const sym_link_path_c = try toPosixPath(sym_link_path);
1567 return symlinkatZ(target_path_c, newdirfd, sym_link_path_c);
1583 return symlinkatZ(&target_path_c, newdirfd, &sym_link_path_c);
15681584}
15691585
15701586pub const symlinkatC = @compileError("deprecated: renamed to symlinkatZ");
15711587
1588/// WASI-only. The same as `symlinkat` but targeting WASI.
1589/// See also `symlinkat`.
1590pub fn symlinkatWasi(target_path: []const u8, newdirfd: fd_t, sym_link_path: []const u8) SymLinkError!void {
1591 switch (wasi.path_symlink(sym_link_path.ptr, sym_link_path.len, newdirfd, target_path.ptr, target_path.len)) {
1592 wasi.ESUCCESS => {},
1593 wasi.EFAULT => unreachable,
1594 wasi.EINVAL => unreachable,
1595 wasi.EACCES => return error.AccessDenied,
1596 wasi.EPERM => return error.AccessDenied,
1597 wasi.EDQUOT => return error.DiskQuota,
1598 wasi.EEXIST => return error.PathAlreadyExists,
1599 wasi.EIO => return error.FileSystem,
1600 wasi.ELOOP => return error.SymLinkLoop,
1601 wasi.ENAMETOOLONG => return error.NameTooLong,
1602 wasi.ENOENT => return error.FileNotFound,
1603 wasi.ENOTDIR => return error.NotDir,
1604 wasi.ENOMEM => return error.SystemResources,
1605 wasi.ENOSPC => return error.NoSpaceLeft,
1606 wasi.EROFS => return error.ReadOnlyFileSystem,
1607 else => |err| return unexpectedErrno(err),
1608 }
1609}
1610
1611/// Windows-only. The same as `symlinkat` except the paths are null-terminated, WTF-16 encoded.
1612/// See also `symlinkat`.
1613pub fn symlinkatW(target_path: [*:0]const u16, newdirfd: fd_t, sym_link_path: [*:0]const u16) SymlinkError!void {
1614 @compileError("TODO implement on Windows");
1615}
1616
1617/// The same as `symlinkat` except the parameters are null-terminated pointers.
1618/// See also `symlinkat`.
15721619pub fn symlinkatZ(target_path: [*:0]const u8, newdirfd: fd_t, sym_link_path: [*:0]const u8) SymLinkError!void {
1620 if (builtin.os.tag == .windows) {
1621 const target_path_w = try windows.cStrToPrefixedFileW(target_path);
1622 const sym_link_path_w = try windows.cStrToPrefixedFileW(sym_link_path);
1623 return symlinkatW(target_path_w.span().ptr, newdirfd, sym_link_path.span().ptr);
1624 }
15731625 switch (errno(system.symlinkat(target_path, newdirfd, sym_link_path))) {
15741626 0 => return,
15751627 EFAULT => unreachable,
lib/std/os/test.zig+13
......@@ -18,6 +18,19 @@ const AtomicOrder = builtin.AtomicOrder;
1818const tmpDir = std.testing.tmpDir;
1919const Dir = std.fs.Dir;
2020
21test "readlinkat" {
22 var tmp = tmpDir(.{});
23 defer tmp.cleanup();
24
25 // create file
26 try tmp.dir.writeFile("file.txt", "nonsense");
27
28 // create a symbolic link
29 try os.symlinkat("file.txt", tmp.dir.fd, "link");
30
31 // TODO read the link
32}
33
2134test "makePath, put some files in it, deleteTree" {
2235 var tmp = tmpDir(.{});
2336 defer tmp.cleanup();