feat(sys): add ngx_array_t::as_slice method

Author: bavshin-f5

examples/async.rs

@@ -1,6 +1,5 @@
 use std::ffi::{c_char, c_void};
 use std::ptr::{addr_of, addr_of_mut};
-use std::slice;
 use std::sync::atomic::{AtomicBool, AtomicPtr, Ordering};
 use std::sync::{Arc, OnceLock};
 use std::time::Instant;
@@ -205,7 +204,7 @@ extern "C" fn ngx_http_async_commands_set_enable(
 ) -> *mut c_char {
     unsafe {
         let conf = &mut *(conf as *mut ModuleConfig);
-        let args = slice::from_raw_parts((*(*cf).args).elts as *mut ngx_str_t, (*(*cf).args).nelts);
+        let args: &[ngx_str_t] = (*(*cf).args).as_slice();
         let val = args[1].to_str();
 
         // set default value optionally

examples/awssig.rs

@@ -175,8 +175,8 @@ extern "C" fn ngx_http_awssigv4_commands_set_enable(
 ) -> *mut c_char {
     unsafe {
         let conf = &mut *(conf as *mut ModuleConfig);
-        let args = (*(*cf).args).elts as *mut ngx_str_t;
-        let val = (*args.add(1)).to_str();
+        let args: &[ngx_str_t] = (*(*cf).args).as_slice();
+        let val = args[1].to_str();
 
         // set default value optionally
         conf.enable = false;
@@ -198,8 +198,8 @@ extern "C" fn ngx_http_awssigv4_commands_set_access_key(
 ) -> *mut c_char {
     unsafe {
         let conf = &mut *(conf as *mut ModuleConfig);
-        let args = (*(*cf).args).elts as *mut ngx_str_t;
-        conf.access_key = (*args.add(1)).to_string();
+        let args: &[ngx_str_t] = (*(*cf).args).as_slice();
+        conf.access_key = args[1].to_string();
     };
 
     ngx::core::NGX_CONF_OK
@@ -212,8 +212,8 @@ extern "C" fn ngx_http_awssigv4_commands_set_secret_key(
 ) -> *mut c_char {
     unsafe {
         let conf = &mut *(conf as *mut ModuleConfig);
-        let args = (*(*cf).args).elts as *mut ngx_str_t;
-        conf.secret_key = (*args.add(1)).to_string();
+        let args: &[ngx_str_t] = (*(*cf).args).as_slice();
+        conf.secret_key = args[1].to_string();
     };
 
     ngx::core::NGX_CONF_OK
@@ -226,8 +226,8 @@ extern "C" fn ngx_http_awssigv4_commands_set_s3_bucket(
 ) -> *mut c_char {
     unsafe {
         let conf = &mut *(conf as *mut ModuleConfig);
-        let args = (*(*cf).args).elts as *mut ngx_str_t;
-        conf.s3_bucket = (*args.add(1)).to_string();
+        let args: &[ngx_str_t] = (*(*cf).args).as_slice();
+        conf.s3_bucket = args[1].to_string();
         if conf.s3_bucket.len() == 1 {
             println!("Validation failed");
             return ngx::core::NGX_CONF_ERROR;

examples/curl.rs

@@ -117,9 +117,9 @@ extern "C" fn ngx_http_curl_commands_set_enable(
 ) -> *mut c_char {
     unsafe {
         let conf = &mut *(conf as *mut ModuleConfig);
-        let args = (*(*cf).args).elts as *mut ngx_str_t;
+        let args: &[ngx_str_t] = (*(*cf).args).as_slice();
 
-        let val = (*args.add(1)).to_str();
+        let val = args[1].to_str();
 
         // set default value optionally
         conf.enable = false;

examples/shared_dict.rs

@@ -1,6 +1,6 @@
 #![no_std]
 use ::core::ffi::{c_char, c_void};
-use ::core::{mem, ptr, slice};
+use ::core::{mem, ptr};
 
 use nginx_sys::{
     ngx_command_t, ngx_conf_t, ngx_http_add_variable, ngx_http_compile_complex_value_t,
@@ -127,8 +127,7 @@ extern "C" fn ngx_http_shared_dict_add_zone(
     // - `cf.args` is guaranteed to be a pointer to an array with 3 elements (NGX_CONF_TAKE2).
     // - The pointers are well-aligned by construction method (`ngx_palloc`).
     debug_assert!(!cf.args.is_null() && unsafe { (*cf.args).nelts >= 3 });
-    let args =
-        unsafe { slice::from_raw_parts_mut((*cf.args).elts as *mut ngx_str_t, (*cf.args).nelts) };
+    let args = unsafe { (*cf.args).as_slice_mut() };
 
     let name: ngx_str_t = args[1];
     let size = unsafe { ngx_parse_size(&mut args[2]) };
@@ -210,8 +209,7 @@ extern "C" fn ngx_http_shared_dict_add_variable(
     // - `cf.args` is guaranteed to be a pointer to an array with 3 elements (NGX_CONF_TAKE2).
     // - The pointers are well-aligned by construction method (`ngx_palloc`).
     debug_assert!(!cf.args.is_null() && unsafe { (*cf.args).nelts >= 3 });
-    let args =
-        unsafe { slice::from_raw_parts_mut((*cf.args).elts as *mut ngx_str_t, (*cf.args).nelts) };
+    let args = unsafe { (*cf.args).as_slice_mut() };
 
     let mut ccv: ngx_http_compile_complex_value_t = unsafe { mem::zeroed() };
     ccv.cf = cf;

examples/upstream.rs

@@ -8,7 +8,6 @@
  */
 use std::ffi::{c_char, c_void};
 use std::mem;
-use std::slice;
 
 use ngx::core::{Pool, Status};
 use ngx::ffi::{
@@ -267,19 +266,18 @@ unsafe extern "C" fn ngx_http_upstream_commands_set_custom(
     // SAFETY: this function is called with non-NULL cf always
     let cf = &mut *cf;
     ngx_log_debug_mask!(DebugMask::Http, cf.log, "CUSTOM UPSTREAM module init");
+    let args: &[ngx_str_t] = (*cf.args).as_slice();
 
     let ccf = &mut (*(conf as *mut SrvConfig));
 
-    if (*cf.args).nelts == 2 {
-        let value: &[ngx_str_t] =
-            slice::from_raw_parts((*cf.args).elts as *const ngx_str_t, (*cf.args).nelts);
-        let n = ngx_atoi(value[1].data, value[1].len);
+    if let Some(value) = args.get(1) {
+        let n = ngx_atoi(value.data, value.len);
         if n == (NGX_ERROR as isize) || n == 0 {
             ngx_conf_log_error!(
                 NGX_LOG_EMERG,
                 cf,
                 "invalid value \"{}\" in \"{}\" directive",
-                value[1],
+                value,
                 &(*cmd).name
             );
             return ngx::core::NGX_CONF_ERROR;

nginx-sys/src/lib.rs

@@ -46,6 +46,50 @@ pub const NGX_ALIGNMENT: usize = NGX_RS_ALIGNMENT;
 // requirements.
 const _: () = assert!(core::mem::align_of::<ngx_str_t>() <= NGX_ALIGNMENT);
 
+impl ngx_array_t {
+    /// Returns the contents of this array as a slice of `T`.
+    ///
+    /// # Safety
+    ///
+    /// The array must be a valid, initialized array containing elements of type T or compatible in
+    /// layout with T (e.g. `#[repr(transparent)]` wrappers).
+    pub unsafe fn as_slice<T>(&self) -> &[T] {
+        debug_assert_eq!(
+            core::mem::size_of::<T>(),
+            self.size,
+            "ngx_array_t::as_slice(): element size mismatch"
+        );
+        if self.nelts == 0 {
+            &[]
+        } else {
+            // SAFETY: in a valid array, `elts` is a valid well-aligned pointer to at least `nelts`
+            // elements of size `size`
+            core::slice::from_raw_parts(self.elts.cast(), self.nelts)
+        }
+    }
+
+    /// Returns the contents of this array as a mutable slice of `T`.
+    ///
+    /// # Safety
+    ///
+    /// The array must be a valid, initialized array containing elements of type T or compatible in
+    /// layout with T (e.g. `#[repr(transparent)]` wrappers).
+    pub unsafe fn as_slice_mut<T>(&mut self) -> &mut [T] {
+        debug_assert_eq!(
+            core::mem::size_of::<T>(),
+            self.size,
+            "ngx_array_t::as_slice_mut(): element size mismatch"
+        );
+        if self.nelts == 0 {
+            &mut []
+        } else {
+            // SAFETY: in a valid array, `elts` is a valid well-aligned pointer to at least `nelts`
+            // elements of size `size`
+            core::slice::from_raw_parts_mut(self.elts.cast(), self.nelts)
+        }
+    }
+}
+
 impl ngx_command_t {
     /// Creates a new empty [`ngx_command_t`] instance.
     ///