Skip to content

mktemp: remove duplicate code from uumain #12490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
cakebaker wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −19
Draft

mktemp: remove duplicate code from uumain #12490

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 4 additions & 19 deletions src/uu/mktemp/src/mktemp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,26 +415,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
}
}

let dry_run = options.dry_run;
let suppress_file_err = options.quiet;
let make_dir = options.directory;
let res = mktemp(&options);

// Parse file path parameters from the command-line options.
let Params {
directory: tmpdir,
prefix,
num_rand_chars: rand,
suffix,
} = Params::from(options)?;

// Create the temporary file or directory, or simulate creating it.
let res = if dry_run {
Ok(dry_exec(&tmpdir, &prefix, rand, &suffix))
} else {
exec(&tmpdir, &prefix, rand, &suffix, make_dir)
};

let res = if suppress_file_err {
let res = if options.quiet {
// Mapping all UErrors to ExitCodes prevents the errors from being printed
res.map_err(|e| e.code().into())
} else {
Expand Down Expand Up @@ -641,6 +624,8 @@ fn get_tmpdir_env_or_default() -> PathBuf {
/// Create a temporary file or directory
///
/// Behavior is determined by the `options` parameter, see [`Options`] for details.
///
/// The function is public so it can be used by nushell and others.
pub fn mktemp(options: &Options) -> UResult<PathBuf> {
// Parse file path parameters from the command-line options.
let Params {
Expand Down
Loading