RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-27 19:17:43 +00:00
Code Issues Activity

Merge pull request #2560 from devnexen/nice_simpl

Browse source 
nice little code simplification, included already in the libc
This commit is contained in:
Sylvestre Ledru 2021-08-09 23:25:38 +02:00 • committed by GitHub
commit 7cbf48c3c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/uu/nice/src/nice.rs
View file

@ -10,21 +10,13 @@
#[macro_use] #[macro_use]
extern crate uucore; 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::ffi::CString;
use std::io::Error; use std::io::Error;
use std::ptr; use std::ptr;
use clap::{crate_version, App, AppSettings, Arg}; 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 mod options {
pub static ADJUSTMENT: &str = "adjustment"; pub static ADJUSTMENT: &str = "adjustment";
pub static COMMAND: &str = "COMMAND"; pub static COMMAND: &str = "COMMAND";
@ -50,7 +42,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
let mut niceness = unsafe { let mut niceness = unsafe {
nix::errno::Errno::clear(); nix::errno::Errno::clear();
getpriority(PRIO_PROCESS, 0) libc::getpriority(PRIO_PROCESS, 0)
}; };
if Error::last_os_error().raw_os_error().unwrap() != 0 { if Error::last_os_error().raw_os_error().unwrap() != 0 {
show_error!("getpriority: {}", Error::last_os_error()); show_error!("getpriority: {}", Error::last_os_error());
@ -84,7 +76,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
}; };
niceness += adjustment; 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()); show_warning!("setpriority: {}", Error::last_os_error());
} }