wall: get macos to use correct types

Author: 0jdxt

src/uu/wall/src/wall.rs

@@ -311,26 +311,21 @@ fn is_gr_member(user: &[c_char], gid: gid_t) -> bool {
     // on macos, getgrouplist takes c_int as its group argument,
     // other unices should use gid_t like linux
     #[cfg(target_os = "macos")]
-    let base_gid = group as libc::c_int;
-    #[cfg(not(target_os = "macos"))]
-    let base_gid = group;
+    let group = group as libc::c_int;
 
     // otherwise check gid is in list of supplementary groups user belongs to
     let mut ngroups = 16;
-    let mut groups: Vec<gid_t> = vec![0; ngroups as usize];
-    while unsafe {
-        libc::getgrouplist(
-            user.as_ptr(),
-            base_gid,
-            groups.as_mut_ptr(),
-            &raw mut ngroups,
-        )
-    } == -1
+    let mut groups = vec![0; ngroups as usize];
+    while unsafe { libc::getgrouplist(user.as_ptr(), group, groups.as_mut_ptr(), &raw mut ngroups) }
+        == -1
     {
         // ret -1 means buffer was too small so we resize
         // according to the returned ngroups value
         groups.resize(ngroups as usize, 0);
     }
+
+    #[cfg(target_os = "macos")]
+    let gid = gid as libc::c_int;
     groups.contains(&gid)
 }
 

tests/by-util/test_wall.rs

@@ -3,7 +3,9 @@ mod tests {
     use uutests::new_ucmd;
 
     #[test]
-    fn test_invalid_arg() { new_ucmd!().arg("--definitely-invalid").fails().code_is(1); }
+    fn test_invalid_arg() {
+        new_ucmd!().arg("--definitely-invalid").fails().code_is(1);
+    }
 
     #[test]
     fn test_fails_on_invalid_group() {
@@ -46,5 +48,7 @@ mod tests {
     }
 
     #[test]
-    fn test_succeeds_no_stdout() { new_ucmd!().pipe_in("pipe me").succeeds().stdout_is(""); }
+    fn test_succeeds_no_stdout() {
+        new_ucmd!().pipe_in("pipe me").succeeds().stdout_is("");
+    }
 }