Merge pull request #616 from lopopolo/lopopolo/nix-for-history-umask

Use `nix` APIs for `umask` munging in `history` module
kkawakam · Apr 11, 2022 · 8b0877a · 8b0877a
2 parents 01d01d8 + f905c6d
commit 8b0877a
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/history.rs b/src/history.rs
@@ -552,21 +552,21 @@ cfg_if::cfg_if! {
 
         fn fix_perm(_: &File) {}
     } else if #[cfg(unix)] {
-        fn umask() -> libc::mode_t {
-            unsafe { libc::umask(libc::S_IXUSR | libc::S_IRWXG | libc::S_IRWXO) }
+        fn umask() -> nix::sys::stat::Mode {
+            use nix::sys::stat::Mode;
+
+            nix::sys::stat::umask(Mode::S_IXUSR | Mode::S_IRWXG | Mode::S_IRWXO)
         }
 
-        fn restore_umask(old_umask: libc::mode_t) {
-            unsafe {
-                libc::umask(old_umask);
-            }
+        fn restore_umask(old_umask: nix::sys::stat::Mode) {
+            nix::sys::stat::umask(old_umask);
         }
 
         fn fix_perm(file: &File) {
             use std::os::unix::io::AsRawFd;
-            unsafe {
-                libc::fchmod(file.as_raw_fd(), libc::S_IRUSR | libc::S_IWUSR);
-            }
+            use nix::sys::stat::{fchmod, Mode};
+
+            let _ = fchmod(file.as_raw_fd(), Mode::S_IRUSR | Mode::S_IWUSR);
         }
     }
 }