Update: Add f_id_t, f_uid_t, and f_gid_t type helpers for uid_t and gid_t.

The `uid_t` and `gid_t` don't readily map to each other.

I would love to simplify the code and have a single function call in several cases when using both `uid_t` and `gid_t`.

This provides interchangeable types `f_id_t`, `f_uid_t`, and `f_gid_t`.
The standard behavior is that `f_uid_t` and `f_gid_t` are both sub-types of `f_id_t`.
The `f_id_t` is by default an unsigned 32-bit integer.

diff --git a/build/stand_alone/byte_dump.config.h b/build/stand_alone/byte_dump.config.h
index eca41c0d799a20d9ebc0b788ac2ce7a746d7a40c..8ad648b8739fcda2682b8a361d64dd874d637be9 100644 (file)
--- a/build/stand_alone/byte_dump.config.h
+++ b/build/stand_alone/byte_dump.config.h
@@ -405,6 +405,16 @@
 #define _di_f_fll_idss_delete_callback_
 #define _di_f_fll_idss_destroy_callback_
 #define _di_f_fll_idss_t_
+#define _di_f_gid_t_
+#define _di_f_gids_t_
+#define _di_f_gidss_delete_callback_
+#define _di_f_gidss_destroy_callback_
+#define _di_f_gidss_t_
+#define _di_f_id_t_
+#define _di_f_ids_t_
+#define _di_f_idss_delete_callback_
+#define _di_f_idss_destroy_callback_
+#define _di_f_idss_t_
 //#define _di_f_int128_t_
 //#define _di_f_int128s_t_
 #define _di_f_int128ss_delete_callback_
@@ -1229,6 +1239,11 @@
 //#define _di_f_type_file_flag_d_
 //#define _di_f_type_number_64_t_
 //#define _di_f_type_sizes_d_
+#define _di_f_uid_t_
+#define _di_f_uids_t_
+#define _di_f_uidss_delete_callback_
+#define _di_f_uidss_destroy_callback_
+#define _di_f_uidss_t_
 //#define _di_f_uint128_t_
 #define _di_f_uint128s_t_
 #define _di_f_uint128ss_delete_callback_

diff --git a/build/stand_alone/example.config.h b/build/stand_alone/example.config.h
index 4b5a71e565a45ea61f897e6e091d123d51ba6faa..9c9bca5f70679ccd32a0b5e60076eb47e623ccfd 100644 (file)
--- a/build/stand_alone/example.config.h
+++ b/build/stand_alone/example.config.h
@@ -356,6 +356,16 @@
 #define _di_f_fll_idss_delete_callback_
 #define _di_f_fll_idss_destroy_callback_
 #define _di_f_fll_idss_t_
+#define _di_f_gid_t_
+#define _di_f_gids_t_
+#define _di_f_gidss_delete_callback_
+#define _di_f_gidss_destroy_callback_
+#define _di_f_gidss_t_
+#define _di_f_id_t_
+#define _di_f_ids_t_
+#define _di_f_idss_delete_callback_
+#define _di_f_idss_destroy_callback_
+#define _di_f_idss_t_
 //#define _di_f_int128_t_
 //#define _di_f_int128s_t_
 #define _di_f_int128ss_delete_callback_
@@ -1194,6 +1204,11 @@
 //#define _di_f_type_file_flag_d_
 //#define _di_f_type_number_64_t_
 //#define _di_f_type_sizes_d_
+#define _di_f_uid_t_
+#define _di_f_uids_t_
+#define _di_f_uidss_delete_callback_
+#define _di_f_uidss_destroy_callback_
+#define _di_f_uidss_t_
 //#define _di_f_uint128_t_
 #define _di_f_uint128s_t_
 #define _di_f_uint128ss_delete_callback_

diff --git a/build/stand_alone/fake.config.h b/build/stand_alone/fake.config.h
index d7cdced36871aaa3fbc996608a08e1b51168ae81..56ec4a34f099719fb33c754937d3b9a7f51266f3 100644 (file)
--- a/build/stand_alone/fake.config.h
+++ b/build/stand_alone/fake.config.h
@@ -552,6 +552,16 @@
 #define _di_f_fll_idss_delete_callback_
 #define _di_f_fll_idss_destroy_callback_
 #define _di_f_fll_idss_t_
+//#define _di_f_gid_t_
+#define _di_f_gids_t_
+#define _di_f_gidss_delete_callback_
+#define _di_f_gidss_destroy_callback_
+#define _di_f_gidss_t_
+//#define _di_f_id_t_
+#define _di_f_ids_t_
+#define _di_f_idss_delete_callback_
+#define _di_f_idss_destroy_callback_
+#define _di_f_idss_t_
 //#define _di_f_fss_apply_delimit_
 #define _di_f_fss_apply_delimit_range_
 //#define _di_f_fss_complete_e_
@@ -1661,6 +1671,11 @@
 //#define _di_f_type_file_flag_d_
 //#define _di_f_type_number_64_t_
 //#define _di_f_type_sizes_d_
+//#define _di_f_uid_t_
+#define _di_f_uids_t_
+#define _di_f_uidss_delete_callback_
+#define _di_f_uidss_destroy_callback_
+#define _di_f_uidss_t_
 //#define _di_f_uint128_t_
 #define _di_f_uint128s_t_
 #define _di_f_uint128ss_delete_callback_

diff --git a/build/stand_alone/firewall.config.h b/build/stand_alone/firewall.config.h
index 4920bf3f1c15c89b383a7202d5edcc9b54d797ac..1b32b4f9b6bbad2b955e769a5de5f26d6994445d 100644 (file)
--- a/build/stand_alone/firewall.config.h
+++ b/build/stand_alone/firewall.config.h
@@ -553,6 +553,16 @@
 #define _di_f_fll_idss_delete_callback_
 #define _di_f_fll_idss_destroy_callback_
 #define _di_f_fll_idss_t_
+//#define _di_f_gid_t_
+#define _di_f_gids_t_
+#define _di_f_gidss_delete_callback_
+#define _di_f_gidss_destroy_callback_
+#define _di_f_gidss_t_
+//#define _di_f_id_t_
+#define _di_f_ids_t_
+#define _di_f_idss_delete_callback_
+#define _di_f_idss_destroy_callback_
+#define _di_f_idss_t_
 //#define _di_f_fss_apply_delimit_
 #define _di_f_fss_apply_delimit_range_
 //#define _di_f_fss_complete_e_
@@ -1724,6 +1734,11 @@
 //#define _di_f_type_file_flag_d_
 //#define _di_f_type_number_64_t_
 //#define _di_f_type_sizes_d_
+//#define _di_f_uid_t_
+#define _di_f_uids_t_
+#define _di_f_uidss_delete_callback_
+#define _di_f_uidss_destroy_callback_
+#define _di_f_uidss_t_
 //#define _di_f_uint128_t_
 #define _di_f_uint128s_t_
 #define _di_f_uint128ss_delete_callback_

diff --git a/build/stand_alone/utf8.config.h b/build/stand_alone/utf8.config.h
index 7b9ffe559cc817422c328ef756731cd07ff38d73..9621de3639baa1b387d8e2467dcf36d9605a9dd2 100644 (file)
--- a/build/stand_alone/utf8.config.h
+++ b/build/stand_alone/utf8.config.h
@@ -405,6 +405,16 @@
 #define _di_f_fll_idss_delete_callback_
 #define _di_f_fll_idss_destroy_callback_
 #define _di_f_fll_idss_t_
+#define _di_f_gid_t_
+#define _di_f_gids_t_
+#define _di_f_gidss_delete_callback_
+#define _di_f_gidss_destroy_callback_
+#define _di_f_gidss_t_
+#define _di_f_id_t_
+#define _di_f_ids_t_
+#define _di_f_idss_delete_callback_
+#define _di_f_idss_destroy_callback_
+#define _di_f_idss_t_
 //#define _di_f_int128_t_
 //#define _di_f_int128s_t_
 #define _di_f_int128ss_delete_callback_
@@ -1247,6 +1257,11 @@
 //#define _di_f_type_file_flag_d_
 //#define _di_f_type_number_64_t_
 //#define _di_f_type_sizes_d_
+#define _di_f_uid_t_
+#define _di_f_uids_t_
+#define _di_f_uidss_delete_callback_
+#define _di_f_uidss_destroy_callback_
+#define _di_f_uidss_t_
 //#define _di_f_uint128_t_
 #define _di_f_uint128s_t_
 #define _di_f_uint128ss_delete_callback_

diff --git a/level_0/f_account/c/account.c b/level_0/f_account/c/account.c
index 01ae7bd2c56dafa4ee41d0bdb44bd16c9fc34be6..a7424ea676c26ab7198726dbb9aab0610c4b2dac 100644 (file)
--- a/level_0/f_account/c/account.c
+++ b/level_0/f_account/c/account.c
@@ -7,7 +7,7 @@ extern "C" {
 #endif
 
 #ifndef _di_f_account_by_id_
-  f_status_t f_account_by_id(const uid_t id, f_account_t * const account) {
+  f_status_t f_account_by_id(const f_uid_t id, f_account_t * const account) {
     #ifndef _di_level_0_parameter_checking_
       if (!account) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
@@ -37,7 +37,7 @@ extern "C" {
       errno = 0;
 
       char buffer[length];
-      const int result = getpwuid_r(id, &password, buffer, length, &pointer);
+      const int result = getpwuid_r((uid_t) id, &password, buffer, length, &pointer);
 
       if (result) {
         if (errno == EINTR) return F_status_set_error(F_interrupt);
@@ -64,7 +64,7 @@ extern "C" {
 
     char buffer[F_account_pwd_length_fallback_second_d];
 
-    const int result = getpwuid_r(id, &password, buffer, length, &pointer);
+    const int result = getpwuid_r((uid_t) id, &password, buffer, length, &pointer);
 
     if (result) {
       if (errno == EINTR) return F_status_set_error(F_interrupt);
@@ -162,7 +162,7 @@ extern "C" {
 #endif // _di_f_account_by_name_
 
 #ifndef _di_f_account_group_id_by_name_
-  f_status_t f_account_group_id_by_name(const f_string_static_t name, gid_t * const id) {
+  f_status_t f_account_group_id_by_name(const f_string_static_t name, f_gid_t * const id) {
     #ifndef _di_level_0_parameter_checking_
       if (!id) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
@@ -204,7 +204,7 @@ extern "C" {
       else {
         if (!pointer) return F_exist_not;
 
-        *id = group_data.gr_gid;
+        *id = (f_gid_t) group_data.gr_gid;
 
         return F_okay;
       }
@@ -236,7 +236,7 @@ extern "C" {
 #endif // _di_f_account_group_id_by_name_
 
 #ifndef _di_f_account_group_name_by_id_
-  f_status_t f_account_group_name_by_id(const gid_t id, f_string_dynamic_t * const name) {
+  f_status_t f_account_group_name_by_id(const f_gid_t id, f_string_dynamic_t * const name) {
     #ifndef _di_level_0_parameter_checking_
       if (!name) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
@@ -263,7 +263,7 @@ extern "C" {
 
       char buffer[length];
 
-      const int result = getgrgid_r(id, &group_data, buffer, length, &pointer);
+      const int result = getgrgid_r((gid_t) id, &group_data, buffer, length, &pointer);
 
       if (result) {
         if (errno == EINTR) return F_status_set_error(F_interrupt);
@@ -302,7 +302,7 @@ extern "C" {
 
     char buffer[F_account_pwd_length_fallback_second_d];
 
-    const int result = getgrgid_r(id, &group_data, buffer, length, &pointer);
+    const int result = getgrgid_r((gid_t) id, &group_data, buffer, length, &pointer);
 
     if (result) {
       if (errno == EINTR) return F_status_set_error(F_interrupt);
@@ -334,7 +334,7 @@ extern "C" {
 #endif // _di_f_account_group_name_by_id_
 
 #ifndef _di_f_account_id_by_name_
-  f_status_t f_account_id_by_name(const f_string_static_t name, uid_t * const id) {
+  f_status_t f_account_id_by_name(const f_string_static_t name, f_uid_t * const id) {
     #ifndef _di_level_0_parameter_checking_
       if (!id) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
@@ -376,7 +376,7 @@ extern "C" {
       else {
         if (!pointer) return F_exist_not;
 
-        *id = password.pw_uid;
+        *id = (f_uid_t) password.pw_uid;
 
         return F_okay;
       }
@@ -401,14 +401,14 @@ extern "C" {
 
     if (!pointer) return F_exist_not;
 
-    *id = password.pw_uid;
+    *id = (f_uid_t) password.pw_uid;
 
     return F_okay;
   }
 #endif // _di_f_account_id_by_name_
 
 #ifndef _di_f_account_name_by_id_
-  f_status_t f_account_name_by_id(const uid_t id, f_string_dynamic_t * const name) {
+  f_status_t f_account_name_by_id(const f_uid_t id, f_string_dynamic_t * const name) {
     #ifndef _di_level_0_parameter_checking_
       if (!name) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
@@ -435,7 +435,7 @@ extern "C" {
 
       char buffer[length];
 
-      const int result = getpwuid_r(id, &password, buffer, length, &pointer);
+      const int result = getpwuid_r((uid_t) id, &password, buffer, length, &pointer);
 
       if (result) {
         if (errno == EINTR) return F_status_set_error(F_interrupt);

diff --git a/level_0/f_account/c/account.h b/level_0/f_account/c/account.h
index ea45a205b0a081e0407c9b6a52d0d7b3008506a7..f05eda567ea9c18e8f4544c271263bd1673bfa31 100644 (file)
--- a/level_0/f_account/c/account.h
+++ b/level_0/f_account/c/account.h
@@ -62,7 +62,7 @@ extern "C" {
  * @see f_memory_array_increase_by()
  */
 #ifndef _di_f_account_by_id_
-  extern f_status_t f_account_by_id(const uid_t id, f_account_t * const account);
+  extern f_status_t f_account_by_id(const f_uid_t id, f_account_t * const account);
 #endif // _di_f_account_by_id_
 
 /**
@@ -121,7 +121,7 @@ extern "C" {
  * @see getgrnam_r()
  */
 #ifndef _di_f_account_group_id_by_name_
-  extern f_status_t f_account_group_id_by_name(const f_string_static_t name, gid_t * const id);
+  extern f_status_t f_account_group_id_by_name(const f_string_static_t name, f_gid_t * const id);
 #endif // _di_f_account_group_id_by_name_
 
 /**
@@ -152,7 +152,7 @@ extern "C" {
  * @see f_memory_array_increase_by()
  */
 #ifndef _di_f_account_group_name_by_id_
-  extern f_status_t f_account_group_name_by_id(const gid_t id, f_string_dynamic_t * const name);
+  extern f_status_t f_account_group_name_by_id(const f_gid_t id, f_string_dynamic_t * const name);
 #endif // _di_f_account_group_name_by_id_
 
 /**
@@ -179,7 +179,7 @@ extern "C" {
  * @see getpwnam_r()
  */
 #ifndef _di_f_account_id_by_name_
-  extern f_status_t f_account_id_by_name(const f_string_static_t name, uid_t * const id);
+  extern f_status_t f_account_id_by_name(const f_string_static_t name, f_uid_t * const id);
 #endif // _di_f_account_id_by_name_
 
 /**
@@ -210,7 +210,7 @@ extern "C" {
  * @see f_memory_array_increase_by()
  */
 #ifndef _di_f_account_name_by_id_
-  extern f_status_t f_account_name_by_id(const uid_t id, f_string_dynamic_t * const name);
+  extern f_status_t f_account_name_by_id(const f_uid_t id, f_string_dynamic_t * const name);
 #endif // _di_f_account_name_by_id_
 
 #ifdef __cplusplus

diff --git a/level_0/f_account/c/account/common.h b/level_0/f_account/c/account/common.h
index bdad4ba2d13aa4384127242231c972bc1f1b5966..a62ea32a33846ba2cf931476378661fdf1fdea78 100644 (file)
--- a/level_0/f_account/c/account/common.h
+++ b/level_0/f_account/c/account/common.h
@@ -42,8 +42,8 @@ extern "C" {
  */
 #ifndef _di_f_account_t_
   typedef struct {
-    uid_t id_user;
-    gid_t id_group;
+    f_uid_t id_user;
+    f_gid_t id_group;
 
     f_string_dynamic_t home;
     f_string_dynamic_t label;
@@ -53,8 +53,8 @@ extern "C" {
   } f_account_t;
 
   #define f_account_t_initialize { \
-    0, \
-    0, \
+    f_uid_t_initialize, \
+    f_gid_t_initialize, \
     f_string_dynamic_t_initialize, \
     f_string_dynamic_t_initialize, \
     f_string_dynamic_t_initialize, \
@@ -63,8 +63,8 @@ extern "C" {
   }
 
   #define macro_f_account_t_clear(account) \
-    account.id_user = 0; \
-    account.id_group = 0; \
+    macro_f_uid_t_clear(account.id_user); \
+    macro_f_gid_t_clear(account.id_group); \
     macro_f_account_t_clear(account.home); \
     macro_f_account_t_clear(account.label); \
     macro_f_account_t_clear(account.name); \

diff --git a/level_0/f_account/tests/unit/c/test-account-by_id.c b/level_0/f_account/tests/unit/c/test-account-by_id.c
index 60d52b6626bb96d628e4f47c88583a3598de5f4a..dd2545fe59e753d6721515673653eef7bc4e7666 100644 (file)
--- a/level_0/f_account/tests/unit/c/test-account-by_id.c
+++ b/level_0/f_account/tests/unit/c/test-account-by_id.c
@@ -10,7 +10,7 @@ void test__f_account_by_id__fails(void **state) {
   mock_unwrap = 1;
 
   const long size = 20;
-  uid_t uid = 0;
+  f_uid_t uid = f_uid_t_initialize;
   f_account_t account = f_account_t_initialize;
 
   int errnos[] = {
@@ -53,7 +53,7 @@ void test__f_account_by_id__not_found(void **state) {
 
   const long size = 20;
   struct passwd password;
-  uid_t uid = 0;
+  f_uid_t uid = f_uid_t_initialize;
   f_account_t account = f_account_t_initialize;
 
   {
@@ -86,7 +86,7 @@ void test__f_account_by_id__works(void **state) {
   const long size = 20;
   struct passwd password;
   struct passwd pointer;
-  uid_t uid = 1;
+  f_uid_t uid = 1;
   f_account_t account = f_account_t_initialize;
 
   password.pw_uid = uid;

diff --git a/level_0/f_account/tests/unit/c/test-account-group_id_by_name.c b/level_0/f_account/tests/unit/c/test-account-group_id_by_name.c
index 6e07edbc4f52feaa5f159c16cd19a57d86232ad7..b8167c651570485f6eecebc7d820f639176090e9 100644 (file)
--- a/level_0/f_account/tests/unit/c/test-account-group_id_by_name.c
+++ b/level_0/f_account/tests/unit/c/test-account-group_id_by_name.c
@@ -8,7 +8,7 @@ extern "C" {
 void test__f_account_group_id_by_name__fails(void **state) {
 
   const long size = 20;
-  gid_t gid = 0;
+  f_gid_t gid = f_gid_t_initialize;
 
   f_string_t name_string = "name";
   f_string_static_t name = f_string_static_t_initialize;
@@ -51,7 +51,7 @@ void test__f_account_group_id_by_name__not_found(void **state) {
 
   const long size = 20;
   struct group group_data;
-  gid_t gid = 0;
+  f_gid_t gid = f_gid_t_initialize;
 
   f_string_t name_string = "name";
   f_string_static_t name = f_string_static_t_initialize;
@@ -87,7 +87,7 @@ void test__f_account_group_id_by_name__works(void **state) {
   struct group group_data;
   struct group pointer;
   char *pointers[] = { "gr_mem", 0 };
-  gid_t gid = 0;
+  f_gid_t gid = f_gid_t_initialize;
 
   f_string_static_t name = f_string_static_t_initialize;
 

diff --git a/level_0/f_account/tests/unit/c/test-account-group_name_by_id.c b/level_0/f_account/tests/unit/c/test-account-group_name_by_id.c
index af9fb9c29f939d1e9b620e0aed06a33a45462d74..ae18c737a9ef3f0b15c41528957477170a8b25b6 100644 (file)
--- a/level_0/f_account/tests/unit/c/test-account-group_name_by_id.c
+++ b/level_0/f_account/tests/unit/c/test-account-group_name_by_id.c
@@ -8,7 +8,7 @@ extern "C" {
 void test__f_account_group_name_by_id__fails(void **state) {
 
   const long size = 20;
-  gid_t gid = 0;
+  f_gid_t gid = f_gid_t_initialize;
   f_string_dynamic_t name = f_string_dynamic_t_initialize;
 
   int errnos[] = {
@@ -49,7 +49,7 @@ void test__f_account_group_name_by_id__not_found(void **state) {
 
   const long size = 20;
   struct group group_data;
-  gid_t gid = 0;
+  f_gid_t gid = f_gid_t_initialize;
   f_string_dynamic_t name = f_string_dynamic_t_initialize;
 
   {
@@ -83,7 +83,7 @@ void test__f_account_group_name_by_id__works(void **state) {
   struct group group_data;
   struct group pointer;
   char *pointers[] = { "gr_mem", 0 };
-  gid_t gid = 0;
+  f_gid_t gid = f_gid_t_initialize;
   f_string_dynamic_t name = f_string_dynamic_t_initialize;
 
   group_data.gr_gid = 1;

diff --git a/level_0/f_account/tests/unit/c/test-account-id_by_name.c b/level_0/f_account/tests/unit/c/test-account-id_by_name.c
index 400f4725658123b831c2ddb686a96b206d2b20bf..636932d584f0979359ee93a650705103ea972b00 100644 (file)
--- a/level_0/f_account/tests/unit/c/test-account-id_by_name.c
+++ b/level_0/f_account/tests/unit/c/test-account-id_by_name.c
@@ -8,7 +8,7 @@ extern "C" {
 void test__f_account_id_by_name__fails(void **state) {
 
   const long size = 20;
-  uid_t uid = 0;
+  f_uid_t uid = f_uid_t_initialize;
 
   f_string_t name_string = "name";
   f_string_static_t name = f_string_static_t_initialize;
@@ -51,7 +51,7 @@ void test__f_account_id_by_name__not_found(void **state) {
 
   const long size = 20;
   struct passwd password;
-  uid_t uid = 0;
+  f_uid_t uid = f_uid_t_initialize;
 
   f_string_t name_string = "name";
   f_string_static_t name = f_string_static_t_initialize;
@@ -86,7 +86,7 @@ void test__f_account_id_by_name__works(void **state) {
   const long size = 20;
   struct passwd password;
   struct passwd pointer;
-  uid_t uid = 0;
+  f_uid_t uid = f_uid_t_initialize;
 
   f_string_static_t name = f_string_static_t_initialize;
 

diff --git a/level_0/f_account/tests/unit/c/test-account-name_by_id.c b/level_0/f_account/tests/unit/c/test-account-name_by_id.c
index 8fea7d9c00513dcc2cccd1ec32a28ad58f3a37ee..d77786fb98998b8ae25173b9377ad5e8ab037d69 100644 (file)
--- a/level_0/f_account/tests/unit/c/test-account-name_by_id.c
+++ b/level_0/f_account/tests/unit/c/test-account-name_by_id.c
@@ -8,7 +8,7 @@ extern "C" {
 void test__f_account_name_by_id__fails(void **state) {
 
   const long size = 20;
-  uid_t uid = 0;
+  f_uid_t uid = f_uid_t_initialize;
   f_string_dynamic_t name = f_string_dynamic_t_initialize;
 
   int errnos[] = {
@@ -49,7 +49,7 @@ void test__f_account_name_by_id__not_found(void **state) {
 
   const long size = 20;
   struct passwd password;
-  uid_t uid = 0;
+  f_uid_t uid = f_uid_t_initialize;
   f_string_dynamic_t name = f_string_dynamic_t_initialize;
 
   {
@@ -82,7 +82,7 @@ void test__f_account_name_by_id__works(void **state) {
   const long size = 20;
   struct passwd password;
   struct passwd pointer;
-  uid_t uid = 0;
+  f_uid_t uid = f_uid_t_initialize;
   f_string_dynamic_t name = f_string_dynamic_t_initialize;
 
   password.pw_uid = 1;

diff --git a/level_0/f_capability/c/capability.c b/level_0/f_capability/c/capability.c
index b3fcce048f7b3204a0f0f0001bb2fd58d438b2ef..f8ae934ff88824bbedce90e248feea4af524436e 100644 (file)
--- a/level_0/f_capability/c/capability.c
+++ b/level_0/f_capability/c/capability.c
@@ -176,7 +176,7 @@ extern "C" {
 #if defined(_di_libcap_) || defined(_libcap_legacy_only_)
 
   #ifndef _di_f_capability_groups_set_
-    f_status_t f_capability_groups_set(const gid_t id_group, const size_t total, const gid_t id_groups[]) {
+    f_status_t f_capability_groups_set(const f_gid_t id_group, const size_t total, const f_gid_t id_groups[]) {
       return F_status_set_error(F_implement_not);
     }
   #endif // _di_f_capability_groups_set_
@@ -226,7 +226,7 @@ extern "C" {
   #endif // _di_f_capability_mode_set_
 
   #ifndef _di_f_capability_owner_get_
-    f_status_t f_capability_owner_get(const f_capability_t capability, uid_t * const id_user) {
+    f_status_t f_capability_owner_get(const f_capability_t capability, f_uid_t * const id_user) {
       #ifndef _di_level_0_parameter_checking_
         if (!id_user) return F_status_set_error(F_parameter);
       #endif // _di_level_0_parameter_checking_
@@ -236,7 +236,7 @@ extern "C" {
   #endif // _di_f_capability_owner_get_
 
   #ifndef _di_f_capability_owner_set_
-    f_status_t f_capability_owner_set(const f_capability_t capability, const uid_t id_user) {
+    f_status_t f_capability_owner_set(const f_capability_t capability, const f_uid_t id_user) {
       return F_status_set_error(F_implement_not);
     }
   #endif // _di_f_capability_owner_set_
@@ -376,7 +376,7 @@ extern "C" {
 #if defined(_di_libcap_) || defined(_libcap_legacy_only_)
 
   #ifndef f_capability_user_set
-    f_status_t f_capability_user_set(const uid_t id_user) {
+    f_status_t f_capability_user_set(const f_uid_t id_user) {
       return F_status_set_error(F_implement_not);
     }
   #endif // f_capability_user_set
@@ -727,9 +727,9 @@ extern "C" {
 #if !defined(_di_libcap_) && !defined(_libcap_legacy_only_)
 
   #ifndef _di_f_capability_groups_set_
-    f_status_t f_capability_groups_set(const gid_t id_group, const size_t total, const gid_t id_groups[]) {
+    f_status_t f_capability_groups_set(const f_gid_t id_group, const size_t total, const f_gid_t id_groups[]) {
 
-      if (cap_setgroups(id_group, total, id_groups) == -1) {
+      if (cap_setgroups((gid_t) id_group, total, id_groups) == -1) {
         if (errno == EINVAL) return F_status_set_error(F_parameter);
         if (errno == ENOMEM) return F_status_set_error(F_memory_not);
         if (errno == ERANGE) return F_status_set_error(F_range_not);
@@ -806,21 +806,21 @@ extern "C" {
   #endif // _di_f_capability_mode_set_
 
   #ifndef _di_f_capability_owner_get_
-    f_status_t f_capability_owner_get(const f_capability_t capability, uid_t * const id_user) {
+    f_status_t f_capability_owner_get(const f_capability_t capability, f_uid_t * const id_user) {
       #ifndef _di_level_0_parameter_checking_
         if (!id_user) return F_status_set_error(F_parameter);
       #endif // _di_level_0_parameter_checking_
 
-      *id_user = cap_get_nsowner(capability);
+      *id_user = (f_uid_t) cap_get_nsowner(capability);
 
       return F_okay;
     }
   #endif // _di_f_capability_owner_get_
 
   #ifndef _di_f_capability_owner_set_
-    f_status_t f_capability_owner_set(const f_capability_t capability, const uid_t id_user) {
+    f_status_t f_capability_owner_set(const f_capability_t capability, const f_uid_t id_user) {
 
-      if (cap_set_nsowner(capability, id_user) == -1) {
+      if (cap_set_nsowner(capability, (uid_t) id_user) == -1) {
         if (errno == EACCES) return F_status_set_error(F_access_denied);
         if (errno == EBADFD) return F_status_set_error(F_descriptor_not);
         if (errno == ENAMETOOLONG) return F_status_set_error(F_name_not);
@@ -1089,9 +1089,9 @@ extern "C" {
 #if !defined(_di_libcap_) && !defined(_libcap_legacy_only_)
 
   #ifndef _di_f_capability_user_set_
-    f_status_t f_capability_user_set(const uid_t id_user) {
+    f_status_t f_capability_user_set(const f_uid_t id_user) {
 
-      if (cap_setuid(id_user) == -1) {
+      if (cap_setuid((uid_t) id_user) == -1) {
         if (errno == EINVAL) return F_status_set_error(F_parameter);
         if (errno == ENOMEM) return F_status_set_error(F_memory_not);
         if (errno == EPERM) return F_status_set_error(F_prohibited);

diff --git a/level_0/f_capability/c/capability.h b/level_0/f_capability/c/capability.h
index c4bb771fae0e523413ce3ba71f7900055fbce636..32a10afc2ff1e300c282e3361342d5d3fe9228cf 100644 (file)
--- a/level_0/f_capability/c/capability.h
+++ b/level_0/f_capability/c/capability.h
@@ -540,7 +540,7 @@ extern "C" {
  * @see setgroups()
  */
 #ifndef _di_f_capability_groups_set_
-  extern f_status_t f_capability_groups_set(const gid_t id_group, const size_t total, const gid_t id_groups[]);
+  extern f_status_t f_capability_groups_set(const f_gid_t id_group, const size_t total, const f_gid_t id_groups[]);
 #endif // _di_f_capability_groups_set_
 
 /**
@@ -646,7 +646,7 @@ extern "C" {
  * @see cap_get_owner()
  */
 #ifndef _di_f_capability_owner_get_
-  extern f_status_t f_capability_owner_get(const f_capability_t capability, uid_t * const id_user);
+  extern f_status_t f_capability_owner_get(const f_capability_t capability, f_uid_t * const id_user);
 #endif // _di_f_capability_owner_get_
 
 /**
@@ -681,7 +681,7 @@ extern "C" {
  * @see cap_set_owner()
  */
 #ifndef _di_f_capability_owner_set_
-  extern f_status_t f_capability_owner_set(const f_capability_t capability, const uid_t id_user);
+  extern f_status_t f_capability_owner_set(const f_capability_t capability, const f_uid_t id_user);
 #endif // _di_f_capability_owner_set_
 
 /**
@@ -993,7 +993,7 @@ extern "C" {
  * @see setuid()
  */
 #ifndef _di_f_capability_user_set_
-  extern f_status_t f_capability_user_set(const uid_t id_user);
+  extern f_status_t f_capability_user_set(const f_uid_t id_user);
 #endif // _di_f_capability_user_set_
 
 #ifdef __cplusplus

diff --git a/level_0/f_capability/tests/unit/c/test-capability-groups_set.c b/level_0/f_capability/tests/unit/c/test-capability-groups_set.c
index 2106faef3fe5cdd527abb2672e26f9c98d06aa6d..c7dbbb739927b9967d3b795ee35c3e98c04cc771 100644 (file)
--- a/level_0/f_capability/tests/unit/c/test-capability-groups_set.c
+++ b/level_0/f_capability/tests/unit/c/test-capability-groups_set.c
@@ -8,9 +8,9 @@ extern "C" {
 void test__f_capability_groups_set__fails(void **state) {
 
   #if !defined(_di_libcap_) && !defined(_libcap_legacy_only_)
-    const gid_t group = 1;
+    const f_gid_t group = 1;
     const size_t total = 2;
-    const gid_t groups[] = { 3, 4 };
+    const f_gid_t groups[] = { 3, 4 };
 
     int errnos[] = {
       EINVAL,
@@ -40,9 +40,9 @@ void test__f_capability_groups_set__fails(void **state) {
 
 void test__f_capability_groups_set__works(void **state) {
 
-  const gid_t group = 1;
+  const f_gid_t group = 1;
   const size_t total = 2;
-  const gid_t groups[] = { 3, 4 };
+  const f_gid_t groups[] = { 3, 4 };
 
   #if defined(_di_libcap_) || defined(_libcap_legacy_only_)
     printf("[  WARN    ] f_capability_groups_set() is not implemented and cannot be fully tested.\n");

diff --git a/level_0/f_capability/tests/unit/c/test-capability-owner_get.c b/level_0/f_capability/tests/unit/c/test-capability-owner_get.c
index d4aa33dacad52f9d84534488176170ad2c50284d..9c41a4e83145ad65496f9e154ad5015a5d69d0fc 100644 (file)
--- a/level_0/f_capability/tests/unit/c/test-capability-owner_get.c
+++ b/level_0/f_capability/tests/unit/c/test-capability-owner_get.c
@@ -19,7 +19,7 @@ void test__f_capability_owner_get__parameter_checking(void **state) {
 void test__f_capability_owner_get__works(void **state) {
 
   const f_capability_t capability = f_capability_t_initialize;
-  uid_t id;
+  f_uid_t id = f_uid_t_initialize;
 
   #if defined(_di_libcap_) || defined(_libcap_legacy_only_)
     printf("[  WARN    ] f_capability_owner_get() is not implemented and cannot be fully tested.\n");

diff --git a/level_0/f_capability/tests/unit/c/test-capability-owner_set.c b/level_0/f_capability/tests/unit/c/test-capability-owner_set.c
index d78d30c866d5acf3f6280a3fb1cb22cd84b18e9e..ce3dfa3048530bd1619fc22a32f5a9673413dd07 100644 (file)
--- a/level_0/f_capability/tests/unit/c/test-capability-owner_set.c
+++ b/level_0/f_capability/tests/unit/c/test-capability-owner_set.c
@@ -9,7 +9,7 @@ void test__f_capability_owner_set__fails(void **state) {
 
   #if !defined(_di_libcap_) && !defined(_libcap_legacy_only_)
     const f_capability_t capability = f_capability_t_initialize;
-    const uid_t id;
+    const f_uid_t id = f_uid_t_initialize;
 
     int errnos[] = {
       EACCES,
@@ -50,7 +50,7 @@ void test__f_capability_owner_set__fails(void **state) {
 void test__f_capability_owner_set__works(void **state) {
 
   const f_capability_t capability = f_capability_t_initialize;
-  const uid_t id = 0;
+  const f_uid_t id = f_uid_t_initialize;
 
   #if defined(_di_libcap_) || defined(_libcap_legacy_only_)
     printf("[  WARN    ] f_capability_owner_set() is not implemented and cannot be fully tested.\n");

diff --git a/level_0/f_directory/c/directory/recurse_do.h b/level_0/f_directory/c/directory/recurse_do.h
index 2ae300e39a8ffcc33d19bb50ee6c4c96c4dcf258..b00885bc04a3b01713b678cf702649d755303525 100644 (file)
--- a/level_0/f_directory/c/directory/recurse_do.h
+++ b/level_0/f_directory/c/directory/recurse_do.h
@@ -37,6 +37,8 @@ extern "C" {
  *
  * The callbacks must take care to properly modify the structure or they could cause security, integrity, or functionality problems.
  *
+ * This provides f_directory_recurse_do_call_t (and f_directory_recurse_do_call_t_initialize) to simplify the function callback usage.
+ *
  * Properties:
  *   - depth:     A number representing the depth recursed thus far (generally assigned internally).
  *   - depth_max: The maximum recursion depth to use.
@@ -59,6 +61,8 @@ extern "C" {
 #ifndef _di_f_directory_recurse_do_t_
   typedef struct f_directory_recurse_do_t_ f_directory_recurse_do_t;
 
+  typedef void (*f_directory_recurse_do_call_t)(f_directory_recurse_do_t * const recurse, const f_string_static_t name, const uint16_t flag);
+
   struct f_directory_recurse_do_t_ {
     f_number_unsigned_t depth;
     f_number_unsigned_t depth_max;
@@ -72,10 +76,12 @@ extern "C" {
     f_string_dynamic_t path_cache;
     const f_string_static_t *path_top;
 
-    void (*action)(f_directory_recurse_do_t * const recurse, const f_string_static_t name, const uint16_t flag);
-    void (*handle)(f_directory_recurse_do_t * const recurse, const f_string_static_t name, const uint16_t flag);
+    f_directory_recurse_do_call_t action;
+    f_directory_recurse_do_call_t handle;
   } ;
 
+  #define f_directory_recurse_do_call_t_initialize 0
+
   #define f_directory_recurse_do_t_initialize { \
     0, \
     F_directory_max_recurse_depth_d, \
@@ -86,8 +92,8 @@ extern "C" {
     f_string_dynamic_t_initialize, \
     f_string_dynamic_t_initialize, \
     0, \
-    0, \
-    0, \
+    f_directory_recurse_do_call_t_initialize, \
+    f_directory_recurse_do_call_t_initialize, \
   }
 
   #define macro_f_directory_recurse_do_t_initialize_1(depth, depth_max, flag, mode, state, listing, path, path_cache, path_top, action, handle) { \

diff --git a/level_0/f_file/c/file.c b/level_0/f_file/c/file.c
index e56c9364ba912476bd27e4d6e83d3ce8384434c5..5b7c6a0eabab221ed31e4edc8c40e8b6562059ef 100644 (file)
--- a/level_0/f_file/c/file.c
+++ b/level_0/f_file/c/file.c
@@ -435,7 +435,7 @@ extern "C" {
 #endif // _di_f_file_flush_
 
 #ifndef _di_f_file_group_read_
-  f_status_t f_file_group_read(const f_string_static_t path, const bool dereference, gid_t * const group) {
+  f_status_t f_file_group_read(const f_string_static_t path, const bool dereference, f_gid_t * const group) {
     #ifndef _di_level_0_parameter_checking_
       if (!group) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
@@ -451,7 +451,7 @@ extern "C" {
       if (F_status_is_error(status)) return status;
     }
 
-    *group = stat_file.st_gid;
+    *group = (f_gid_t) stat_file.st_gid;
 
     return F_okay;
   }
@@ -1504,7 +1504,7 @@ extern "C" {
 #endif // _di_f_file_open_at_
 
 #ifndef _di_f_file_owner_read_
-  f_status_t f_file_owner_read(const f_string_static_t path, const bool dereference, uid_t * const owner) {
+  f_status_t f_file_owner_read(const f_string_static_t path, const bool dereference, f_uid_t * const owner) {
     #ifndef _di_level_0_parameter_checking_
       if (!owner) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
@@ -1520,7 +1520,7 @@ extern "C" {
       if (F_status_is_error(status)) return status;
     }
 
-    *owner = stat_file.st_uid;
+    *owner = (f_uid_t) stat_file.st_uid;
 
     return F_okay;
   }
@@ -1801,7 +1801,7 @@ extern "C" {
 #endif // _di_f_file_rename_at_
 
 #ifndef _di_f_file_role_change_
-  f_status_t f_file_role_change(const f_string_static_t path, const uid_t uid, const gid_t gid, const bool dereference) {
+  f_status_t f_file_role_change(const f_string_static_t path, const f_uid_t uid, const f_gid_t gid, const bool dereference) {
 
     if ((uid == -1 && gid == -1) || !path.used) return F_data_not;
 
@@ -1810,7 +1810,7 @@ extern "C" {
 #endif // _di_f_file_role_change_
 
 #ifndef _di_f_file_role_change_at_
-  f_status_t f_file_role_change_at(const f_file_t directory, const f_string_static_t path, const uid_t uid, const gid_t gid, const int flag) {
+  f_status_t f_file_role_change_at(const f_file_t directory, const f_string_static_t path, const f_uid_t uid, const f_gid_t gid, const int flag) {
 
     if (directory.id == -1) return F_file_descriptor_not;
     if ((uid == -1 && gid == -1) || !path.used) return F_data_not;

diff --git a/level_0/f_file/c/file.h b/level_0/f_file/c/file.h
index 7c0335e78e2f439504bf15a1acc2c716f14eac8d..9d8e132e9f2fbe83661d895b1da2f702416aaadd 100644 (file)
--- a/level_0/f_file/c/file.h
+++ b/level_0/f_file/c/file.h
@@ -729,7 +729,7 @@ extern "C" {
  * @see stat()
  */
 #ifndef _di_f_file_group_read_
-  extern f_status_t f_file_group_read(const f_string_static_t path, const bool dereference, uid_t * const group);
+  extern f_status_t f_file_group_read(const f_string_static_t path, const bool dereference, f_uid_t * const group);
 #endif // _di_f_file_group_read_
 
 /**
@@ -1561,7 +1561,7 @@ extern "C" {
  * @see stat()
  */
 #ifndef _di_f_file_owner_read_
-  extern f_status_t f_file_owner_read(const f_string_static_t path, const bool dereference, uid_t * const owner);
+  extern f_status_t f_file_owner_read(const f_string_static_t path, const bool dereference, f_uid_t * const owner);
 #endif // _di_f_file_owner_read_
 
 /**
@@ -1909,7 +1909,7 @@ extern "C" {
  * @see lchown()
  */
 #ifndef _di_f_file_role_change_
-  extern f_status_t f_file_role_change(const f_string_static_t path, const uid_t uid, const gid_t gid, const bool dereference);
+  extern f_status_t f_file_role_change(const f_string_static_t path, const f_uid_t uid, const f_gid_t gid, const bool dereference);
 #endif // _di_f_file_role_change_
 
 /**
@@ -1951,7 +1951,7 @@ extern "C" {
  * @see fchownat()
  */
 #ifndef _di_f_file_role_change_at_
-  extern f_status_t f_file_role_change_at(const f_file_t directory, const f_string_static_t path, const uid_t uid, const gid_t gid, const int flag);
+  extern f_status_t f_file_role_change_at(const f_file_t directory, const f_string_static_t path, const f_uid_t uid, const f_gid_t gid, const int flag);
 #endif // _di_f_file_role_change_at_
 
 /**

diff --git a/level_0/f_file/c/private-file.c b/level_0/f_file/c/private-file.c
index a495fc34ed979e044a49446406632fa32d6389a3..cbcb9818825a00d9c255b2ec3f14b9e16f3ab1e6 100644 (file)
--- a/level_0/f_file/c/private-file.c
+++ b/level_0/f_file/c/private-file.c
@@ -466,16 +466,16 @@ extern "C" {
 #endif // !defined(_di_f_file_create_at_) || !defined(_di_f_file_open_at_)
 
 #if !defined(_di_f_file_role_change_) || !defined(_di_f_file_copy_)
-  f_status_t private_f_file_role_change(const f_string_static_t path, const uid_t uid, const gid_t gid, const bool dereference) {
+  f_status_t private_f_file_role_change(const f_string_static_t path, const f_uid_t uid, const f_gid_t gid, const bool dereference) {
 
     int result = 0;
 
     if (uid != -1) {
       if (dereference) {
-        result = chown(path.string, uid, -1);
+        result = chown(path.string, (uid_t) uid, -1);
       }
       else {
-        result = lchown(path.string, uid, -1);
+        result = lchown(path.string, (uid_t) uid, -1);
       }
 
       if (result < 0 && errno == EPERM) {
@@ -485,10 +485,10 @@ extern "C" {
 
     if (result == 0 && gid != -1) {
       if (dereference) {
-        result = chown(path.string, -1, gid);
+        result = chown(path.string, -1, (gid_t) gid);
       }
       else {
-        result = lchown(path.string, -1, gid);
+        result = lchown(path.string, -1, (gid_t) gid);
       }
 
       if (result < 0 && errno == EPERM) {
@@ -515,12 +515,12 @@ extern "C" {
 #endif // !defined(_di_f_file_role_change_) || !defined(_di_f_file_copy_)
 
 #if !defined(_di_f_file_role_change_at_)
-  f_status_t private_f_file_role_change_at(const f_file_t file, const f_string_static_t path, const uid_t uid, const gid_t gid, const int flag) {
+  f_status_t private_f_file_role_change_at(const f_file_t file, const f_string_static_t path, const f_uid_t uid, const f_gid_t gid, const int flag) {
 
     int result = 0;
 
     if (uid != -1) {
-      result = fchownat(file.id, path.string, uid, -1, flag);
+      result = fchownat(file.id, path.string, (uid_t) uid, -1, flag);
 
       if (result < 0 && errno == EPERM) {
         return F_status_set_error(F_access_owner);
@@ -528,7 +528,7 @@ extern "C" {
     }
 
     if (result == 0 && gid != -1) {
-      result = fchownat(file.id, path.string, -1, gid, flag);
+      result = fchownat(file.id, path.string, -1, (gid_t) gid, flag);
 
       if (result < 0 && errno == EPERM) {
         return F_status_set_error(F_access_group);

diff --git a/level_0/f_file/c/private-file.h b/level_0/f_file/c/private-file.h
index 574681edf3608c4f5193755bd4805f40944449e7..5393adaa6f82ec1d1f8b060fa6fd4e6958dfd6dc 100644 (file)
--- a/level_0/f_file/c/private-file.h
+++ b/level_0/f_file/c/private-file.h
@@ -680,7 +680,7 @@ extern "C" {
  * @see f_file_role_change()
  */
 #if !defined(_di_f_file_role_change_) || !defined(_di_f_file_copy_)
-  extern f_status_t private_f_file_role_change(const f_string_static_t path, const uid_t uid, const gid_t gid, const bool dereference) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_file_role_change(const f_string_static_t path, const f_uid_t uid, const f_gid_t gid, const bool dereference) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_file_role_change_) || !defined(_di_f_file_copy_)
 
 /**
@@ -722,7 +722,7 @@ extern "C" {
  * @see f_file_role_change_at()
  */
 #if !defined(_di_f_file_role_change_at_)
-  extern f_status_t private_f_file_role_change_at(const f_file_t directory, const f_string_static_t path, const uid_t uid, const gid_t gid, const int flag) F_attribute_visibility_internal_d;
+  extern f_status_t private_f_file_role_change_at(const f_file_t directory, const f_string_static_t path, const f_uid_t uid, const f_gid_t gid, const int flag) F_attribute_visibility_internal_d;
 #endif // !defined(_di_f_file_role_change_at_)
 
 /**

diff --git a/level_0/f_file/tests/unit/c/test-file-group_read.c b/level_0/f_file/tests/unit/c/test-file-group_read.c
index b9fed6510fd8112b436e9a6900584829fac7caa0..48f766dbcb3491ac4c04a4f2b52cef2f68a287d4 100644 (file)
--- a/level_0/f_file/tests/unit/c/test-file-group_read.c
+++ b/level_0/f_file/tests/unit/c/test-file-group_read.c
@@ -35,7 +35,7 @@ void test__f_file_group_read__fails(void **state) {
 
   for (int i = 0; i < 9; ++i) {
 
-    gid_t id = 0;
+    f_gid_t id = f_gid_t_initialize;
 
     will_return(__wrap_stat, true);
     will_return(__wrap_stat, errnos[i]);
@@ -58,7 +58,7 @@ void test__f_file_group_read__parameter_checking(void **state) {
 void test__f_file_group_read__returns_data_not(void **state) {
 
   {
-    gid_t id = 0;
+    f_gid_t id = f_gid_t_initialize;
 
     const f_status_t status = f_file_group_read(f_string_empty_s, F_false, &id);
 
@@ -71,7 +71,7 @@ void test__f_file_group_read__works(void **state) {
   const f_string_static_t path = macro_f_string_static_t_initialize_1("test", 0, 4);
 
   {
-    gid_t id = 0;
+    f_gid_t id = f_gid_t_initialize;
 
     struct stat statistics;
 

diff --git a/level_0/f_file/tests/unit/c/test-file-owner_read.c b/level_0/f_file/tests/unit/c/test-file-owner_read.c
index 64f346720a7c6d76e507e7f5387a821f0fa0ce37..28bbfe13ff612a37c17d62ec454e5ef04b214e51 100644 (file)
--- a/level_0/f_file/tests/unit/c/test-file-owner_read.c
+++ b/level_0/f_file/tests/unit/c/test-file-owner_read.c
@@ -35,7 +35,7 @@ void test__f_file_owner_read__fails(void **state) {
 
   for (int i = 0; i < 9; ++i) {
 
-    gid_t id = 0;
+    f_gid_t id = f_gid_t_initialize;
 
     will_return(__wrap_stat, true);
     will_return(__wrap_stat, errnos[i]);
@@ -58,7 +58,7 @@ void test__f_file_owner_read__parameter_checking(void **state) {
 void test__f_file_owner_read__returns_data_not(void **state) {
 
   {
-    gid_t id = 0;
+    f_gid_t id = f_gid_t_initialize;
 
     const f_status_t status = f_file_owner_read(f_string_empty_s, F_false, &id);
 
@@ -71,7 +71,7 @@ void test__f_file_owner_read__works(void **state) {
   const f_string_static_t path = macro_f_string_static_t_initialize_1("test", 0, 4);
 
   {
-    gid_t id = 0;
+    f_gid_t id = f_gid_t_initialize;
 
     struct stat statistics;
 

diff --git a/level_0/f_type/c/type.h b/level_0/f_type/c/type.h
index 2ae24aea80211c4a97fd587f0e7e9e372960fe09..ba951756b781bfbeb10d416a66b936d71a89765b 100644 (file)
--- a/level_0/f_type/c/type.h
+++ b/level_0/f_type/c/type.h
@@ -38,6 +38,7 @@
 #include <fll/level_0/type/range_double.h>
 #include <fll/level_0/type/state.h>
 #include <fll/level_0/type/time.h>
+#include <fll/level_0/type/void.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/level_0/f_type/c/type/number.h b/level_0/f_type/c/type/number.h
index ffc46acf29a25fc59f388e3305c0caeea2087264..e7c2557f2e28564278151e9724c9014d9dc1b86c 100644 (file)
--- a/level_0/f_type/c/type/number.h
+++ b/level_0/f_type/c/type/number.h
@@ -755,6 +755,137 @@ extern "C" {
   #define macro_f_uint128ss_t_initialize_2(array, length) { array, length, length }
 #endif // _di_f_uint128ss_t_
 
+/**
+ * The uid_t type is not easily interchangeable with gid_t.
+ *
+ * The default size is expected to be a 32-bit unsigned integer.
+ * Override these for different sizes, such as 64-bit unsigned integer.
+ * Some systems might define uid_t and gid_t as signed integers rather than unsigned integers.
+ *
+ * These are expected to be cast back to uid_t and gid_t, which makes it unsafe to define this as some value that does not safely map to uid_t and gid_t.
+ *
+ * The f_id_t is a type intended to be mapped to both uid_t and gid_t.
+ *
+ * The f_gid_t is intended to be mapped directly to gid_t.
+ * The f_uid_t is intended to be mapped directly to uid_t.
+ *
+ * These IDs are generally expected to be initialized to -1.
+ * Using the initializer define is highly recommended.
+ *
+ * Using f_gid_t instead of f_id_t should be safer in case some systems use different type sizes for gid_t and uid_t.
+ * For such systems, the f_gid_t should instead be mapped directly to gid_t and f_uid_t should instead be mapped directly to uid_t.
+ * This, however, does introduce additional cooncerns with certain functions if f_uid_t and f_gid_t are interchanged.
+ * In such cases, make the main type f_id_t the larger of the two so that casting into f_id_t should be safe.
+ * Casting from f_id_t into the smaller of the two may incur problems.
+ *
+ * Be sure to cast f_id_t, f_uid_t, and f_gid_t to the appropriate uid_t or gid_t when using anything outside of this project, such as system calls or POSIX functions.
+ */
+#ifndef _di_f_id_t_
+  typedef uint32_t f_id_t;
+
+  #define f_id_t_initialize -1
+
+  #define macro_f_id_t_clear(id) id = -1;
+
+  /**
+   * The f_gid_t type, see f_id_t documentation.
+   */
+  #ifndef _di_f_gid_t_
+    typedef f_id_t f_gid_t;
+
+    #define f_gid_t_initialize -1
+
+    #define macro_f_gid_t_clear(id) id = -1;
+  #endif // _di_f_gid_t_
+
+  /**
+   * The f_uid_t type, see f_id_t documentation.
+   */
+  #ifndef _di_f_uid_t_
+    typedef f_id_t f_uid_t;
+
+    #define f_uid_t_initialize -1
+
+    #define macro_f_uid_t_clear(id) id = -1;
+  #endif // _di_f_uid_t_
+#endif // _di_f_id_t_
+
+/**
+ * Array type for f_id_t.
+ *
+ * See the f_id_t documentation for further details.
+ */
+#ifndef _di_f_ids_t_
+  typedef f_uint32s_t f_ids_t;
+
+  #define f_ids_t_initialize f_uint32s_t_initialize
+
+  #define macro_f_ids_t_initialize_1(array, size, used) { array, size, used }
+  #define macro_f_ids_t_initialize_2(array, length) { array, length, length }
+
+  /**
+   * The f_gids_t type, see f_ids_t documentation.
+   */
+  #ifndef _di_f_gids_t_
+    typedef f_ids_t f_gids_t;
+
+    #define f_gids_t_initialize f_ids_t_initialize
+
+    #define macro_f_gids_t_initialize_1(array, size, used) { array, size, used }
+    #define macro_f_gids_t_initialize_2(array, length) { array, length, length }
+  #endif // _di_f_gids_t_
+
+  /**
+   * The f_uids_t type, see f_ids_t documentation.
+   */
+  #ifndef _di_f_uids_t_
+    typedef f_ids_t f_uids_t;
+
+    #define f_uids_t_initialize f_ids_t_initialize
+
+    #define macro_f_uids_t_initialize_1(array, size, used) { array, size, used }
+    #define macro_f_uids_t_initialize_2(array, length) { array, length, length }
+  #endif // _di_f_uids_t_
+#endif // _di_f_ids_t_
+
+/**
+ * Array type for f_ids_t.
+ *
+ * See the f_ids_t documentation for further details.
+ */
+#ifndef _di_f_idss_t_
+  typedef f_uint32ss_t f_idss_t;
+
+  #define f_idss_t_initialize f_uint32ss_t_initialize
+
+  #define macro_f_idss_t_initialize_1(array, size, used) { array, size, used }
+  #define macro_f_idss_t_initialize_2(array, length) { array, length, length }
+
+  /**
+   * The f_gidss_t type, see f_idss_t documentation.
+   */
+  #ifndef _di_f_gidss_t_
+    typedef f_idss_t f_gidss_t;
+
+    #define f_gidss_t_initialize f_idss_t_initialize
+
+    #define macro_f_gidss_t_initialize_1(array, size, used) { array, size, used }
+    #define macro_f_gidss_t_initialize_2(array, length) { array, length, length }
+  #endif // _di_f_gids_t_
+
+  /**
+   * The f_uidss_t type, see f_idss_t documentation.
+   */
+  #ifndef _di_f_uidss_t_
+    typedef f_idss_t f_uidss_t;
+
+    #define f_uidss_t_initialize f_idss_t_initialize
+
+    #define macro_f_uidss_t_initialize_1(array, size, used) { array, size, used }
+    #define macro_f_uidss_t_initialize_2(array, length) { array, length, length }
+  #endif // _di_f_uidss_t_
+#endif // _di_f_idss_t_
+
 #ifdef __cplusplus
 } // extern "C"
 #endif

diff --git a/level_0/f_type/c/type/state.h b/level_0/f_type/c/type/state.h
index 453ce23eb80c726a4b5314f97e2a02714100e179..83c5a45bf7b5aecd1fb4daeae721dc3a32ddb284 100644 (file)
--- a/level_0/f_type/c/type/state.h
+++ b/level_0/f_type/c/type/state.h
@@ -52,6 +52,8 @@ extern "C" {
  *   This response is handled within f_talk().
  *   The f_talk() function will then set the state.status when done and might immediately set state.status to F_interrupt (with error bit) if bob_interrupts() returns F_interrupt (with/without error bit).
  *
+ * This provides f_state_call_t (and f_state_call_t_initialize) to simplify the function callback usage.
+ *
  * Properties:
  *   - step_large: The allocation step to use for large buffers.
  *   - step_small: The allocation step to use for small buffers.
@@ -67,6 +69,8 @@ extern "C" {
 #ifndef _di_f_state_t_
   typedef struct f_state_t_ f_state_t;
 
+  typedef void (*f_state_call_t)(f_state_t * const state, void * const internal);
+
   struct f_state_t_ {
     uint16_t step_large;
     uint16_t step_small;
@@ -74,14 +78,16 @@ extern "C" {
     uint64_t flag;
     uint64_t code;
 
-    void (*handle)(f_state_t * const state, void * const internal);
-    void (*interrupt)(f_state_t * const state, void * const internal);
+    f_state_call_t handle;
+    f_state_call_t interrupt;
 
     void *callbacks;
     void *custom;
     void *data;
   };
 
+  #define f_state_call_t_initialize 0
+
   #define f_state_t_initialize { \
     F_memory_default_allocation_large_d, \
     F_memory_default_allocation_small_d, \

diff --git a/level_0/f_type/data/build/settings b/level_0/f_type/data/build/settings
index 23100c5489902add48d2a769a4ffe477d15615eb..ef497da87be017df18ca066c825be852c189d128 100644 (file)
--- a/level_0/f_type/data/build/settings
+++ b/level_0/f_type/data/build/settings
@@ -35,7 +35,7 @@ build_language c
 
 build_libraries -lc
 
-build_sources_headers type.h type/cell.h type/file.h type/fll.h type/mode.h type/number.h type/pid.h type/quantity.h type/range.h type/range_double.h type/state.h type/status.h type/time.h
+build_sources_headers type.h type/cell.h type/file.h type/fll.h type/mode.h type/number.h type/pid.h type/quantity.h type/range.h type/range_double.h type/state.h type/status.h type/time.h type/void.h
 
 build_script yes
 build_shared yes

diff --git a/level_0/f_type_array/c/type_array/uint32.h b/level_0/f_type_array/c/type_array/uint32.h
index 1f6632e0712e9106515d33556920affa202ac8ab..31ca973c1eff35ef22863f654779fbf7094e65d5 100644 (file)
--- a/level_0/f_type_array/c/type_array/uint32.h
+++ b/level_0/f_type_array/c/type_array/uint32.h
@@ -76,6 +76,29 @@ extern "C" {
   extern f_status_t f_uint32ss_destroy_callback(const f_number_unsigned_t start, const f_number_unsigned_t stop, void * const array);
 #endif // _di_f_uint32ss_destroy_callback_
 
+/**
+ * Delete callback macros mapping functions for the f_id_t, f_uid_t, and f_gid_t array type callbacks.
+ */
+#ifndef _di_f_idss_delete_callback_
+  #define f_idss_delete_callback f_uint32ss_delete_callback
+
+  #ifndef _di_f_gidss_delete_callback_
+    #define f_gidss_delete_callback f_idss_delete_callback
+  #endif // _di_f_gidss_delete_callback_
+
+  #ifndef _di_f_gidss_delete_callback_
+    #define f_gidss_delete_callback f_idss_delete_callback
+  #endif // _di_f_gidss_delete_callback_
+
+  #ifndef _di_f_uidss_destroy_callback_
+    #define f_uidss_destroy_callback f_idss_destroy_callback
+  #endif // _di_f_uidss_destroy_callback_
+
+  #ifndef _di_f_uidss_destroy_callback_
+    #define f_uidss_destroy_callback f_idss_destroy_callback
+  #endif // _di_f_uidss_destroy_callback_
+#endif // _di_f_idss_delete_callback_
+
 #ifdef __cplusplus
 } // extern "C"
 #endif

diff --git a/level_1/fl_execute/c/execute/common.h b/level_1/fl_execute/c/execute/common.h
index 797c987fa13bb98394cdfda4e74cae25406753de..cfb8fbcc7bb5bc255bf800a2be34580c5f063d95 100644 (file)
--- a/level_1/fl_execute/c/execute/common.h
+++ b/level_1/fl_execute/c/execute/common.h
@@ -90,8 +90,8 @@ extern "C" {
 #ifndef _di_fl_execute_as_t_
   typedef struct {
     int *nice;
-    uid_t *id_user;
-    gid_t *id_group;
+    f_uid_t *id_user;
+    f_gid_t *id_group;
 
     f_int32s_t *affinity;
     f_capability_t capability;

diff --git a/level_2/fll_file/c/file.c b/level_2/fll_file/c/file.c
index 04664cc725449e077d7f58796f6eda2f1e9056ec..9dd6168c4e36c94be8c86e9548a6ab4219b4f06a 100644 (file)
--- a/level_2/fll_file/c/file.c
+++ b/level_2/fll_file/c/file.c
@@ -15,7 +15,7 @@ extern "C" {
 #endif // _di_fll_file_mode_set_all_
 
 #ifndef _di_fll_file_role_change_all_
-  f_status_t fll_file_role_change_all(const f_string_static_t path, const uid_t uid, const gid_t gid, const bool dereference, const f_number_unsigned_t depth_max) {
+  f_status_t fll_file_role_change_all(const f_string_static_t path, const f_uid_t uid, const f_gid_t gid, const bool dereference, const f_number_unsigned_t depth_max) {
     #ifndef _di_level_2_parameter_checking_
       if (uid == -1 && gid == -1) return F_status_set_error(F_parameter);
     #endif // _di_level_2_parameter_checking_

diff --git a/level_2/fll_file/c/file.h b/level_2/fll_file/c/file.h
index c6bdbf61d9f3f8a52d7408c843d6b092a05e309d..0fd7acb9a989785ec3615b608caa99858cfae38e 100644 (file)
--- a/level_2/fll_file/c/file.h
+++ b/level_2/fll_file/c/file.h
@@ -115,7 +115,7 @@ extern "C" {
  *   Errors (with error bit) from: fl_directory_list().
  */
 #ifndef _di_fll_file_role_change_all_
-  extern f_status_t fll_file_role_change_all(const f_string_static_t path, const uid_t uid, const gid_t gid, const bool dereference, const f_number_unsigned_t depth_max);
+  extern f_status_t fll_file_role_change_all(const f_string_static_t path, const f_uid_t uid, const f_gid_t gid, const bool dereference, const f_number_unsigned_t depth_max);
 #endif // _di_fll_file_role_change_all_
 
 #ifdef __cplusplus

diff --git a/level_2/fll_file/c/private-file.c b/level_2/fll_file/c/private-file.c
index 5daa74ae2a2e1b55ad8382bb5854126f1fe4ce19..655a2812cc64bcd4763ffa5dda35f387b41beb35 100644 (file)
--- a/level_2/fll_file/c/private-file.c
+++ b/level_2/fll_file/c/private-file.c
@@ -105,7 +105,7 @@ extern "C" {
 #endif // !defined(_di_fll_file_mode_set_all_)
 
 #if !defined(_di_fll_file_role_change_all_)
-  f_status_t private_fll_file_role_change_all(const f_string_static_t path, const uid_t uid, const gid_t gid, const bool dereference, const f_number_unsigned_t depth_max, const f_number_unsigned_t depth) {
+  f_status_t private_fll_file_role_change_all(const f_string_static_t path, const f_uid_t uid, const f_gid_t gid, const bool dereference, const f_number_unsigned_t depth_max, const f_number_unsigned_t depth) {
 
     f_status_t status = F_okay;
 

diff --git a/level_2/fll_file/c/private-file.h b/level_2/fll_file/c/private-file.h
index c64b222fbf8c2c0ba3447a8ae100524c265a513a..2f3666102a77a0a721ebd2c4a99a9c44abf1b975 100644 (file)
--- a/level_2/fll_file/c/private-file.h
+++ b/level_2/fll_file/c/private-file.h
@@ -89,7 +89,7 @@ extern "C" {
  *   F_failure (with error bit) for any other error.
  */
 #if !defined(_di_fll_file_role_change_all_)
-  extern f_status_t private_fll_file_role_change_all(const f_string_static_t path, const uid_t uid, const gid_t gid, const bool dereference, const f_number_unsigned_t depth_max, const f_number_unsigned_t depth) F_attribute_visibility_internal_d;
+  extern f_status_t private_fll_file_role_change_all(const f_string_static_t path, const f_uid_t uid, const f_gid_t gid, const bool dereference, const f_number_unsigned_t depth_max, const f_number_unsigned_t depth) F_attribute_visibility_internal_d;
 #endif // !defined(_di_fll_file_role_change_all_)
 
 #ifdef __cplusplus

diff --git a/level_3/fake/c/main/make.c b/level_3/fake/c/main/make.c
index d7104672fbc3ea9384de5ad7dc134e46eff65997..7e1bed3a1fea224df855414358ba3b4cba2d8df7 100644 (file)
--- a/level_3/fake/c/main/make.c
+++ b/level_3/fake/c/main/make.c
@@ -70,12 +70,12 @@ extern "C" {
       // When the buffer is not a number, then check to see if this is a group or owner name.
       if (F_status_set_fine(main->setting.state.status) == F_number) {
         if (is_owner) {
-          uid_t uid = 0;
+          f_uid_t uid = f_uid_t_initialize;
 
           main->setting.state.status = f_account_id_by_name(buffer, &uid);
         }
         else {
-          gid_t gid = 0;
+          f_gid_t gid = f_gid_t_initialize;
 
           main->setting.state.status = f_account_group_id_by_name(buffer, &gid);
         }

diff --git a/level_3/fake/c/main/make.h b/level_3/fake/c/main/make.h
index a6981a0e4736b7b7e6eaa07fd359cc8c3e9574b2..a8ad60a5830630d63210617c97f12951809878b2 100644 (file)
--- a/level_3/fake/c/main/make.h
+++ b/level_3/fake/c/main/make.h
@@ -64,8 +64,8 @@ extern "C" {
  *
  * @return
  *   The detected owner id or group id.
- *   When is_owner is TRUE, then this should be cast to type (uid_t *).
- *   When is_owner is TRUE, then this should be cast to type (gid_t *).
+ *   When is_owner is TRUE, then this should be cast to type (f_uid_t *) or (f_id_t *).
+ *   When is_owner is FALSE, then this should be cast to type (f_gid_t *) or (f_id_t *).
  *   This is set to 0 on any error, check data_make.main->setting.state.status for error.
  *
  * @see f_account_group_id_by_name()

diff --git a/level_3/fake/c/main/make/operate_process_type.c b/level_3/fake/c/main/make/operate_process_type.c
index 6c93026af22785c54e09568279bb7c2d7b8c2f08..8b9b9181c87f79a66b9dab62b1bcdcb7d148152c 100644 (file)
--- a/level_3/fake/c/main/make/operate_process_type.c
+++ b/level_3/fake/c/main/make/operate_process_type.c
@@ -527,7 +527,7 @@ extern "C" {
 
     fake_main_t * const main = data_make->main;
 
-    gid_t id = 0;
+    f_gid_t id = f_gid_t_initialize;
     bool dereference = F_true;
     f_number_unsigned_t i = 0;
 
@@ -538,7 +538,7 @@ extern "C" {
       dereference = F_false;
     }
 
-    id = (gid_t) fake_make_get_id(data_make, F_false, main->cache_arguments.array[i++]);
+    id = (f_gid_t) fake_make_get_id(data_make, F_false, main->cache_arguments.array[i++]);
 
     if (F_status_is_error(main->setting.state.status)) {
       main->setting.state.status = F_status_set_error(F_failure);
@@ -958,7 +958,7 @@ extern "C" {
 
     fake_main_t * const main = data_make->main;
 
-    uid_t id = 0;
+    f_uid_t id = f_uid_t_initialize;
     f_number_unsigned_t i = if_not ? 2 : 1;
     bool dereference = F_true;
 
@@ -969,7 +969,7 @@ extern "C" {
       dereference = F_false;
     }
 
-    id = (uid_t) fake_make_get_id(data_make, F_true, main->cache_arguments.array[i++]);
+    id = (f_uid_t) fake_make_get_id(data_make, F_true, main->cache_arguments.array[i++]);
 
     if (F_status_is_error(main->setting.state.status)) {
       state_process->condition_result = fake_condition_result_error_e;
@@ -983,7 +983,7 @@ extern "C" {
 
     state_process->condition_result = fake_condition_result_true_e;
 
-    for (uid_t id_file = 0; i < main->cache_arguments.used; ++i, id_file = 0) {
+    for (f_uid_t id_file = 0; i < main->cache_arguments.used; ++i, id_file = 0) {
 
       main->setting.state.status = f_file_group_read(main->cache_arguments.array[i], dereference, &id_file);
 
@@ -1123,7 +1123,7 @@ extern "C" {
 
     fake_main_t * const main = data_make->main;
 
-    uid_t id = 0;
+    f_uid_t id = f_uid_t_initialize;
     f_number_unsigned_t i = if_not ? 2 : 1;
     bool dereference = F_true;
 
@@ -1134,7 +1134,7 @@ extern "C" {
       dereference = F_false;
     }
 
-    id = (uid_t) fake_make_get_id(data_make, F_true, main->cache_arguments.array[i++]);
+    id = (f_uid_t) fake_make_get_id(data_make, F_true, main->cache_arguments.array[i++]);
 
     if (F_status_is_error(main->setting.state.status)) {
       state_process->condition_result = fake_condition_result_error_e;
@@ -1148,7 +1148,7 @@ extern "C" {
 
     state_process->condition_result = fake_condition_result_true_e;
 
-    for (uid_t id_file = 0; i < main->cache_arguments.used; ++i, id_file = 0) {
+    for (f_uid_t id_file = 0; i < main->cache_arguments.used; ++i, id_file = 0) {
 
       main->setting.state.status = f_file_owner_read(main->cache_arguments.array[i], dereference, &id_file);
 
@@ -1614,7 +1614,7 @@ extern "C" {
 
     fake_main_t * const main = data_make->main;
 
-    uid_t id = 0;
+    f_uid_t id = f_uid_t_initialize;
     bool dereference = F_true;
     f_number_unsigned_t i = 0;
 
@@ -1623,7 +1623,7 @@ extern "C" {
       dereference = F_false;
     }
 
-    id = (uid_t) fake_make_get_id(data_make, F_true, main->cache_arguments.array[i++]);
+    id = (f_uid_t) fake_make_get_id(data_make, F_true, main->cache_arguments.array[i++]);
 
     if (F_status_is_error(main->setting.state.status)) {
       fake_print_error(&main->program.error, macro_fake_f(fake_make_get_id));