mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-07-29 03:57:44 +00:00
sleep: handle infinity
This commit is contained in:
parent
49cf9cc419
commit
a9cf7baf68
1 changed files with 6 additions and 3 deletions
|
@ -14,9 +14,10 @@
|
||||||
extern crate getopts;
|
extern crate getopts;
|
||||||
extern crate libc;
|
extern crate libc;
|
||||||
|
|
||||||
use std::num;
|
use std::f64;
|
||||||
use std::os;
|
use std::os;
|
||||||
use std::io::{print, timer};
|
use std::io::{print, timer};
|
||||||
|
use std::u64;
|
||||||
|
|
||||||
#[path = "../common/util.rs"]
|
#[path = "../common/util.rs"]
|
||||||
mod util;
|
mod util;
|
||||||
|
@ -79,7 +80,7 @@ fn sleep(args: Vec<String>) {
|
||||||
if suffix_time == 0 {
|
if suffix_time == 0 {
|
||||||
0.0
|
0.0
|
||||||
} else {
|
} else {
|
||||||
match num::from_str_radix::<f64>((arg.as_slice()), 10) {
|
match from_str::<f64>(arg.as_slice()) {
|
||||||
Some(m) => m,
|
Some(m) => m,
|
||||||
None => {
|
None => {
|
||||||
crash!(1, "Invalid time interval '{}'", arg.to_string())
|
crash!(1, "Invalid time interval '{}'", arg.to_string())
|
||||||
|
@ -88,7 +89,7 @@ fn sleep(args: Vec<String>) {
|
||||||
};
|
};
|
||||||
result + num * suffix_time as f64
|
result + num * suffix_time as f64
|
||||||
});
|
});
|
||||||
timer::sleep((sleep_time * 1000.0) as u64);
|
timer::sleep(if sleep_time == f64::INFINITY { u64::MAX } else { (sleep_time * 1000.0) as u64 });
|
||||||
}
|
}
|
||||||
|
|
||||||
fn match_suffix(arg: &str) -> Result<(String, int), String> {
|
fn match_suffix(arg: &str) -> Result<(String, int), String> {
|
||||||
|
@ -100,6 +101,8 @@ fn match_suffix(arg: &str) -> Result<(String, int), String> {
|
||||||
val => {
|
val => {
|
||||||
if !val.is_alphabetic() {
|
if !val.is_alphabetic() {
|
||||||
return Ok((arg.to_string(), 1))
|
return Ok((arg.to_string(), 1))
|
||||||
|
} else if arg == "inf" || arg == "infinity" {
|
||||||
|
return Ok(("inf".to_string(), 1))
|
||||||
} else {
|
} else {
|
||||||
return Err(format!("Invalid time interval '{}'", arg))
|
return Err(format!("Invalid time interval '{}'", arg))
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue