Update to the latest WASI snapshot1 and release 0.10.3 (WebAssembly#62)

* Update to the latest WASI snapshot1 definition

This pulls in `sock_accept()` and some minor documentation updates.

Signed-off-by: Nathaniel McCallum <nathaniel@profian.com>

* Bump to 0.10.3

Signed-off-by: Nathaniel McCallum <nathaniel@profian.com>

Author: npmccallum

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wasi"
-version = "0.10.2+wasi-snapshot-preview1"
+version = "0.10.3+wasi-snapshot-preview1"
 authors = ["The Cranelift Project Developers"]
 license = "Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT"
 description = "Experimental WASI API bindings for Rust"

crates/witx-bindgen/WASI

@@ -482,6 +482,8 @@ pub const RIGHTS_PATH_UNLINK_FILE: Rights = 1 << 26;
 pub const RIGHTS_POLL_FD_READWRITE: Rights = 1 << 27;
 /// The right to invoke `sock_shutdown`.
 pub const RIGHTS_SOCK_SHUTDOWN: Rights = 1 << 28;
+/// The right to invoke `sock_accept`.
+pub const RIGHTS_SOCK_ACCEPT: Rights = 1 << 29;
 
 pub type Fd = u32;
 #[repr(C)]
@@ -1204,7 +1206,8 @@ pub struct Prestat {
 }
 
 /// Read command-line argument data.
-/// The size of the array should match that returned by `args_sizes_get`
+/// The size of the array should match that returned by `args_sizes_get`.
+/// Each argument is expected to be `\0` terminated.
 pub unsafe fn args_get(argv: *mut *mut u8, argv_buf: *mut u8) -> Result<(), Errno> {
     let ret = wasi_snapshot_preview1::args_get(argv as i32, argv_buf as i32);
     match ret {
@@ -1235,6 +1238,7 @@ pub unsafe fn args_sizes_get() -> Result<(Size, Size), Errno> {
 
 /// Read environment variable data.
 /// The sizes of the buffers should match that returned by `environ_sizes_get`.
+/// Key/value pairs are expected to be joined with `=`s, and terminated with `\0`s.
 pub unsafe fn environ_get(environ: *mut *mut u8, environ_buf: *mut u8) -> Result<(), Errno> {
     let ret = wasi_snapshot_preview1::environ_get(environ as i32, environ_buf as i32);
     match ret {
@@ -2057,6 +2061,26 @@ pub unsafe fn random_get(buf: *mut u8, buf_len: Size) -> Result<(), Errno> {
     }
 }
 
+/// Accept a new incoming connection.
+/// Note: This is similar to `accept` in POSIX.
+///
+/// ## Parameters
+///
+/// * `fd` - The listening socket.
+/// * `flags` - The desired values of the file descriptor flags.
+///
+/// ## Return
+///
+/// New socket connection
+pub unsafe fn sock_accept(fd: Fd, flags: Fdflags) -> Result<Fd, Errno> {
+    let mut rp0 = MaybeUninit::<Fd>::uninit();
+    let ret = wasi_snapshot_preview1::sock_accept(fd as i32, flags as i32, rp0.as_mut_ptr() as i32);
+    match ret {
+        0 => Ok(core::ptr::read(rp0.as_mut_ptr() as i32 as *const Fd)),
+        _ => Err(Errno(ret as u16)),
+    }
+}
+
 /// Receive a message from a socket.
 /// Note: This is similar to `recv` in POSIX, though it also supports reading
 /// the data into multiple buffers in the manner of `readv`.
@@ -2142,12 +2166,14 @@ pub mod wasi_snapshot_preview1 {
     #[link(wasm_import_module = "wasi_snapshot_preview1")]
     extern "C" {
         /// Read command-line argument data.
-        /// The size of the array should match that returned by `args_sizes_get`
+        /// The size of the array should match that returned by `args_sizes_get`.
+        /// Each argument is expected to be `\0` terminated.
         pub fn args_get(arg0: i32, arg1: i32) -> i32;
         /// Return command-line argument data sizes.
         pub fn args_sizes_get(arg0: i32, arg1: i32) -> i32;
         /// Read environment variable data.
         /// The sizes of the buffers should match that returned by `environ_sizes_get`.
+        /// Key/value pairs are expected to be joined with `=`s, and terminated with `\0`s.
         pub fn environ_get(arg0: i32, arg1: i32) -> i32;
         /// Return environment variable data sizes.
         pub fn environ_sizes_get(arg0: i32, arg1: i32) -> i32;
@@ -2322,6 +2348,9 @@ pub mod wasi_snapshot_preview1 {
         /// required, it's advisable to use this function to seed a pseudo-random
         /// number generator, rather than to provide the random data directly.
         pub fn random_get(arg0: i32, arg1: i32) -> i32;
+        /// Accept a new incoming connection.
+        /// Note: This is similar to `accept` in POSIX.
+        pub fn sock_accept(arg0: i32, arg1: i32, arg2: i32) -> i32;
         /// Receive a message from a socket.
         /// Note: This is similar to `recv` in POSIX, though it also supports reading
         /// the data into multiple buffers in the manner of `readv`.