From 6e2f6b28454c56d262eb7b49ef7b41e65c6be43f Mon Sep 17 00:00:00 2001 From: David CARLIER Date: Mon, 9 Aug 2021 21:56:12 +0100 Subject: [PATCH] nice little code simplification, included already in the libc for all unixes --- src/uu/nice/src/nice.rs | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/uu/nice/src/nice.rs b/src/uu/nice/src/nice.rs index d5a4094d1..49efe32e0 100644 --- a/src/uu/nice/src/nice.rs +++ b/src/uu/nice/src/nice.rs @@ -10,21 +10,13 @@ #[macro_use] extern crate uucore; -use libc::{c_char, c_int, execvp}; +use libc::{c_char, c_int, execvp, PRIO_PROCESS}; use std::ffi::CString; use std::io::Error; use std::ptr; use clap::{crate_version, App, AppSettings, Arg}; -// XXX: PRIO_PROCESS is 0 on at least FreeBSD and Linux. Don't know about Mac OS X. -const PRIO_PROCESS: c_int = 0; - -extern "C" { - fn getpriority(which: c_int, who: c_int) -> c_int; - fn setpriority(which: c_int, who: c_int, prio: c_int) -> c_int; -} - pub mod options { pub static ADJUSTMENT: &str = "adjustment"; pub static COMMAND: &str = "COMMAND"; @@ -50,7 +42,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { let mut niceness = unsafe { nix::errno::Errno::clear(); - getpriority(PRIO_PROCESS, 0) + libc::getpriority(PRIO_PROCESS, 0) }; if Error::last_os_error().raw_os_error().unwrap() != 0 { show_error!("getpriority: {}", Error::last_os_error()); @@ -84,7 +76,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 { }; niceness += adjustment; - if unsafe { setpriority(PRIO_PROCESS, 0, niceness) } == -1 { + if unsafe { libc::setpriority(PRIO_PROCESS, 0, niceness) } == -1 { show_warning!("setpriority: {}", Error::last_os_error()); }