Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-11-17 10:18:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean up with changes from Arcterus.

Browse source
This commit is contained in:
Connor E 2018-05-03 08:40:01 +01:00
parent 9d5631228a
commit 62632faa63
1 changed files with 14 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/mkdir/mkdir.rs
View file

@ -92,26 +92,19 @@ fn exec(dirs: Vec<String>, recursive: bool, mode: u16, verbose: bool) -> i32 {
let empty = Path::new("");
for dir in &dirs {
let path = Path::new(dir);
if recursive {
status |= mkdir(path, recursive, mode, verbose);
} else {
match path.parent() {
Some(parent) => {
if parent != empty && !parent.exists() {
show_info!(
"cannot create directory '{}': No such file or directory",
path.display()
);
status = 1;
} else {
status |= mkdir(path, recursive, mode, verbose);
}
}
None => {
status |= mkdir(path, recursive, mode, verbose);
if !recursive {
if let Some(parent) = path.parent() {
if parent != empty && !parent.exists() {
show_info!(
"cannot create directory '{}': No such file or directory",
path.display()
);
status = 1;
continue;
}
}
}
status |= mkdir(path, recursive, mode, verbose);
}
status
}
@ -120,16 +113,10 @@ fn exec(dirs: Vec<String>, recursive: bool, mode: u16, verbose: bool) -> i32 {
* Wrapper to catch errors, return 1 if failed
*/
fn mkdir(path: &Path, recursive: bool, mode: u16, verbose: bool) -> i32 {
if recursive {
if let Err(e) = fs::create_dir_all(path) {
show_info!("cannot create directory '{}': {}", path.display(), e.to_string());
return 1;
}
} else {
if let Err(e) = fs::create_dir(path) {
show_info!("{}: {}", path.display(), e.to_string());
return 1;
}
let create_dir = if recursive { fs::create_dir_all } else { fs::create_dir };
if let Err(e) = create_dir(path) {
show_info!("{}: {}", path.display(), e.to_string());
return 1;
}
if verbose {