|
8 | 8 | use clap::{Arg, ArgAction, Command}; |
9 | 9 | use libc::PRIO_PROCESS; |
10 | 10 | use std::ffi::OsString; |
11 | | -use std::io::{Error, ErrorKind, Write, stdout}; |
| 11 | +use std::io::{Error, ErrorKind, Write, stderr, stdout}; |
12 | 12 | use std::num::IntErrorKind; |
13 | 13 | use std::os::unix::process::CommandExt; |
14 | 14 | use std::process; |
15 | 15 |
|
16 | 16 | use uucore::translate; |
17 | 17 | use uucore::{ |
18 | | - error::{UResult, USimpleError, UUsageError, set_exit_code}, |
| 18 | + error::{UResult, USimpleError, set_exit_code}, |
19 | 19 | format_usage, show_error, |
20 | 20 | }; |
21 | 21 |
|
@@ -121,10 +121,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { |
121 | 121 |
|
122 | 122 | let adjustment = if let Some(nstr) = matches.get_one::<String>(options::ADJUSTMENT) { |
123 | 123 | if !matches.contains_id(options::COMMAND) { |
124 | | - return Err(UUsageError::new( |
125 | | - 125, |
126 | | - translate!("nice-error-command-required-with-adjustment"), |
127 | | - )); |
| 124 | + let _ = writeln!( |
| 125 | + stderr(), |
| 126 | + "nice: {}", |
| 127 | + translate!("nice-error-command-required-with-adjustment") |
| 128 | + ); |
| 129 | + set_exit_code(125); |
| 130 | + return Ok(()); |
128 | 131 | } |
129 | 132 | match nstr.parse::<i32>() { |
130 | 133 | Ok(num) => num, |
@@ -155,7 +158,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { |
155 | 158 | if unsafe { libc::setpriority(PRIO_PROCESS, 0, niceness) } == -1 { |
156 | 159 | let warning_msg = translate!("nice-warning-setpriority", "util_name" => uucore::util_name(), "error" => Error::last_os_error()); |
157 | 160 |
|
158 | | - if write!(std::io::stderr(), "{warning_msg}").is_err() { |
| 161 | + if write!(stderr(), "{warning_msg}").is_err() { |
159 | 162 | set_exit_code(125); |
160 | 163 | return Ok(()); |
161 | 164 | } |
|
0 commit comments