RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-08-02 22:17:45 +00:00
Code Issues Activity

fix uptime

Browse source
This commit is contained in:
kwantam 2015-04-27 22:00:19 -04:00
parent a122849e7c
commit 1d62f35b45
1 changed files with 26 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/uptime/uptime.rs
View file

@ -1,5 +1,5 @@
#![crate_name = "uptime"] #![crate_name = "uptime"]
#![feature(collections, core, old_io, old_path, rustc_private, std_misc, str_words)] #![feature(rustc_private)]
/* /*
* This file is part of the uutils coreutils package. * This file is part of the uutils coreutils package.
@ -12,15 +12,14 @@
/* last synced with: cat (GNU coreutils) 8.13 */ /* last synced with: cat (GNU coreutils) 8.13 */
#![allow(non_camel_case_types)]
extern crate getopts; extern crate getopts;
extern crate libc; extern crate libc;
extern crate time as rtime; extern crate time as rtime;
use std::ffi::CString; use std::ffi::CString;
use std::fs::File;
use std::io::{Read, Write};
use std::mem::transmute; use std::mem::transmute;
use std::old_io::{print, File};
use std::ptr::null; use std::ptr::null;
use libc::{time_t, c_double, c_int, c_char}; use libc::{time_t, c_double, c_int, c_char};
use utmpx::*; use utmpx::*;
@ -61,7 +60,7 @@ pub fn uumain(args: Vec<String>) -> i32 {
getopts::optflag("v", "version", "output version information and exit"), getopts::optflag("v", "version", "output version information and exit"),
getopts::optflag("h", "help", "display this help and exit"), getopts::optflag("h", "help", "display this help and exit"),
]; ];
let matches = match getopts::getopts(args.tail(), &opts) { let matches = match getopts::getopts(&args[1..], &opts) {
Ok(m) => m, Ok(m) => m,
Err(f) => crash!(1, "Invalid options\n{}", f) Err(f) => crash!(1, "Invalid options\n{}", f)
}; };
@ -73,9 +72,9 @@ pub fn uumain(args: Vec<String>) -> i32 {
println!("Usage:"); println!("Usage:");
println!(" {0} [OPTION]", program); println!(" {0} [OPTION]", program);
println!(""); println!("");
print(getopts::usage("Print the current time, the length of time the system has been up,\n\ println!("{}", getopts::usage("Print the current time, the length of time the system has been up,\n\
the number of users on the system, and the average number of jobs\n\ the number of users on the system, and the average number of jobs\n\
in the run queue over the last 1, 5 and 15 minutes.", &opts).as_slice()); in the run queue over the last 1, 5 and 15 minutes.", &opts));
return 0; return 0;
} }
@ -98,7 +97,7 @@ fn print_loadavg() {
} }
else { else {
print!("load average: "); print!("load average: ");
for n in range(0, loads) { for n in 0..loads {
print!("{:.2}{}", avg[n as usize], if n == loads - 1 { "\n" } print!("{:.2}{}", avg[n as usize], if n == loads - 1 { "\n" }
else { ", " } ); else { ", " } );
} }
@ -164,27 +163,23 @@ fn print_time() {
#[cfg(unix)] #[cfg(unix)]
fn get_uptime(boot_time: Option<time_t>) -> i64 { fn get_uptime(boot_time: Option<time_t>) -> i64 {
let proc_uptime = File::open(&Path::new("/proc/uptime")) let mut proc_uptime = String::new();
.read_to_string();
let uptime_text = match proc_uptime { if let Some(n) =
Ok(s) => s, File::open("/proc/uptime").ok()
_ => return match boot_time { .and_then(|mut f| f.read_to_string(&mut proc_uptime).ok())
.and_then(|_| proc_uptime.split_whitespace().next())
.and_then(|s| s.replace(".", "").parse().ok()) {
n
} else {
match boot_time {
Some(t) => { Some(t) => {
let now = rtime::get_time().sec; let now = rtime::get_time().sec;
let time = t as i64; let time = t as i64;
((now - time) * 100) as i64 // Return in ms ((now - time) * 100)
}, },
_ => -1 _ => -1,
} }
};
match uptime_text.as_slice().words().next() {
Some(s) => match s.replace(".", "").as_slice().parse() {
Ok(n) => n,
Err(_) => -1
},
None => -1
} }
} }