@@ -474,7 +474,8 @@ static __wasi_fd_t doOpen(path::ParsedParent parsed,
474
474
// report a generic error.
475
475
return -EIO;
476
476
}
477
- [[maybe_unused]] bool mounted = lockedParent.mountChild (std::string (childName), created);
477
+ [[maybe_unused]] bool mounted =
478
+ lockedParent.mountChild (std::string (childName), created);
478
479
assert (mounted);
479
480
}
480
481
// TODO: Check that the insert actually succeeds.
@@ -588,8 +589,9 @@ int __syscall_mknodat(int dirfd, const char* path, mode_t mode, dev_t dev) {
588
589
OpenReturnMode::Nothing);
589
590
}
590
591
591
- static int
592
- doMkdir (path::ParsedParent parsed, mode_t mode, backend_t backend = NullBackend) {
592
+ static int doMkdir (path::ParsedParent parsed,
593
+ mode_t mode,
594
+ backend_t backend = NullBackend) {
593
595
if (auto err = parsed.getError ()) {
594
596
return err;
595
597
}
@@ -646,14 +648,14 @@ doMkdir(path::ParsedParent parsed, mode_t mode, backend_t backend = NullBackend)
646
648
647
649
// This function is exposed to users and allows users to specify a particular
648
650
// backend that a directory should be created within.
649
- int wasmfs_create_directory (char * path, mode_t mode, backend_t backend) {
651
+ int wasmfs_create_directory (char * path, mode_t mode, backend_t backend) {
650
652
static_assert (std::is_same_v<decltype (doMkdir (0 , 0 , 0 )), int >,
651
653
" unexpected conversion from result of doMkdir to int" );
652
654
return doMkdir (path::parseParent (path), mode, backend);
653
655
}
654
656
655
657
// TODO: Test this.
656
- int __syscall_mkdirat (int dirfd, const char * path, mode_t mode) {
658
+ int __syscall_mkdirat (int dirfd, const char * path, mode_t mode) {
657
659
return doMkdir (path::parseParent (path, dirfd), mode);
658
660
}
659
661
@@ -1040,7 +1042,9 @@ int __syscall_renameat(int olddirfd,
1040
1042
}
1041
1043
1042
1044
// TODO: Test this with non-AT_FDCWD values.
1043
- int __syscall_symlinkat (const char * target, int newdirfd, const char * linkpath) {
1045
+ int __syscall_symlinkat (const char * target,
1046
+ int newdirfd,
1047
+ const char * linkpath) {
1044
1048
auto parsed = path::parseParent (linkpath, newdirfd);
1045
1049
if (auto err = parsed.getError ()) {
1046
1050
return err;
@@ -1060,12 +1064,15 @@ int __syscall_symlinkat(const char* target, int newdirfd, const char* linkpath)
1060
1064
return 0 ;
1061
1065
}
1062
1066
1063
- int __syscall_symlink (const char * target, const char * linkpath) {
1067
+ int __syscall_symlink (const char * target, const char * linkpath) {
1064
1068
return __syscall_symlinkat (target, AT_FDCWD, linkpath);
1065
1069
}
1066
1070
1067
1071
// TODO: Test this with non-AT_FDCWD values.
1068
- int __syscall_readlinkat (int dirfd, const char *path, char *buf, size_t bufsize) {
1072
+ int __syscall_readlinkat (int dirfd,
1073
+ const char * path,
1074
+ char * buf,
1075
+ size_t bufsize) {
1069
1076
// TODO: Handle empty paths.
1070
1077
auto parsed = path::parseFile (path, dirfd, path::NoFollowLinks);
1071
1078
if (auto err = parsed.getError ()) {
@@ -1123,7 +1130,7 @@ int __syscall_utimensat(int dirfd,
1123
1130
}
1124
1131
1125
1132
// TODO: Test this with non-AT_FDCWD values.
1126
- int __syscall_fchmodat (int dirfd, const char * path, mode_t mode, ...) {
1133
+ int __syscall_fchmodat (int dirfd, const char * path, mode_t mode, ...) {
1127
1134
int flags = 0 ;
1128
1135
va_list v1;
1129
1136
va_start (v1, mode);
@@ -1317,7 +1324,7 @@ int __syscall_pipe(int fd[2]) {
1317
1324
return 0 ;
1318
1325
}
1319
1326
1320
- int __syscall_poll (struct pollfd * fds, nfds_t nfds, int timeout) {
1327
+ int __syscall_poll (struct pollfd * fds, nfds_t nfds, int timeout) {
1321
1328
auto fileTable = wasmFS.getFileTable ().locked ();
1322
1329
1323
1330
// Process the list of FDs and compute their revents masks. Count the number
@@ -1499,7 +1506,8 @@ int __syscall_fcntl64(int fd, int cmd, ...) {
1499
1506
}
1500
1507
}
1501
1508
1502
- static int doStatFS (std::shared_ptr<File>& file, size_t size, struct statfs * buf) {
1509
+ static int
1510
+ doStatFS (std::shared_ptr<File>& file, size_t size, struct statfs * buf) {
1503
1511
if (size != sizeof (struct statfs )) {
1504
1512
// We only know how to write to a standard statfs, not even a truncated one.
1505
1513
return -EINVAL;
@@ -1629,7 +1637,7 @@ int _mmap_js(size_t length,
1629
1637
}
1630
1638
1631
1639
int _msync_js (
1632
- void * addr, size_t length, int prot, int flags, int fd, size_t offset) {
1640
+ void * addr, size_t length, int prot, int flags, int fd, size_t offset) {
1633
1641
// TODO: This is not correct! Mappings should be associated with files, not
1634
1642
// fds. Only need to sync if shared and writes are allowed.
1635
1643
int mapType = flags & MAP_TYPE;
@@ -1645,7 +1653,7 @@ int _msync_js(
1645
1653
}
1646
1654
1647
1655
int _munmap_js (
1648
- void * addr, size_t length, int prot, int flags, int fd, size_t offset) {
1656
+ void * addr, size_t length, int prot, int flags, int fd, size_t offset) {
1649
1657
// TODO: This is not correct! Mappings should be associated with files, not
1650
1658
// fds.
1651
1659
// TODO: Syncing should probably be handled in __syscall_munmap instead.
@@ -1654,58 +1662,34 @@ int _munmap_js(
1654
1662
1655
1663
// Stubs (at least for now)
1656
1664
1657
- int __syscall_accept4 (int sockfd,
1658
- void * addr,
1659
- socklen_t * len,
1660
- int flags,
1661
- ...) {
1665
+ int __syscall_accept4 (int sockfd, void * addr, socklen_t * len, int flags, ...) {
1662
1666
return -ENOSYS;
1663
1667
}
1664
1668
1665
- int __syscall_bind (int sockfd,
1666
- const void * addr,
1667
- socklen_t len,
1668
- ...) {
1669
+ int __syscall_bind (int sockfd, const void * addr, socklen_t len, ...) {
1669
1670
return -ENOSYS;
1670
1671
}
1671
1672
1672
- int __syscall_connect (int sockfd,
1673
- const void * addr,
1674
- socklen_t len,
1675
- ...) {
1673
+ int __syscall_connect (int sockfd, const void * addr, socklen_t len, ...) {
1676
1674
return -ENOSYS;
1677
1675
}
1678
1676
1679
- int __syscall_socket (
1680
- int domain, int type, int protocol, ...) {
1677
+ int __syscall_socket (int domain, int type, int protocol, ...) {
1681
1678
return -ENOSYS;
1682
1679
}
1683
1680
1684
- int __syscall_listen (
1685
- int sockfd, int backlog, ...) {
1686
- return -ENOSYS;
1687
- }
1681
+ int __syscall_listen (int sockfd, int backlog, ...) { return -ENOSYS; }
1688
1682
1689
- int __syscall_getsockopt (int sockfd,
1690
- int level,
1691
- int optname,
1692
- void * optval,
1693
- socklen_t * optlen,
1694
- ...) {
1683
+ int __syscall_getsockopt (
1684
+ int sockfd, int level, int optname, void * optval, socklen_t * optlen, ...) {
1695
1685
return -ENOSYS;
1696
1686
}
1697
1687
1698
- int __syscall_getsockname (int sockfd,
1699
- void * addr,
1700
- socklen_t * len,
1701
- ...) {
1688
+ int __syscall_getsockname (int sockfd, void * addr, socklen_t * len, ...) {
1702
1689
return -ENOSYS;
1703
1690
}
1704
1691
1705
- int __syscall_getpeername (int sockfd,
1706
- void * addr,
1707
- socklen_t * len,
1708
- ...) {
1692
+ int __syscall_getpeername (int sockfd, void * addr, socklen_t * len, ...) {
1709
1693
return -ENOSYS;
1710
1694
}
1711
1695
@@ -1718,17 +1702,12 @@ ssize_t __syscall_sendto(int sockfd,
1718
1702
return -ENOSYS;
1719
1703
}
1720
1704
1721
- ssize_t
1722
- __syscall_sendmsg (int sockfd, const void * msg, int flags, ...) {
1705
+ ssize_t __syscall_sendmsg (int sockfd, const void * msg, int flags, ...) {
1723
1706
return -ENOSYS;
1724
1707
}
1725
1708
1726
- ssize_t __syscall_recvfrom (int sockfd,
1727
- void * buf,
1728
- size_t len,
1729
- int flags,
1730
- void * addr,
1731
- socklen_t * alen) {
1709
+ ssize_t __syscall_recvfrom (
1710
+ int sockfd, void * buf, size_t len, int flags, void * addr, socklen_t * alen) {
1732
1711
return -ENOSYS;
1733
1712
}
1734
1713
0 commit comments