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

Fix OSX crash for uptime

Browse source
This commit is contained in:
Kevin Butler 2014-03-25 15:59:29 +00:00
parent 0192235a1a
commit 4b857105c9
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
uptime/uptime.rs
View file

@ -127,7 +127,6 @@ fn print_nusers() {
} }
} }
fn print_time() { fn print_time() {
let local_time = unsafe { *localtime(&time(null())) }; let local_time = unsafe { *localtime(&time(null())) };
@ -139,16 +138,21 @@ fn print_time() {
} }
fn get_uptime() -> int { fn get_uptime() -> int {
let uptime_text = File::open(&Path::new("/proc/uptime")) let proc_uptime = File::open(&Path::new("/proc/uptime"))
.read_to_str().unwrap(); .read_to_str();
return match uptime_text.words().next() { let uptime_text = match proc_uptime {
Ok(s) => s,
_ => return -1
};
match uptime_text.words().next() {
Some(s) => match from_str(s.replace(".","")) { Some(s) => match from_str(s.replace(".","")) {
Some(n) => n, Some(n) => n,
None => -1 None => -1
}, },
None => -1 None => -1
}; }
} }
fn print_uptime() { fn print_uptime() {
@ -156,7 +160,7 @@ fn print_uptime() {
let updays = uptime / 86400; let updays = uptime / 86400;
let uphours = (uptime - (updays * 86400)) / 3600; let uphours = (uptime - (updays * 86400)) / 3600;
let upmins = (uptime - (updays * 86400) - (uphours * 3600)) / 60; let upmins = (uptime - (updays * 86400) - (uphours * 3600)) / 60;
if updays == 1 { if updays == 1 {
print!("up {:1d} day, {:2d}:{:02d}, ", updays, uphours, upmins); print!("up {:1d} day, {:2d}:{:02d}, ", updays, uphours, upmins);
} }
else if updays > 1 { else if updays > 1 {