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

mkdir: chmod of parent directories created by -p

Browse source
This commit is contained in:
John Shin 2023-05-18 18:25:41 -07:00
parent fdf8ce548a
commit b05c05eb45
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/uu/mkdir/src/mkdir.rs
View file

@ -20,7 +20,7 @@ use uucore::mode;
use uucore::{display::Quotable, fs::dir_strip_dot_for_creation}; use uucore::{display::Quotable, fs::dir_strip_dot_for_creation};
use uucore::{format_usage, help_about, help_section, help_usage, show, show_if_err}; use uucore::{format_usage, help_about, help_section, help_usage, show, show_if_err};
static DEFAULT_PERM: u32 = 0o755; static DEFAULT_PERM: u32 = 0o777;
const ABOUT: &str = help_about!("mkdir.md"); const ABOUT: &str = help_about!("mkdir.md");
const USAGE: &str = help_usage!("mkdir.md"); const USAGE: &str = help_usage!("mkdir.md");
@ -41,7 +41,7 @@ fn get_mode(_matches: &ArgMatches, _mode_had_minus_prefix: bool) -> Result<u32,
#[cfg(not(windows))] #[cfg(not(windows))]
fn get_mode(matches: &ArgMatches, mode_had_minus_prefix: bool) -> Result<u32, String> { fn get_mode(matches: &ArgMatches, mode_had_minus_prefix: bool) -> Result<u32, String> {
let digits: &[char] = &['0', '1', '2', '3', '4', '5', '6', '7', '8', '9']; let digits: &[char] = &['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
// Translate a ~str in octal form to u16, default to 755 // Translate a ~str in octal form to u16, default to 777
// Not tested on Windows // Not tested on Windows
let mut new_mode = DEFAULT_PERM; let mut new_mode = DEFAULT_PERM;
match matches.get_one::<String>(options::MODE) { match matches.get_one::<String>(options::MODE) {
@ -158,7 +158,7 @@ fn exec(dirs: ValuesRef<OsString>, recursive: bool, mode: u32, verbose: bool) ->
} }
fn mkdir(path: &Path, recursive: bool, mode: u32, verbose: bool) -> UResult<()> { fn mkdir(path: &Path, recursive: bool, mode: u32, verbose: bool) -> UResult<()> {
create_dir(path, recursive, verbose)?; create_dir(path, recursive, verbose, false)?;
chmod(path, mode) chmod(path, mode)
} }
@ -179,7 +179,7 @@ fn chmod(_path: &Path, _mode: u32) -> UResult<()> {
Ok(()) Ok(())
} }
fn create_dir(path: &Path, recursive: bool, verbose: bool) -> UResult<()> { fn create_dir(path: &Path, recursive: bool, verbose: bool, is_parent: bool) -> UResult<()> {
if path.exists() && !recursive { if path.exists() && !recursive {
return Err(USimpleError::new( return Err(USimpleError::new(
1, 1,
@ -192,7 +192,7 @@ fn create_dir(path: &Path, recursive: bool, verbose: bool) -> UResult<()> {
if recursive { if recursive {
match path.parent() { match path.parent() {
Some(p) => create_dir(p, recursive, verbose)?, Some(p) => create_dir(p, recursive, verbose, true)?,
None => { None => {
USimpleError::new(1, "failed to create whole tree"); USimpleError::new(1, "failed to create whole tree");
} }
@ -207,6 +207,11 @@ fn create_dir(path: &Path, recursive: bool, verbose: bool) -> UResult<()> {
path.quote() path.quote()
); );
} }
if is_parent {
// directories created by -p have permission bits set to '=rwx,u+wx',
// which is umask modified by 'u+wx'
chmod(path, (!mode::get_umask() & 0o0777) | 0o0300)?;
}
Ok(()) Ok(())
} }
Err(_) if path.is_dir() => Ok(()), Err(_) if path.is_dir() => Ok(()),