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

Merge pull request #559 from jbcrail/fix-dirname

Browse source 
Fix dirname.
This commit is contained in:
Alex Lyon 2015-04-29 18:35:39 -07:00
commit f34920db32
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/dirname/dirname.rs
View file

@ -1,5 +1,5 @@
#![crate_name = "dirname"] #![crate_name = "dirname"]
#![feature(collections, core, old_io, old_path, rustc_private)] #![feature(rustc_private)]
/* /*
* This file is part of the uutils coreutils package. * This file is part of the uutils coreutils package.
@ -12,7 +12,7 @@
extern crate getopts; extern crate getopts;
use std::old_io::print; use std::path::Path;
static VERSION: &'static str = "1.0.0"; static VERSION: &'static str = "1.0.0";
@ -24,7 +24,7 @@ pub fn uumain(args: Vec<String>) -> i32 {
getopts::optflag("", "version", "output version information and exit"), getopts::optflag("", "version", "output version information 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) => panic!("Invalid options\n{}", f) Err(f) => panic!("Invalid options\n{}", f)
}; };
@ -35,9 +35,9 @@ pub fn uumain(args: Vec<String>) -> i32 {
println!("Usage:"); println!("Usage:");
println!(" {0} [OPTION] NAME...", program); println!(" {0} [OPTION] NAME...", program);
println!(""); println!("");
print(getopts::usage("Output each NAME with its last non-slash component and trailing slashes print!("{}", getopts::usage("Output each NAME with its last non-slash component and trailing slashes
removed; if NAME contains no /'s, output '.' (meaning the current removed; if NAME contains no /'s, output '.' (meaning the current
directory).", &opts).as_slice()); directory).", &opts));
return 0; return 0;
} }
@ -53,12 +53,12 @@ directory).", &opts).as_slice());
if !matches.free.is_empty() { if !matches.free.is_empty() {
for path in matches.free.iter() { for path in matches.free.iter() {
let p = std::old_path::Path::new(path.clone()); let p = Path::new(path);
let d = std::str::from_utf8(p.dirname()); let d = p.parent().unwrap().to_str();
if d.is_ok() { if d.is_some() {
print(d.unwrap()); print!("{}", d.unwrap());
} }
print(separator); print!("{}", separator);
} }
} else { } else {
println!("{0}: missing operand", program); println!("{0}: missing operand", program);