Use std::ffi instead of libc in generated PAM bindings

Author: bjorn3

Makefile

@@ -1,6 +1,6 @@
 PAM_SRC_DIR = src/pam
 
-BINDGEN_CMD = bindgen --allowlist-function '^pam_.*$$' --allowlist-var '^PAM_.*$$' --opaque-type pam_handle_t --blocklist-function pam_vsyslog --blocklist-function pam_vprompt --blocklist-function pam_vinfo --blocklist-function pam_verror --blocklist-type '.*va_list.*' --ctypes-prefix libc --no-layout-tests --sort-semantically
+BINDGEN_CMD = bindgen --allowlist-function '^pam_.*$$' --allowlist-var '^PAM_.*$$' --opaque-type pam_handle_t --blocklist-function pam_vsyslog --blocklist-function pam_vprompt --blocklist-function pam_vinfo --blocklist-function pam_verror --blocklist-type '.*va_list.*' --ctypes-prefix std::ffi --no-layout-tests --sort-semantically
 
 PAM_VARIANT = $$(./get-pam-variant.bash)
 

src/pam/sys_linuxpam.rs

@@ -4,27 +4,27 @@ pub type pam_handle_t = u8;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct pam_message {
-    pub msg_style: libc::c_int,
-    pub msg: *const libc::c_char,
+    pub msg_style: std::ffi::c_int,
+    pub msg: *const std::ffi::c_char,
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct pam_response {
-    pub resp: *mut libc::c_char,
-    pub resp_retcode: libc::c_int,
+    pub resp: *mut std::ffi::c_char,
+    pub resp_retcode: std::ffi::c_int,
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct pam_conv {
     pub conv: ::std::option::Option<
         unsafe extern "C" fn(
-            num_msg: libc::c_int,
+            num_msg: std::ffi::c_int,
             msg: *mut *const pam_message,
             resp: *mut *mut pam_response,
-            appdata_ptr: *mut libc::c_void,
-        ) -> libc::c_int,
+            appdata_ptr: *mut std::ffi::c_void,
+        ) -> std::ffi::c_int,
     >,
-    pub appdata_ptr: *mut libc::c_void,
+    pub appdata_ptr: *mut std::ffi::c_void,
 }
 pub const PAM_SUCCESS: u32 = 0;
 pub const PAM_OPEN_ERR: u32 = 1;
@@ -72,49 +72,52 @@ pub const PAM_MAX_RESP_SIZE: u32 = 512;
 extern "C" {
     pub fn pam_set_item(
         pamh: *mut pam_handle_t,
-        item_type: libc::c_int,
-        item: *const libc::c_void,
-    ) -> libc::c_int;
+        item_type: std::ffi::c_int,
+        item: *const std::ffi::c_void,
+    ) -> std::ffi::c_int;
 }
 extern "C" {
     pub fn pam_get_item(
         pamh: *const pam_handle_t,
-        item_type: libc::c_int,
-        item: *mut *const libc::c_void,
-    ) -> libc::c_int;
+        item_type: std::ffi::c_int,
+        item: *mut *const std::ffi::c_void,
+    ) -> std::ffi::c_int;
 }
 extern "C" {
-    pub fn pam_strerror(pamh: *mut pam_handle_t, errnum: libc::c_int) -> *const libc::c_char;
+    pub fn pam_strerror(
+        pamh: *mut pam_handle_t,
+        errnum: std::ffi::c_int,
+    ) -> *const std::ffi::c_char;
 }
 extern "C" {
-    pub fn pam_getenvlist(pamh: *mut pam_handle_t) -> *mut *mut libc::c_char;
+    pub fn pam_getenvlist(pamh: *mut pam_handle_t) -> *mut *mut std::ffi::c_char;
 }
 extern "C" {
     pub fn pam_start(
-        service_name: *const libc::c_char,
-        user: *const libc::c_char,
+        service_name: *const std::ffi::c_char,
+        user: *const std::ffi::c_char,
         pam_conversation: *const pam_conv,
         pamh: *mut *mut pam_handle_t,
-    ) -> libc::c_int;
+    ) -> std::ffi::c_int;
 }
 extern "C" {
-    pub fn pam_end(pamh: *mut pam_handle_t, pam_status: libc::c_int) -> libc::c_int;
+    pub fn pam_end(pamh: *mut pam_handle_t, pam_status: std::ffi::c_int) -> std::ffi::c_int;
 }
 extern "C" {
-    pub fn pam_authenticate(pamh: *mut pam_handle_t, flags: libc::c_int) -> libc::c_int;
+    pub fn pam_authenticate(pamh: *mut pam_handle_t, flags: std::ffi::c_int) -> std::ffi::c_int;
 }
 extern "C" {
-    pub fn pam_setcred(pamh: *mut pam_handle_t, flags: libc::c_int) -> libc::c_int;
+    pub fn pam_setcred(pamh: *mut pam_handle_t, flags: std::ffi::c_int) -> std::ffi::c_int;
 }
 extern "C" {
-    pub fn pam_acct_mgmt(pamh: *mut pam_handle_t, flags: libc::c_int) -> libc::c_int;
+    pub fn pam_acct_mgmt(pamh: *mut pam_handle_t, flags: std::ffi::c_int) -> std::ffi::c_int;
 }
 extern "C" {
-    pub fn pam_open_session(pamh: *mut pam_handle_t, flags: libc::c_int) -> libc::c_int;
+    pub fn pam_open_session(pamh: *mut pam_handle_t, flags: std::ffi::c_int) -> std::ffi::c_int;
 }
 extern "C" {
-    pub fn pam_close_session(pamh: *mut pam_handle_t, flags: libc::c_int) -> libc::c_int;
+    pub fn pam_close_session(pamh: *mut pam_handle_t, flags: std::ffi::c_int) -> std::ffi::c_int;
 }
 extern "C" {
-    pub fn pam_chauthtok(pamh: *mut pam_handle_t, flags: libc::c_int) -> libc::c_int;
+    pub fn pam_chauthtok(pamh: *mut pam_handle_t, flags: std::ffi::c_int) -> std::ffi::c_int;
 }

src/pam/sys_openpam.rs

@@ -1,34 +1,34 @@
 /* automatically generated by rust-bindgen 0.70.1, minified by cargo-minify */
 
 pub type pam_handle_t = u8;
-pub type _bindgen_ty_1 = libc::c_uint;
-pub type _bindgen_ty_2 = libc::c_uint;
-pub type _bindgen_ty_3 = libc::c_int;
-pub type _bindgen_ty_4 = libc::c_uint;
+pub type _bindgen_ty_1 = std::ffi::c_uint;
+pub type _bindgen_ty_2 = std::ffi::c_uint;
+pub type _bindgen_ty_3 = std::ffi::c_int;
+pub type _bindgen_ty_4 = std::ffi::c_uint;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct pam_message {
-    pub msg_style: libc::c_int,
-    pub msg: *mut libc::c_char,
+    pub msg_style: std::ffi::c_int,
+    pub msg: *mut std::ffi::c_char,
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct pam_response {
-    pub resp: *mut libc::c_char,
-    pub resp_retcode: libc::c_int,
+    pub resp: *mut std::ffi::c_char,
+    pub resp_retcode: std::ffi::c_int,
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct pam_conv {
     pub conv: ::std::option::Option<
         unsafe extern "C" fn(
-            arg1: libc::c_int,
+            arg1: std::ffi::c_int,
             arg2: *mut *const pam_message,
             arg3: *mut *mut pam_response,
-            arg4: *mut libc::c_void,
-        ) -> libc::c_int,
+            arg4: *mut std::ffi::c_void,
+        ) -> std::ffi::c_int,
     >,
-    pub appdata_ptr: *mut libc::c_void,
+    pub appdata_ptr: *mut std::ffi::c_void,
 }
 pub const PAM_SUCCESS: _bindgen_ty_1 = 0;
 pub const PAM_OPEN_ERR: _bindgen_ty_1 = 1;
@@ -73,54 +73,54 @@ pub const PAM_USER: _bindgen_ty_4 = 2;
 pub const PAM_TTY: _bindgen_ty_4 = 3;
 pub const PAM_RUSER: _bindgen_ty_4 = 8;
 extern "C" {
-    pub fn pam_acct_mgmt(_pamh: *mut pam_handle_t, _flags: libc::c_int) -> libc::c_int;
+    pub fn pam_acct_mgmt(_pamh: *mut pam_handle_t, _flags: std::ffi::c_int) -> std::ffi::c_int;
 }
 extern "C" {
-    pub fn pam_authenticate(_pamh: *mut pam_handle_t, _flags: libc::c_int) -> libc::c_int;
+    pub fn pam_authenticate(_pamh: *mut pam_handle_t, _flags: std::ffi::c_int) -> std::ffi::c_int;
 }
 extern "C" {
-    pub fn pam_chauthtok(_pamh: *mut pam_handle_t, _flags: libc::c_int) -> libc::c_int;
+    pub fn pam_chauthtok(_pamh: *mut pam_handle_t, _flags: std::ffi::c_int) -> std::ffi::c_int;
 }
 extern "C" {
-    pub fn pam_close_session(_pamh: *mut pam_handle_t, _flags: libc::c_int) -> libc::c_int;
+    pub fn pam_close_session(_pamh: *mut pam_handle_t, _flags: std::ffi::c_int) -> std::ffi::c_int;
 }
 extern "C" {
-    pub fn pam_end(_pamh: *mut pam_handle_t, _status: libc::c_int) -> libc::c_int;
+    pub fn pam_end(_pamh: *mut pam_handle_t, _status: std::ffi::c_int) -> std::ffi::c_int;
 }
 extern "C" {
     pub fn pam_get_item(
         _pamh: *const pam_handle_t,
-        _item_type: libc::c_int,
-        _item: *mut *const libc::c_void,
-    ) -> libc::c_int;
+        _item_type: std::ffi::c_int,
+        _item: *mut *const std::ffi::c_void,
+    ) -> std::ffi::c_int;
 }
 extern "C" {
-    pub fn pam_getenvlist(_pamh: *mut pam_handle_t) -> *mut *mut libc::c_char;
+    pub fn pam_getenvlist(_pamh: *mut pam_handle_t) -> *mut *mut std::ffi::c_char;
 }
 extern "C" {
-    pub fn pam_open_session(_pamh: *mut pam_handle_t, _flags: libc::c_int) -> libc::c_int;
+    pub fn pam_open_session(_pamh: *mut pam_handle_t, _flags: std::ffi::c_int) -> std::ffi::c_int;
 }
 extern "C" {
     pub fn pam_set_item(
         _pamh: *mut pam_handle_t,
-        _item_type: libc::c_int,
-        _item: *const libc::c_void,
-    ) -> libc::c_int;
+        _item_type: std::ffi::c_int,
+        _item: *const std::ffi::c_void,
+    ) -> std::ffi::c_int;
 }
 extern "C" {
-    pub fn pam_setcred(_pamh: *mut pam_handle_t, _flags: libc::c_int) -> libc::c_int;
+    pub fn pam_setcred(_pamh: *mut pam_handle_t, _flags: std::ffi::c_int) -> std::ffi::c_int;
 }
 extern "C" {
     pub fn pam_start(
-        _service: *const libc::c_char,
-        _user: *const libc::c_char,
+        _service: *const std::ffi::c_char,
+        _user: *const std::ffi::c_char,
         _pam_conv: *const pam_conv,
         _pamh: *mut *mut pam_handle_t,
-    ) -> libc::c_int;
+    ) -> std::ffi::c_int;
 }
 extern "C" {
     pub fn pam_strerror(
         _pamh: *const pam_handle_t,
-        _error_number: libc::c_int,
-    ) -> *const libc::c_char;
+        _error_number: std::ffi::c_int,
+    ) -> *const std::ffi::c_char;
 }