Merge pull request #99 from Arcterus/du-and-id-fixes

du and id fixes
This commit is contained in:
Heather 2014-02-19 05:39:44 +03:00
commit 4dd5fab79d
5 changed files with 379 additions and 13 deletions

View file

@ -14,6 +14,7 @@ PROGS := \
dirname \
echo \
env \
du \
false \
mkdir \
printenv \

View file

@ -86,7 +86,6 @@ To do
- dd
- df
- dircolors
- du
- expand
- expr
- extent-scan

356
du/du.rs Normal file
View file

@ -0,0 +1,356 @@
#[crate_id(name="du", vers="1.0.0", author="Derek Chiang")];
/*
* This file is part of the uutils coreutils package.
*
* (c) Derek Chiang <derekchiang93@gmail.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
#[feature(macro_rules)];
extern crate extra;
extern crate getopts;
extern crate sync;
use std::os;
use std::io::fs;
use std::io::FileStat;
use std::option::Option;
use std::path::Path;
use extra::time::Timespec;
use sync::{Arc, Future};
#[path = "../util.rs"]
mod util;
static NAME: &'static str = "du";
static VERSION: &'static str = "1.0.0";
struct Options {
all: bool,
max_depth: Option<uint>,
total: bool,
separate_dirs: bool,
}
fn du(path: &Path, options_arc: Arc<Options>, depth: uint) -> ~[Arc<FileStat>] {
let mut stats = ~[];
let mut futures = ~[];
let options = options_arc.get();
let mut my_stat = safe_unwrap!(path.stat());
for f in safe_unwrap!(fs::readdir(path)).move_iter() {
match f.is_file() {
true => {
let stat = safe_unwrap!(f.stat());
my_stat.size += stat.size;
my_stat.unstable.blocks += stat.unstable.blocks;
if options.all {
stats.push(Arc::new(stat))
}
}
false => {
let oa_clone = options_arc.clone();
futures.push(Future::spawn(proc() { du(&f, oa_clone, depth + 1) }))
}
}
}
for future in futures.mut_iter() {
for stat_arc in future.get().move_rev_iter() {
let stat = stat_arc.get();
if !options.separate_dirs && stat.path.dir_path() == my_stat.path {
my_stat.size += stat.size;
my_stat.unstable.blocks += stat.unstable.blocks;
}
if options.max_depth == None || depth < options.max_depth.unwrap() {
stats.push(stat_arc.clone());
}
}
}
stats.push(Arc::new(my_stat));
return stats;
}
fn main() {
let args = os::args();
let program = args[0].clone();
let opts = ~[
// In task
getopts::optflag("a", "all", " write counts for all files, not just directories"),
// In main
getopts::optflag("", "apparent-size", "print apparent sizes, rather than disk usage;
although the apparent size is usually smaller, it may be larger due to holes
in ('sparse') files, internal fragmentation, indirect blocks, and the like"),
// In main
getopts::optopt("B", "block-size", "scale sizes by SIZE before printing them.
E.g., '-BM' prints sizes in units of 1,048,576 bytes. See SIZE format below.",
"SIZE"),
// In main
getopts::optflag("b", "bytes", "equivalent to '--apparent-size --block-size=1'"),
// In main
getopts::optflag("c", "total", "produce a grand total"),
// In task
// getopts::optflag("D", "dereference-args", "dereference only symlinks that are listed
// on the command line"),
// In main
// getopts::optopt("", "files0-from", "summarize disk usage of the NUL-terminated file
// names specified in file F;
// If F is - then read names from standard input", "F"),
// // In task
// getopts::optflag("H", "", "equivalent to --dereference-args (-D)"),
// In main
getopts::optflag("h", "human-readable", "print sizes in human readable format (e.g., 1K 234M 2G)"),
// In main
getopts::optflag("", "si", "like -h, but use powers of 1000 not 1024"),
// In main
getopts::optflag("k", "", "like --block-size=1K"),
// In task
getopts::optflag("l", "count-links", "count sizes many times if hard linked"),
// // In main
getopts::optflag("m", "", "like --block-size=1M"),
// // In task
// getopts::optflag("L", "dereference", "dereference all symbolic links"),
// // In task
// getopts::optflag("P", "no-dereference", "don't follow any symbolic links (this is the default)"),
// // In main
getopts::optflag("0", "null", "end each output line with 0 byte rather than newline"),
// In main
getopts::optflag("S", "separate-dirs", "do not include size of subdirectories"),
// In main
getopts::optflag("s", "summarize", "display only a total for each argument"),
// // In task
// getopts::optflag("x", "one-file-system", "skip directories on different file systems"),
// // In task
// getopts::optopt("X", "exclude-from", "exclude files that match any pattern in FILE", "FILE"),
// // In task
// getopts::optopt("", "exclude", "exclude files that match PATTERN", "PATTERN"),
// In main
getopts::optopt("d", "max-depth", "print the total for a directory (or file, with --all)
only if it is N or fewer levels below the command
line argument; --max-depth=0 is the same as --summarize", "N"),
// In main
getopts::optflagopt("", "time", "show time of the last modification of any file in the
directory, or any of its subdirectories. If WORD is given, show time as WORD instead of modification time:
atime, access, use, ctime or status", "WORD"),
// In main
getopts::optopt("", "time-style", "show times using style STYLE:
full-iso, long-iso, iso, +FORMAT FORMAT is interpreted like 'date'", "STYLE"),
getopts::optflag("", "help", "display this help and exit"),
getopts::optflag("", "version", "output version information and exit"),
];
let matches = match getopts::getopts(args.tail(), opts) {
Ok(m) => m,
Err(f) => {
show_error!(1, "Invalid options\n{}", f.to_err_msg());
return
}
};
if matches.opt_present("help") {
println!("du {} - estimate file space usage", VERSION);
println!("");
println!("Usage:");
println!(" {0:s} [OPTION]... [FILE]...", program);
println!(" {0:s} [OPTION]... --files0-from=F", program);
println!("");
println!("{}", getopts::usage("Summarize disk usage of each FILE, recursively for directories.", opts));
println!("Display values are in units of the first available SIZE from
--block-size, and the DU_BLOCK_SIZE, BLOCK_SIZE and BLOCKSIZE environ
ment variables. Otherwise, units default to 1024 bytes (or 512 if
POSIXLY_CORRECT is set).
SIZE is an integer and optional unit (example: 10M is 10*1024*1024).
Units are K, M, G, T, P, E, Z, Y (powers of 1024) or KB, MB, ... (pow
ers of 1000).");
return
}
let options = Options{
all: matches.opt_present("all"),
max_depth: match (matches.opt_present("summarize"), matches.opt_str("max-depth")) {
(true, Some(s)) => match from_str::<uint>(s) {
Some(_) => {
println!("du: warning: summarizing conflicts with --max-depth={:s}", s);
return
},
None => {
println!("du: invalid maximum depth '{:s}'", s);
return
}
},
(true, None) => Some(0),
(false, Some(s)) => match from_str::<uint>(s) {
Some(u) => Some(u),
None => {
println!("du: invalid maximum depth '{:s}'", s);
return
}
},
(false, None) => None
},
total: matches.opt_present("total"),
separate_dirs: matches.opt_present("S"),
};
let strs = matches.free.clone();
let strs = match strs.is_empty() {
true => ~[~"./"],
false => strs
};
let options_arc = Arc::new(options);
let MB = match matches.opt_present("si") {
true => 1000 * 1000,
false => 1024 * 1024,
};
let KB = match matches.opt_present("si") {
true => 1000,
false => 1024,
};
let block_size = match matches.opt_str("block-size") {
Some(s) => {
let mut found_number = false;
let mut found_letter = false;
let mut numbers = ~[];
let mut letters = ~[];
for c in s.chars() {
if found_letter && c.is_digit() || !found_number && !c.is_digit() {
println!("du: invalid --block-size argument '{}'", s);
return
} else if c.is_digit() {
found_number = true;
numbers.push(c as u8);
} else if c.is_alphabetic() {
found_letter = true;
letters.push(c);
}
}
let number = std::uint::parse_bytes(numbers, 10).unwrap();
let multiple = match std::str::from_chars(letters).as_slice() {
"K" => 1024, "M" => 1024 * 1024, "G" => 1024 * 1024 * 1024,
"T" => 1024 * 1024 * 1024 * 1024, "P" => 1024 * 1024 * 1024 * 1024 * 1024,
"E" => 1024 * 1024 * 1024 * 1024 * 1024 * 1024,
"Z" => 1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024,
"Y" => 1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024,
"KB" => 1000, "MB" => 1000 * 1000, "GB" => 1000 * 1000 * 1000,
"TB" => 1000 * 1000 * 1000 * 1000, "PB" => 1000 * 1000 * 1000 * 1000 * 1000,
"EB" => 1000 * 1000 * 1000 * 1000 * 1000 * 1000,
"ZB" => 1000 * 1000 * 1000 * 1000 * 1000 * 1000 * 1000,
"YB" => 1000 * 1000 * 1000 * 1000 * 1000 * 1000 * 1000 * 1000,
_ => {
println!("du: invalid --block-size argument '{}'", s); return
}
};
number * multiple
},
None => 1024
};
let convert_size = |size: u64| -> ~str {
if matches.opt_present("human-readable") || matches.opt_present("si") {
if size > MB {
format!("{:.1f}M", (size as f64) / (MB as f64))
} else if size > KB {
format!("{:.1f}K", (size as f64) / (KB as f64))
} else {
format!("{}B", size)
}
} else if matches.opt_present("k") {
format!("{}", ((size as f64) / (KB as f64)).ceil())
} else if matches.opt_present("m") {
format!("{}", ((size as f64) / (MB as f64)).ceil())
} else {
format!("{}", ((size as f64) / (block_size as f64)).ceil())
}
};
let time_format_str = match matches.opt_str("time-style") {
Some(s) => {
match s.as_slice() {
"full-iso" => "%Y-%m-%d %H:%M:%S.%f %z",
"long-iso" => "%Y-%m-%d %H:%M",
"iso" => "%Y-%m-%d",
_ => {
println!("
du: invalid argument 'awdwa' for 'time style'
Valid arguments are:
- 'full-iso'
- 'long-iso'
- 'iso'
Try 'du --help' for more information.");
return
}
}
},
None => "%Y-%m-%d %H:%M"
};
let line_separator = match matches.opt_present("0") {
true => "\0",
false => "\n",
};
let mut grand_total = 0;
for path_str in strs.iter() {
let path = Path::new(path_str.clone());
let iter = du(&path, options_arc.clone(), 0).move_iter();
let (_, len) = iter.size_hint();
let len = len.unwrap();
for (index, stat_arc) in iter.enumerate() {
let stat = stat_arc.get();
let size = match matches.opt_present("apparent-size") {
true => stat.unstable.nlink * stat.size,
// C's stat is such that each block is assume to be 512 bytes
// See: http://linux.die.net/man/2/stat
false => stat.unstable.blocks * 512,
};
if matches.opt_present("time") {
let time_str = {
let (secs, nsecs) = {
let time = match matches.opt_str("time") {
Some(s) => match s.as_slice() {
"accessed" => stat.accessed,
"created" => stat.created,
"modified" => stat.modified,
_ => {
println!("du: invalid argument 'modified' for '--time'
Valid arguments are:
- 'accessed', 'created', 'modified'
Try 'du --help' for more information.");
return
}
},
None => stat.modified
};
((time / 1000) as i64, (time % 1000 * 1000000) as i32)
};
let time_spec = Timespec::new(secs, nsecs);
extra::time::at(time_spec).strftime(time_format_str)
};
print!("{:<10} {:<30} {}", convert_size(size), time_str, stat.path.display());
} else {
print!("{:<10} {}", convert_size(size), stat.path.display());
}
print!("{}", line_separator);
if options.total && index == (len - 1) {
// The last element will be the total size of the the path under
// path_str. We add it to the grand total.
grand_total += size;
}
}
}
if options.total {
print!("{:<10} total", convert_size(grand_total));
print!("{}", line_separator);
}
}

View file

@ -41,27 +41,27 @@ struct c_group {
#[cfg(not(target_os = "linux"))]
mod audit {
pub use std::unstable::intrinsic::uninit;
use std::libc::{pid_t, c_uint, uint64_t, dev_t};
pub use std::unstable::intrinsics::uninit;
use std::libc::{uid_t, pid_t, c_int, c_uint, uint64_t, dev_t};
type au_id_t = uid_t;
type au_asid_t = pid_t;
type au_event_t = c_uint;
type au_emod_t = c_uint;
type au_class_t = c_int;
pub type au_id_t = uid_t;
pub type au_asid_t = pid_t;
pub type au_event_t = c_uint;
pub type au_emod_t = c_uint;
pub type au_class_t = c_int;
struct au_mask {
pub struct au_mask {
am_success: c_uint,
am_failure: c_uint
}
type au_mask_t = au_mask;
pub type au_mask_t = au_mask;
struct au_tid_addr {
pub struct au_tid_addr {
port: dev_t,
}
type au_tid_addr_t = au_tid_addr;
pub type au_tid_addr_t = au_tid_addr;
struct c_auditinfo_addr {
pub struct c_auditinfo_addr {
ai_auid: au_id_t, /* Audit user ID */
ai_mask: au_mask_t, /* Audit masks. */
ai_termid: au_tid_addr_t, /* Terminal ID. */

10
util.rs
View file

@ -45,3 +45,13 @@ macro_rules! safe_writeln(
}
)
)
#[macro_export]
macro_rules! safe_unwrap(
($exp:expr) => (
match $exp {
Ok(m) => m,
Err(f) => crash!(1, "{}", f.to_str())
}
)
)