Musl merge: priority APIs

m4/Cargo.toml

@@ -16,7 +16,7 @@ path = "src/main.rs"
 [dependencies]
 clap.workspace = true
 env_logger = "0.11"
-errno = "0.3"
+errno.workspace = true
 libc.workspace = true
 log = "0.4"
 nom = "7.1"

plib/Cargo.toml

@@ -7,7 +7,9 @@ license = "MIT"
 repository = "https://github.com/rustcoreutils/posixutils-rs.git"
 
 [dependencies]
+cfg-if = "1.0"
 libc.workspace = true
+errno.workspace = true
 
 [lib]
 doctest = false

plib/src/lib.rs

@@ -12,6 +12,7 @@ pub mod group;
 pub mod io;
 pub mod lzw;
 pub mod modestr;
+pub mod priority;
 pub mod sccsfile;
 pub mod testing;
 pub mod utmpx;

plib/src/priority.rs

@@ -0,0 +1,51 @@
+//
+// Copyright (c) 2024 Hemi Labs, Inc.
+//
+// This file is part of the posixutils-rs project covered under
+// the MIT License.  For the full license text, please see the LICENSE
+// file in the root directory of this project.
+// SPDX-License-Identifier: MIT
+//
+// NOTES:
+// - Having console output in this module is probably wrong.  This
+//   should be a library module, moving console output back into
+//   the application... which implies errno handling probably
+//   should be done in the application as well.
+//
+
+use std::io;
+
+cfg_if::cfg_if! {
+    if #[cfg(any(target_os = "macos", target_env = "musl"))] {
+        type PPriorityWhichT = libc::c_int;
+    } else {
+        type PPriorityWhichT = libc::__priority_which_t;
+    }
+}
+
+pub fn getpriority(which: u32, id: u32) -> io::Result<i32> {
+    errno::set_errno(errno::Errno(0));
+
+    let res = unsafe { libc::getpriority(which as PPriorityWhichT, id) };
+
+    let errno_res = errno::errno().0;
+    if errno_res == 0 {
+        Ok(res)
+    } else {
+        let e = io::Error::from_raw_os_error(errno_res);
+        eprintln!("getpriority: {e}");
+        Err(e)
+    }
+}
+
+pub fn setpriority(which: u32, id: u32, prio: i32) -> io::Result<()> {
+    let res = unsafe { libc::setpriority(which as PPriorityWhichT, id, prio) };
+
+    if res < 0 {
+        let e = io::Error::last_os_error();
+        eprintln!("setpriority: {e}");
+        Err(e)
+    } else {
+        Ok(())
+    }
+}

process/Cargo.toml

@@ -12,7 +12,6 @@ clap.workspace = true
 gettext-rs.workspace = true
 libc.workspace = true
 atty.workspace = true
-errno = "0.3"
 dirs = "5.0"
 
 [[bin]]

process/renice.rs

@@ -8,12 +8,11 @@
 //
 
 use clap::Parser;
-use errno::{errno, set_errno};
 use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory};
 use libc::{getpwnam, passwd};
+use plib::priority::{getpriority, setpriority};
 use plib::PROJECT_NAME;
 use std::ffi::CString;
-use std::io;
 
 const PRIO_MIN: i32 = -20;
 const PRIO_MAX: i32 = 20;
@@ -75,41 +74,6 @@ fn parse_id(which: u32, input: &str) -> Result<u32, &'static str> {
     }
 }
 
-fn xgetpriority(which: u32, id: u32) -> io::Result<i32> {
-    set_errno(errno::Errno(0));
-
-    #[cfg(not(target_os = "macos"))]
-    let res = unsafe { libc::getpriority(which, id) };
-
-    #[cfg(target_os = "macos")]
-    let res = unsafe { libc::getpriority(which as i32, id) };
-
-    let errno_res = errno().0;
-    if errno_res == 0 {
-        Ok(res)
-    } else {
-        let e = io::Error::from_raw_os_error(errno_res);
-        eprintln!("getpriority: {}", e);
-        Err(e)
-    }
-}
-
-fn xsetpriority(which: u32, id: u32, prio: i32) -> io::Result<()> {
-    #[cfg(not(target_os = "macos"))]
-    let res = unsafe { libc::setpriority(which, id, prio) };
-
-    #[cfg(target_os = "macos")]
-    let res = unsafe { libc::setpriority(which as i32, id, prio) };
-
-    if res < 0 {
-        let e = io::Error::last_os_error();
-        eprintln!("setpriority: {}", e);
-        Err(e)
-    } else {
-        Ok(())
-    }
-}
-
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     // parse command line arguments
     let args = Args::parse();
@@ -133,13 +97,13 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let id = parse_id(which, &args.id)?;
 
     // get current priority
-    let prio = xgetpriority(which, id)?;
+    let prio = getpriority(which, id)?;
 
     // adjust priority based on user input
     let newprio = (prio + args.niceval).clamp(PRIO_MIN, PRIO_MAX);
 
     // attempt to set new priority
-    xsetpriority(which, id, newprio)?;
+    setpriority(which, id, newprio)?;
 
     Ok(())
 }